From cf2632fe591c7361e9c7c752d4468392258b3168 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 26 Jun 2014 13:05:10 +0530 Subject: [PATCH] Fetch warehouse from pos settings --- .../doctype/sales_invoice/sales_invoice.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index 614c13a315b..5d6171a7f94 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -383,20 +383,20 @@ class SalesInvoice(SellingController): def get_warehouse(self): - w = frappe.db.sql("""select warehouse from `tabPOS Setting` - where ifnull(user,'') = %s and company = %s""", - (frappe.session['user'], self.company)) - w = w and w[0][0] or '' - if not w: - ps = frappe.db.sql("""select name, warehouse from `tabPOS Setting` + user_pos_setting = frappe.db.sql("""select name, warehouse from `tabPOS Setting` + where ifnull(user,'') = %s and company = %s""", (frappe.session['user'], self.company)) + warehouse = user_pos_setting[0][1] if user_pos_setting else None + + if not warehouse: + global_pos_setting = frappe.db.sql("""select name, warehouse from `tabPOS Setting` where ifnull(user,'') = '' and company = %s""", self.company) - if not ps: + + if global_pos_setting: + warehouse = global_pos_setting[0][1] if global_pos_setting else None + elif not user_pos_setting: msgprint(_("POS Setting required to make POS Entry"), raise_exception=True) - elif not ps[0][1]: - msgprint(_("Warehouse required in POS Setting")) - else: - w = ps[0][1] - return w + + return warehouse def on_update(self): if cint(self.update_stock) == 1: