nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: flag to toggle billed amy update in DN for Credit Note

Browse Source 
(cherry picked from commit a3191f1c8c)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
This commit is contained in:
ruthra kumar
2023-11-03 14:37:23 +05:30
committed by Mergify
parent 5e1a89b3f9
commit 6eb867a1e4
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@@ -26,6 +26,7 @@
"is_return", "is_return",
"return_against", "return_against",
"update_billed_amount_in_sales_order", "update_billed_amount_in_sales_order",
"update_billed_amount_in_delivery_note",
"is_debit_note", "is_debit_note",
"amended_from", "amended_from",
"accounting_dimensions_section", "accounting_dimensions_section",
@@ -2144,6 +2145,13 @@
"fieldname": "use_company_roundoff_cost_center", "fieldname": "use_company_roundoff_cost_center",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Use Company default Cost Center for Round off" "label": "Use Company default Cost Center for Round off"
},
{
"default": "0",
"depends_on": "eval: doc.is_return",
"fieldname": "update_billed_amount_in_delivery_note",
"fieldtype": "Check",
"label": "Update Billed Amount in Delivery Note"
} }
], ],
"icon": "fa fa-file-text", "icon": "fa fa-file-text",
@@ -2156,7 +2164,11 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
<<<<<<< HEAD
"modified": "2023-06-19 16:02:05.309332", "modified": "2023-06-19 16:02:05.309332",
=======
"modified": "2023-11-03 14:39:38.012346",
>>>>>>> a3191f1c8c (refactor: flag to toggle billed amy update in DN for Credit Note)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

3
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@@ -261,6 +261,7 @@ class SalesInvoice(SellingController):
self.update_status_updater_args() self.update_status_updater_args()
self.update_prevdoc_status() self.update_prevdoc_status()
self.update_billing_status_in_dn() self.update_billing_status_in_dn()
self.clear_unallocated_mode_of_payments() self.clear_unallocated_mode_of_payments()
@@ -1433,6 +1434,8 @@ class SalesInvoice(SellingController):
) )
def update_billing_status_in_dn(self, update_modified=True): def update_billing_status_in_dn(self, update_modified=True):
if self.is_return and not self.update_billed_amount_in_delivery_note:
return
updated_delivery_notes = [] updated_delivery_notes = []
for d in self.get("items"): for d in self.get("items"):
if d.dn_detail: if d.dn_detail: