feat: update billed amount in PO and PR
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index a48f5ea..d12a43c 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -22,6 +22,8 @@
"is_paid",
"is_return",
"return_against",
+ "update_billed_amount_in_purchase_order",
+ "update_billed_amount_in_purchase_receipt",
"apply_tds",
"tax_withholding_category",
"amended_from",
@@ -413,6 +415,20 @@
"search_index": 1
},
{
+ "default": "0",
+ "depends_on": "eval: doc.is_return",
+ "fieldname": "update_billed_amount_in_purchase_order",
+ "fieldtype": "Check",
+ "label": "Update Billed Amount in Purchase Order"
+ },
+ {
+ "default": "1",
+ "depends_on": "eval: doc.is_return",
+ "fieldname": "update_billed_amount_in_purchase_receipt",
+ "fieldtype": "Check",
+ "label": "Update Billed Amount in Purchase Receipt"
+ },
+ {
"fieldname": "section_addresses",
"fieldtype": "Section Break",
"label": "Supplier Address"
@@ -1613,7 +1629,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
- "modified": "2024-01-26 10:46:00.469053",
+ "modified": "2024-02-25 11:20:28.366808",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index c68ff83..ab59d62 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -193,6 +193,7 @@
supplied_items: DF.Table[PurchaseReceiptItemSupplied]
supplier: DF.Link
supplier_address: DF.Link | None
+ supplier_group: DF.Link | None
supplier_name: DF.Data | None
supplier_warehouse: DF.Link | None
tax_category: DF.Link | None
@@ -214,6 +215,8 @@
total_qty: DF.Float
total_taxes_and_charges: DF.Currency
unrealized_profit_loss_account: DF.Link | None
+ update_billed_amount_in_purchase_order: DF.Check
+ update_billed_amount_in_purchase_receipt: DF.Check
update_stock: DF.Check
use_company_roundoff_cost_center: DF.Check
use_transaction_date_exchange_rate: DF.Check
@@ -679,6 +682,11 @@
super(PurchaseInvoice, self).on_submit()
self.check_prev_docstatus()
+
+ if self.is_return and not self.update_billed_amount_in_purchase_order:
+ # NOTE status updating bypassed for is_return
+ self.status_updater = []
+
self.update_status_updater_args()
self.update_prevdoc_status()
@@ -1426,6 +1434,10 @@
self.check_on_hold_or_closed_status()
+ if self.is_return and not self.update_billed_amount_in_purchase_order:
+ # NOTE status updating bypassed for is_return
+ self.status_updater = []
+
self.update_status_updater_args()
self.update_prevdoc_status()
@@ -1520,6 +1532,9 @@
frappe.throw(_("Supplier Invoice No exists in Purchase Invoice {0}").format(pi))
def update_billing_status_in_pr(self, update_modified=True):
+ if self.is_return and not self.update_billed_amount_in_purchase_receipt:
+ return
+
updated_pr = []
po_details = []