Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: don't allow negative rate #36027

Merged
merged 3 commits into from
Aug 2, 2023

Conversation

dj12djdjs
Copy link
Collaborator

closes: #31533

Context

If rate is negative, and is_return is True the sales invoice will be posted to the GL as a debit note, instead of a credit note.

@dj12djdjs dj12djdjs added the CI-failing Unit tests or patch tests are failing. label Jul 8, 2023
@deepeshgarg007
Copy link
Member

@dj12djdjs one test case failing, can you please fix that?

@dj12djdjs dj12djdjs removed the CI-failing Unit tests or patch tests are failing. label Aug 1, 2023
@dj12djdjs
Copy link
Collaborator Author

@deepeshgarg007 CI is resolved.

@codecov
Copy link

codecov bot commented Aug 1, 2023

Codecov Report

Merging #36027 (cc141d4) into develop (bd3fc7c) will increase coverage by 0.00%.
Report is 2 commits behind head on develop.
The diff coverage is 100.00%.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop   #36027   +/-   ##
========================================
  Coverage    64.54%   64.54%           
========================================
  Files          787      787           
  Lines        61171    61173    +2     
========================================
+ Hits         39483    39486    +3     
+ Misses       21688    21687    -1     
Files Changed Coverage Δ
erpnext/controllers/status_updater.py 88.35% <100.00%> (+0.12%) ⬆️

... and 1 file with indirect coverage changes

@ruthra-kumar
Copy link
Member

LGTM

@ruthra-kumar ruthra-kumar merged commit dedf24b into frappe:develop Aug 2, 2023
13 checks passed
@ruthra-kumar ruthra-kumar added the backport version-14-hotfix backport to version 14 label Aug 2, 2023
mergify bot pushed a commit that referenced this pull request Aug 2, 2023
* fix: don't allow negative rate

* test: don't allow negative rate

* fix: only check for -rate on items child table

(cherry picked from commit dedf24b)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
ruthra-kumar added a commit that referenced this pull request Aug 2, 2023
* fix: don't allow negative rates (#36027)

* fix: don't allow negative rate

* test: don't allow negative rate

* fix: only check for -rate on items child table

(cherry picked from commit dedf24b)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py

* chore: resolve merge conflict

---------

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
Co-authored-by: ruthra kumar <ruthra@erpnext.com>
frappe-pr-bot pushed a commit that referenced this pull request Aug 9, 2023
# [14.34.0](v14.33.2...v14.34.0) (2023-08-09)

### Bug Fixes

* **accounts:** Translate columns in AP/AR report ([#36503](#36503)) ([6739369](6739369))
* AP and AR summary ([769d7d7](769d7d7))
* check root type only when not none ([46bb309](46bb309))
* cross connect delivery note and sales invoice ([#36183](#36183)) ([8501a11](8501a11))
* Debit credit difference while submitting Sales Invoice ([#36523](#36523)) ([240d866](240d866))
* don't allow negative rate (backport [#36027](#36027)) ([#36465](#36465)) ([caa4f33](caa4f33))
* enqueue submit/cancel action for stock entry having more than 50 line items (backport [#36532](#36532)) ([#36536](#36536)) ([9c108a8](9c108a8))
* fetch ple for all party types ([674dba8](674dba8))
* fetch ple with party type employee in AP ([1ca9aca](1ca9aca))
* Fix query for financial statement report ([d1590f2](d1590f2))
* get incoming rate instead of BOM rate (backport [#36496](#36496)) ([#36506](#36506)) ([bdfbccd](bdfbccd))
* handle None value in payment_term_outstanding ([b033b3b](b033b3b))
* Lower deduction certificate for multi-company ([#36491](#36491)) ([2216875](2216875))
* payment allocation in invoice payment schedule ([#36440](#36440)) ([0e87c86](0e87c86))
* search not working for so in the Production Plan ([#36459](#36459)) ([8c57d56](8c57d56))
* serial no not able to reject for the internal transfer ([#36467](#36467)) ([c1819a4](c1819a4))
* stock entry decimal issue (backport [#36530](#36530)) ([#36533](#36533)) ([5b04708](5b04708))
* stock reconciliation negative stock error (backport [#36544](#36544)) ([#36549](#36549)) ([00b9df0](00b9df0))
* Tax withholding against order via Payment Entry ([#36493](#36493)) ([a234b89](a234b89))
* use correct lang separator for frappe (backport [#36519](#36519)) ([#36520](#36520)) ([f9981d1](f9981d1))
* **ux:** add `Ordered Qty` column in Get Items From > MR (backport [#36486](#36486)) ([#36505](#36505)) ([0d7a4b6](0d7a4b6))

### Features

* ledger comparison report ([#36485](#36485)) ([07f235c](07f235c))
* **RFQ:** make sending attachments configurable (backport [#36359](#36359)) ([#36535](#36535)) ([5881960](5881960))

### Performance Improvements

* asset depreciation entry posting ([#36461](#36461)) ([cd1c175](cd1c175))
* defer holiday list imports ([7adad42](7adad42))
@peterafahmy
Copy link

Hi, I have a case where i'm selling airline tickets. When there is a commission, I have it entered as a negative number in the purchase invoice to the airline. Now I can't do this anymore because of this fix.
Can you help me bypass this? My erpnext is on a frappe server.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 5, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Creating Sales/Purchase Return with Negative Rate
4 participants