nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fixes] company for auto-material request

Browse Source
This commit is contained in:
Nabin Hait
2013-05-07 11:16:20 +05:30
parent 6754dda4a8
commit c1b9619321
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stock/doctype/bin/bin.py
View File

@@ -79,7 +79,7 @@ class DocType:
if (flt(args.get("actual_qty")) < 0 or flt(args.get("reserved_qty")) > 0) \ if (flt(args.get("actual_qty")) < 0 or flt(args.get("reserved_qty")) > 0) \
and args.get("is_cancelled") == 'No' and args.get("is_amended")=='No': and args.get("is_cancelled") == 'No' and args.get("is_amended")=='No':
self.reorder_item(args.get("voucher_type"), args.get("voucher_no")) self.reorder_item(args.get("voucher_type"), args.get("voucher_no"), args.get("company"))
def get_first_sle(self): def get_first_sle(self):
sle = sql(""" sle = sql("""
@@ -92,7 +92,7 @@ class DocType:
""", (self.doc.item_code, self.doc.warehouse), as_dict=1) """, (self.doc.item_code, self.doc.warehouse), as_dict=1)
return sle and sle[0] or None return sle and sle[0] or None
def reorder_item(self,doc_type,doc_name): def reorder_item(self,doc_type,doc_name, company):
""" Reorder item if stock reaches reorder level""" """ Reorder item if stock reaches reorder level"""
if not hasattr(webnotes, "auto_indent"): if not hasattr(webnotes, "auto_indent"):
webnotes.auto_indent = webnotes.conn.get_value('Global Defaults', None, 'auto_indent') webnotes.auto_indent = webnotes.conn.get_value('Global Defaults', None, 'auto_indent')
@@ -111,10 +111,10 @@ class DocType:
material_request_type = "Purchase" material_request_type = "Purchase"
if flt(reorder_qty) and flt(self.doc.projected_qty) < flt(reorder_level): if flt(reorder_qty) and flt(self.doc.projected_qty) < flt(reorder_level):
self.create_material_request(doc_type, doc_name, reorder_level, reorder_qty, self.create_material_request(doc_type, doc_name, reorder_level, reorder_qty,
material_request_type) company, material_request_type)
def create_material_request(self, doc_type, doc_name, reorder_level, reorder_qty, def create_material_request(self, doc_type, doc_name, reorder_level, reorder_qty, company,
material_request_type="Purchase"): material_request_type="Purchase"):
""" Create indent on reaching reorder level """ """ Create indent on reaching reorder level """
defaults = webnotes.defaults.get_defaults() defaults = webnotes.defaults.get_defaults()
@@ -122,7 +122,7 @@ class DocType:
mr = webnotes.bean([{ mr = webnotes.bean([{
"doctype": "Material Request", "doctype": "Material Request",
"company": defaults.company, "company": company or defaults.company,
"fiscal_year": defaults.fiscal_year, "fiscal_year": defaults.fiscal_year,
"transaction_date": nowdate(), "transaction_date": nowdate(),
"material_request_type": material_request_type, "material_request_type": material_request_type,