From dcf2d3532e33d4d385b8539c20b108907d5a1b71 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 17 Jul 2019 19:28:36 +0530 Subject: [PATCH] fix: address and taxes not set as per pos profile in the pos invoice --- .../accounts/doctype/sales_invoice/sales_invoice.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 88ad6b37db..46913dc3af 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -395,14 +395,18 @@ class SalesInvoice(SellingController): if pos.get('account_for_change_amount'): self.account_for_change_amount = pos.get('account_for_change_amount') - for fieldname in ('territory', 'naming_series', 'currency', 'taxes_and_charges', 'letter_head', 'tc_name', - 'company', 'select_print_heading', 'cash_bank_account', 'company_address', - 'write_off_account', 'write_off_cost_center', 'apply_discount_on', 'cost_center'): + for fieldname in ('territory', 'naming_series', 'currency', 'letter_head', 'tc_name', + 'company', 'select_print_heading', 'cash_bank_account', 'write_off_account', + 'write_off_cost_center', 'apply_discount_on', 'cost_center'): if (not for_validate) or (for_validate and not self.get(fieldname)): self.set(fieldname, pos.get(fieldname)) customer_price_list = frappe.get_value("Customer", self.customer, 'default_price_list') + for field in ['taxes_and_charges', 'company_address']: + if pos.get(field): + self.set(field, pos.get(fieldname)) + if not customer_price_list: self.set('selling_price_list', pos.get('selling_price_list'))