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

Merge pull request #21968 from frappe/mergify/bp/version-13-beta-pre-release/pr-21957

Browse Source 
fix: label changed in production plan (bp #21957)
This commit is contained in:
Deepesh Garg 2020-05-27 19:01:24 +05:30 committed by GitHub
commit 3258a050d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/production_plan/production_plan.js
View File

@ -201,9 +201,9 @@ frappe.ui.form.on('Production Plan', {
title: title,
fields: [
{
"fieldtype": "Table MultiSelect", "label": __("Source Warehouses"),
"fieldtype": "Table MultiSelect", "label": __("Source Warehouses (Optional)"),
"fieldname": "warehouses", "options": "Production Plan Material Request Warehouse",
"description": "System will pickup the materials from the selected warehouses",
"description": __("System will pickup the materials from the selected warehouses. If not specified, system will create material request for purchase."),
get_query: function () {
return {
filters: {

2
erpnext/manufacturing/report/bom_operations_time/bom_operations_time.py
View File

@ -103,7 +103,7 @@ def get_columns(filters):
"fieldtype": "Int",
"width": 140
}, {
"label": _("Subassembly BOM Count"),
"label": _("Sub-assembly BOM Count"),
"fieldname": "used_as_subassembly_items",
"fieldtype": "Int",
"width": 180