From cd6c00d5054debdbef8f41ccd576d6aa0e708b14 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sun, 7 Aug 2016 02:37:10 +0530 Subject: [PATCH] [Fix] pos ambiguous issue --- erpnext/accounts/doctype/pos_profile/pos_profile.json | 5 +++-- erpnext/accounts/doctype/sales_invoice/pos.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json index a7e49dd48f..cb637d254a 100644 --- a/erpnext/accounts/doctype/pos_profile/pos_profile.json +++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json @@ -8,6 +8,7 @@ "custom": 0, "docstatus": 0, "doctype": "DocType", + "editable_grid": 0, "fields": [ { "allow_on_submit": 0, @@ -832,7 +833,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2016-06-13 21:20:13.805101", + "modified": "2016-08-06 17:05:59.990031", "modified_by": "Administrator", "module": "Accounts", "name": "POS Profile", @@ -879,7 +880,7 @@ "write": 0 } ], - "quick_entry": 1, + "quick_entry": 0, "read_only": 0, "read_only_onload": 0, "sort_field": "modified", diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py index 9f64e075d6..862da9b889 100644 --- a/erpnext/accounts/doctype/sales_invoice/pos.py +++ b/erpnext/accounts/doctype/sales_invoice/pos.py @@ -91,7 +91,7 @@ def update_multi_mode_option(doc, pos_profile): def get_mode_of_payment(doc): return frappe.db.sql(""" select mpa.default_account, mpa.parent, mp.type as type from `tabMode of Payment Account` mpa, - `tabMode of Payment` mp where mpa.parent = mp.name and company = %(company)s""", {'company': doc.company}, as_dict=1) + `tabMode of Payment` mp where mpa.parent = mp.name and mpa.company = %(company)s""", {'company': doc.company}, as_dict=1) def update_tax_table(doc): taxes = get_taxes_and_charges('Sales Taxes and Charges Template', doc.taxes_and_charges)