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

Merge pull request #1856 from nabinhait/v4-hotfix

Browse Source 
V4 hotfix
This commit is contained in:
Anand Doshi 2014-06-26 15:03:59 +05:30
commit 779111d781
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -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]
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:

4
erpnext/stock/doctype/serial_no/serial_no.json
View File

@ -155,7 +155,7 @@
"fieldtype": "Select",
"label": "Creation Document Type",
"no_copy": 1,
"options": "\nPurchase Receipt\nStock Entry",
"options": "\nPurchase Receipt\nStock Entry\nSerial No",
"permlevel": 0,
"read_only": 1
},
@ -418,7 +418,7 @@
"icon": "icon-barcode",
"idx": 1,
"in_create": 0,
"modified": "2014-05-27 03:49:19.131746",
"modified": "2014-06-26 12:33:49.911829",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",