diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py index 9fb7cebb5e..bd54776177 100644 --- a/erpnext/accounts/doctype/sales_invoice/pos.py +++ b/erpnext/accounts/doctype/sales_invoice/pos.py @@ -82,8 +82,7 @@ def update_pos_profile_data(doc, pos_profile, company_data): doc.apply_discount_on = pos_profile.get('apply_discount_on') if pos_profile.get('apply_discount') else '' doc.customer_group = pos_profile.get('customer_group') or get_root('Customer Group') doc.territory = pos_profile.get('territory') or get_root('Territory') - if pos_profile.get('tc_name'): - doc.terms = frappe.db.get_value('Terms and Conditions', pos_profile.get('tc_name'), 'terms') + doc.terms = frappe.db.get_value('Terms and Conditions', pos_profile.get('tc_name'), 'terms') or doc.terms or '' def get_root(table): root = frappe.db.sql(""" select name from `tab%(table)s` having diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 534f96521f..7ade3187e2 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -2385,7 +2385,7 @@ "in_standard_filter": 0, "label": "Sales Invoice Payment", "length": 0, - "no_copy": 1, + "no_copy": 0, "options": "Sales Invoice Payment", "permlevel": 0, "precision": "", @@ -4183,7 +4183,7 @@ "istable": 0, "max_attachments": 0, "menu_index": 0, - "modified": "2017-01-17 11:07:25.814402", + "modified": "2017-01-18 13:21:13.226318", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice",