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

Merge pull request #37879 from ruthra-kumar/flag_to_toggle_dn_update_on_cr_note

Browse Source 
refactor: flag to toggle billed amy update in DN for Credit Note
This commit is contained in:
ruthra kumar 2023-11-06 08:40:27 +05:30 committed by GitHub
commit e5a018f84c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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",
@ -2153,6 +2154,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",
@ -2165,7 +2173,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
"modified": "2023-07-25 16:02:18.988799", "modified": "2023-11-03 14:39:38.012346",
"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

@ -253,6 +253,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()
@ -1429,6 +1430,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:

2
erpnext/stock/doctype/delivery_note/test_delivery_note.py
View File

@ -1029,6 +1029,7 @@ class TestDeliveryNote(FrappeTestCase):
dn1 = create_delivery_note(is_return=1, return_against=dn.name, qty=-3) dn1 = create_delivery_note(is_return=1, return_against=dn.name, qty=-3)
si1 = make_sales_invoice(dn1.name) si1 = make_sales_invoice(dn1.name)
si1.update_billed_amount_in_delivery_note = True
si1.insert() si1.insert()
si1.submit() si1.submit()
dn1.reload() dn1.reload()
@ -1037,6 +1038,7 @@ class TestDeliveryNote(FrappeTestCase):
dn2 = create_delivery_note(is_return=1, return_against=dn.name, qty=-4) dn2 = create_delivery_note(is_return=1, return_against=dn.name, qty=-4)
si2 = make_sales_invoice(dn2.name) si2 = make_sales_invoice(dn2.name)
si2.update_billed_amount_in_delivery_note = True
si2.insert() si2.insert()
si2.submit() si2.submit()
dn2.reload() dn2.reload()