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

Merge branch 'develop' of https://github.com/frappe/erpnext into develop

Browse Source
This commit is contained in:
Abhishek Balam 2020-04-25 02:46:00 +05:30
commit 291837e63d
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@ -32,6 +32,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
me.frm.script_manager.trigger("is_pos"); me.frm.script_manager.trigger("is_pos");
me.frm.refresh_fields(); me.frm.refresh_fields();
} }
erpnext.queries.setup_warehouse_query(this.frm);
}, },
refresh: function(doc, dt, dn) { refresh: function(doc, dt, dn) {

1
erpnext/manufacturing/doctype/production_plan/production_plan.py
View File

@ -346,6 +346,7 @@ class ProductionPlan(Document):
if not wo.fg_warehouse: if not wo.fg_warehouse:
wo.fg_warehouse = warehouse.get('fg_warehouse') wo.fg_warehouse = warehouse.get('fg_warehouse')
try: try:
wo.flags.ignore_mandatory = True
wo.insert() wo.insert()
return wo.name return wo.name
except OverProductionError: except OverProductionError:

3
erpnext/manufacturing/doctype/work_order/work_order.js
View File

@ -313,7 +313,7 @@ frappe.ui.form.on("Work Order", {
"Work in Progress": "progress-bar-warning", "Work in Progress": "progress-bar-warning",
"Completed": "progress-bar-success" "Completed": "progress-bar-success"
}; };
let bars = []; let bars = [];
let message = ''; let message = '';
let title = ''; let title = '';
@ -404,7 +404,6 @@ frappe.ui.form.on("Work Order", {
}, },
before_submit: function(frm) { before_submit: function(frm) {
frm.toggle_reqd(["fg_warehouse", "wip_warehouse"], true);
frm.fields_dict.required_items.grid.toggle_reqd("source_warehouse", true); frm.fields_dict.required_items.grid.toggle_reqd("source_warehouse", true);
frm.toggle_reqd("transfer_material_against", frm.toggle_reqd("transfer_material_against",
frm.doc.operations && frm.doc.operations.length > 0); frm.doc.operations && frm.doc.operations.length > 0);

6
erpnext/manufacturing/doctype/work_order/work_order.json
View File

@ -231,6 +231,7 @@
"fieldname": "wip_warehouse", "fieldname": "wip_warehouse",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Work-in-Progress Warehouse", "label": "Work-in-Progress Warehouse",
"mandatory_depends_on": "eval:!doc.skip_transfer || doc.from_wip_warehouse",
"options": "Warehouse" "options": "Warehouse"
}, },
{ {
@ -238,7 +239,8 @@
"fieldname": "fg_warehouse", "fieldname": "fg_warehouse",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Target Warehouse", "label": "Target Warehouse",
"options": "Warehouse" "options": "Warehouse",
"reqd": 1
}, },
{ {
"fieldname": "column_break_12", "fieldname": "column_break_12",
@ -481,7 +483,7 @@
"image_field": "image", "image_field": "image",
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2020-01-31 12:46:23.636033", "modified": "2020-04-24 19:32:43.323054",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Work Order", "name": "Work Order",