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

Fixes in Default Warehouse

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-08-24 15:52:27 +05:30
parent 75d90b1c00
commit 92a3dbb5d3
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/manufacturing/doctype/production_order/production_order.js
View File

@ -12,12 +12,12 @@ frappe.ui.form.on("Production Order", "onload", function(frm) {
"actual_start_date": "", "actual_start_date": "",
"actual_end_date": "" "actual_end_date": ""
}); });
erpnext.production_order.set_default_warehouse(frm);
} }
erpnext.production_order.set_custom_buttons(frm); erpnext.production_order.set_custom_buttons(frm);
erpnext.production_order.setup_company_filter(frm); erpnext.production_order.setup_company_filter(frm);
erpnext.production_order.setup_bom_filter(frm); erpnext.production_order.setup_bom_filter(frm);
erpnext.production_order.set_default_warehouse(frm);
}); });
frappe.ui.form.on("Production Order", "refresh", function(frm) { frappe.ui.form.on("Production Order", "refresh", function(frm) {
@ -147,8 +147,8 @@ erpnext.production_order = {
callback: function(r) { callback: function(r) {
if(!r.exe) { if(!r.exe) {
frm.set_value("wip_warehouse", r.message[0]); frm.set_value("wip_warehouse", r.message.wip_warehouse);
frm.set_value("fg_warehouse", r.message[1]) frm.set_value("fg_warehouse", r.message.fg_warehouse)
} }
} }
}); });

2
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@ -427,4 +427,4 @@ def make_time_log(name, operation, from_time=None, to_time=None, qty=None, proj
def get_default_warehouse(): def get_default_warehouse():
wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse") wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse")
fg_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_fg_warehouse") fg_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_fg_warehouse")
return wip_warehouse, fg_warehouse return {"wip_warehouse": wip_warehouse, "fg_warehouse": fg_warehouse}

7
erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
View File

@ -208,9 +208,11 @@ class ProductionPlanningTool(Document):
pro.update(items[key]) pro.update(items[key])
pro.set_production_order_operations() pro.set_production_order_operations()
if warehouse: if warehouse:
pro.wip_warehouse = warehouse[0] pro.wip_warehouse = warehouse.get('wip_warehouse')
pro.fg_warehouse = warehouse[1] if not pro.fg_warehouse:
pro.fg_warehouse = warehouse.get('fg_warehouse')
frappe.flags.mute_messages = True frappe.flags.mute_messages = True
try: try:
pro.insert() pro.insert()
pro_list.append(pro.name) pro_list.append(pro.name)
@ -218,7 +220,6 @@ class ProductionPlanningTool(Document):
pass pass
frappe.flags.mute_messages = False frappe.flags.mute_messages = False
return pro_list return pro_list
def download_raw_materials(self): def download_raw_materials(self):