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

refactor: set default for 'update_billed_amount_in_delivery_note'

Browse Source 
(cherry picked from commit ee0c64215d160f0bd493bcefc9e94a5a90d318d2)
This commit is contained in:
ruthra kumar 2023-11-20 11:52:26 +05:30 committed by Mergify
parent e272041872
commit 5da9a22e4c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2156,7 +2156,7 @@
"label": "Use Company default Cost Center for Round off" "label": "Use Company default Cost Center for Round off"
}, },
{ {
"default": "0", "default": "1",
"depends_on": "eval: doc.is_return", "depends_on": "eval: doc.is_return",
"fieldname": "update_billed_amount_in_delivery_note", "fieldname": "update_billed_amount_in_delivery_note",
"fieldtype": "Check", "fieldtype": "Check",
@ -2173,7 +2173,7 @@
"link_fieldname": "consolidated_invoice" "link_fieldname": "consolidated_invoice"
} }
], ],
"modified": "2023-11-03 14:39:38.012346", "modified": "2023-11-20 11:51:43.555197",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

1
erpnext/controllers/sales_and_purchase_return.py
View File

@ -356,6 +356,7 @@ def make_return_doc(
if doc.doctype == "Sales Invoice" or doc.doctype == "POS Invoice": if doc.doctype == "Sales Invoice" or doc.doctype == "POS Invoice":
doc.consolidated_invoice = "" doc.consolidated_invoice = ""
doc.set("payments", []) doc.set("payments", [])
doc.update_billed_amount_in_delivery_note = True
for data in source.payments: for data in source.payments:
paid_amount = 0.00 paid_amount = 0.00
base_paid_amount = 0.00 base_paid_amount = 0.00