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

Minor improvements based on skip_transfer (#10457)

Browse Source
This commit is contained in:
Nabin Hait 2017-08-22 19:07:16 +05:30 committed by GitHub
parent 382f5eb1b1
commit 34c218b2de
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ frappe.ui.form.on("Production Order", {
frm.set_indicator_formatter('operation', frm.set_indicator_formatter('operation',
function(doc) { return (frm.doc.qty==doc.completed_qty) ? "green" : "orange" }); function(doc) { return (frm.doc.qty==doc.completed_qty) ? "green" : "orange" });
}, },
refresh: function(frm) { refresh: function(frm) {
erpnext.toggle_naming_series(); erpnext.toggle_naming_series();
erpnext.production_order.set_custom_buttons(frm); erpnext.production_order.set_custom_buttons(frm);

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

@ -523,7 +523,8 @@ def set_production_order_ops(name):
@frappe.whitelist() @frappe.whitelist()
def make_stock_entry(production_order_id, purpose, qty=None): def make_stock_entry(production_order_id, purpose, qty=None):
production_order = frappe.get_doc("Production Order", production_order_id) production_order = frappe.get_doc("Production Order", production_order_id)
if not frappe.db.get_value("Warehouse", production_order.wip_warehouse, "is_group"): if not frappe.db.get_value("Warehouse", production_order.wip_warehouse, "is_group") \
and not production_order.skip_transfer:
wip_warehouse = production_order.wip_warehouse wip_warehouse = production_order.wip_warehouse
else: else:
wip_warehouse = None wip_warehouse = None

3
erpnext/manufacturing/doctype/production_order_item/production_order_item.json
View File

@ -229,6 +229,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "eval:!parent.skip_transfer",
"fieldname": "transferred_qty", "fieldname": "transferred_qty",
"fieldtype": "Float", "fieldtype": "Float",
"hidden": 0, "hidden": 0,
@ -353,7 +354,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-07-10 17:37:20.212361", "modified": "2017-08-18 18:11:10.311736",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Production Order Item", "name": "Production Order Item",

2
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -556,7 +556,7 @@ class StockEntry(StockController):
item_dict = self.get_bom_raw_materials(self.fg_completed_qty) item_dict = self.get_bom_raw_materials(self.fg_completed_qty)
for item in item_dict.values(): for item in item_dict.values():
if self.pro_doc: if self.pro_doc and not self.pro_doc.skip_transfer:
item["from_warehouse"] = self.pro_doc.wip_warehouse item["from_warehouse"] = self.pro_doc.wip_warehouse
item["to_warehouse"] = self.to_warehouse if self.purpose=="Subcontract" else "" item["to_warehouse"] = self.to_warehouse if self.purpose=="Subcontract" else ""