From 07badbc0f214ef1cca98215db4770e7d265523b4 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 15 Nov 2022 09:45:39 +0530 Subject: [PATCH] fix: Write Off section visibility for non POS Invoices (cherry picked from commit 9f5d613c783b41b12b7a36d3cf653afe2397edaa) # Conflicts: # erpnext/accounts/doctype/sales_invoice/sales_invoice.json --- erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 6 +++++- erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 97e5f4017e0..147effcc3b3 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -2090,7 +2090,7 @@ { "collapsible": 1, "collapsible_depends_on": "write_off_amount", - "depends_on": "grand_total", + "depends_on": "is_pos", "fieldname": "write_off_section", "fieldtype": "Section Break", "hide_days": 1, @@ -2109,7 +2109,11 @@ "link_fieldname": "consolidated_invoice" } ], +<<<<<<< HEAD "modified": "2022-10-11 13:07:36.488095", +======= + "modified": "2022-11-15 09:33:47.870616", +>>>>>>> 9f5d613c78 (fix: Write Off section visibility for non POS Invoices) "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 83e1f2499b6..51df37044d5 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -1300,7 +1300,11 @@ class SalesInvoice(SellingController): def make_write_off_gl_entry(self, gl_entries): # write off entries, applicable if only pos - if self.write_off_account and flt(self.write_off_amount, self.precision("write_off_amount")): + if ( + self.is_pos + and self.write_off_account + and flt(self.write_off_amount, self.precision("write_off_amount")) + ): write_off_account_currency = get_account_currency(self.write_off_account) default_cost_center = frappe.get_cached_value("Company", self.company, "cost_center")