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

Renamed update_fg_goods_based_on in Manufacturing Settings to backflush_raw_materials_based_on

Browse Source
This commit is contained in:
Neil Trini Lasrado 2015-07-20 16:42:07 +05:30 committed by Nabin Hait
parent dde65752b6
commit 8ea2f45713
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
View File

@ -43,10 +43,10 @@
}, },
{ {
"default": "BOM", "default": "BOM",
"fieldname": "update_fg_based_on", "fieldname": "backflush_raw_materials_based_on",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Update FG Based On", "label": "Backflush Raw Materials Based On",
"options": "BOM\nMaterial Transfer for Manufacture", "options": "BOM\nMaterial Transferred for Manufacture",
"permlevel": 0, "permlevel": 0,
"precision": "" "precision": ""
}, },
@ -87,7 +87,7 @@
"in_create": 0, "in_create": 0,
"in_dialog": 0, "in_dialog": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 1, "issingle": 1,
"istable": 0, "istable": 0,
"modified": "2015-07-23 08:12:33.889753", "modified": "2015-07-23 08:12:33.889753",
"modified_by": "Administrator", "modified_by": "Administrator",

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

@ -554,7 +554,7 @@ class StockEntry(StockController):
self.add_to_stock_entry_detail(item_dict) self.add_to_stock_entry_detail(item_dict)
elif self.production_order and self.purpose == "Manufacture" and \ elif self.production_order and self.purpose == "Manufacture" and \
frappe.db.get_single_value("Manufacturing Settings", "update_fg_based_on")== "Material Transfer for Manufacture": frappe.db.get_single_value("Manufacturing Settings", "backflush_raw_materials_based_on")== "Material Transferred for Manufacture":
self.get_transfered_raw_materials() self.get_transfered_raw_materials()
else: else: