nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge-conflicts

Browse Source
This commit is contained in:
Saurabh
2017-11-28 11:02:28 +05:30
parent a14baf4188 7b833802a9
commit b750b304dd
22 changed files with 292 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/doctype/bin/bin.py
View File

@@ -88,11 +88,10 @@ class Bin(Document):
and item.source_warehouse = %s
and pro.status not in ("Stopped", "Completed")''', (self.item_code, self.warehouse))[0][0]
if self.reserved_qty_for_production:
self.set_projected_qty()
self.set_projected_qty()
self.db_set('reserved_qty_for_production', self.reserved_qty_for_production)
self.db_set('projected_qty', self.projected_qty)
self.db_set('reserved_qty_for_production', flt(self.reserved_qty_for_production))
self.db_set('projected_qty', self.projected_qty)
def update_item_projected_qty(item_code):

4
erpnext/stock/get_item_details.py
View File

@@ -410,11 +410,11 @@ def get_pos_profile_item_details(company, args, pos_profile=None):
@frappe.whitelist()
def get_pos_profile(company):
pos_profile = frappe.db.sql("""select * from `tabPOS Profile` where user = %s
and company = %s""", (frappe.session['user'], company), as_dict=1)
and company = %s and ifnull(disabled,0) != 1""", (frappe.session['user'], company), as_dict=1)
if not pos_profile:
pos_profile = frappe.db.sql("""select * from `tabPOS Profile`
where ifnull(user,'') = '' and company = %s""", company, as_dict=1)
where ifnull(user,'') = '' and company = %s and ifnull(disabled,0) != 1""", company, as_dict=1)
return pos_profile and pos_profile[0] or None