Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: incorrect status of the returned purchase receipt (backport #37300) (#37380)

Browse Source 
fix: incorrect status of the returned purchase receipt (#37300)

(cherry picked from commit 63f45739e05d728e8844320ff0c7dbafa8660acf)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot] 2023-10-06 14:43:13 +05:30 committed by GitHub
parent d2aa4d5d6b
commit 10c666bf69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/taxes_and_totals.py
View File

@ -190,7 +190,9 @@ class calculate_taxes_and_totals(object):
item.net_rate = item.rate
if not item.qty and self.doc.get("is_return"):
if (
not item.qty and self.doc.get("is_return") and self.doc.get("doctype") != "Purchase Receipt"
):
item.amount = flt(-1 * item.rate, item.precision("amount"))
elif not item.qty and self.doc.get("is_debit_note"):
item.amount = flt(item.rate, item.precision("amount"))

10
erpnext/public/js/controllers/taxes_and_totals.js
View File

@ -135,7 +135,15 @@ erpnext.taxes_and_totals = class TaxesAndTotals extends erpnext.payments {
}
else {
// allow for '0' qty on Credit/Debit notes
let qty = item.qty || (me.frm.doc.is_debit_note ? 1 : -1);
let qty = flt(item.qty);
if (!qty) {
qty = (me.frm.doc.is_debit_note ? 1 : -1);
if (me.frm.doc.doctype !== "Purchase Receipt" && me.frm.doc.is_return === 1) {
// In case of Purchase Receipt, qty can be 0 if all items are rejected
qty = flt(item.qty);
}
}
item.net_amount = item.amount = flt(item.rate * qty, precision("amount", item));
}

4
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -956,6 +956,10 @@ def update_billing_percentage(pr_doc, update_modified=True, adjust_incoming_rate
total_amount += total_billable_amount
total_billed_amount += flt(item.billed_amt)
if pr_doc.get("is_return") and not total_amount and total_billed_amount:
total_amount = total_billed_amount
if adjust_incoming_rate:
adjusted_amt = 0.0
if item.billed_amt and item.amount:

26
erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
View File

@ -2060,6 +2060,32 @@ class TestPurchaseReceipt(FrappeTestCase):
company.enable_provisional_accounting_for_non_stock_items = 0
company.save()
def test_purchase_return_status_with_debit_note(self):
pr = make_purchase_receipt(rejected_qty=10, received_qty=10, rate=100, do_not_save=1)
pr.items[0].qty = 0
pr.items[0].stock_qty = 0
pr.submit()
return_pr = make_purchase_receipt(
is_return=1,
return_against=pr.name,
qty=0,
rejected_qty=10 * -1,
received_qty=10 * -1,
do_not_save=1,
)
return_pr.items[0].qty = 0.0
return_pr.items[0].stock_qty = 0.0
return_pr.submit()
self.assertEqual(return_pr.status, "To Bill")
pi = make_purchase_invoice(return_pr.name)
pi.submit()
return_pr.reload()
self.assertEqual(return_pr.status, "Completed")
def prepare_data_for_internal_transfer():
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_internal_supplier