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

Merge pull request #7519 from rohitwaghchaure/print_issue

Browse Source 
[Fix] POS print issue
This commit is contained in:
Nabin Hait 2017-01-18 13:24:16 +05:30 committed by GitHub
commit 461e9c1e09
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/sales_invoice/pos.py
View File

@ -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.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.customer_group = pos_profile.get('customer_group') or get_root('Customer Group')
doc.territory = pos_profile.get('territory') or get_root('Territory') 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') or doc.terms or ''
doc.terms = frappe.db.get_value('Terms and Conditions', pos_profile.get('tc_name'), 'terms')
def get_root(table): def get_root(table):
root = frappe.db.sql(""" select name from `tab%(table)s` having root = frappe.db.sql(""" select name from `tab%(table)s` having

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

@ -2385,7 +2385,7 @@
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Sales Invoice Payment", "label": "Sales Invoice Payment",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 0,
"options": "Sales Invoice Payment", "options": "Sales Invoice Payment",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@ -4183,7 +4183,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2017-01-17 11:07:25.814402", "modified": "2017-01-18 13:21:13.226318",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",