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

fix: show uom in print formats instead of stock uom (#20843)

Browse Source 
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
This commit is contained in:
Saqib 2020-03-06 11:03:46 +05:30 committed by GitHub
parent fc96c1a2d6
commit b978d79573
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@ -63,7 +63,6 @@
"warehouse_section",
"warehouse",
"rejected_warehouse",
"from_warehouse",
"quality_inspection",
"batch_no",
"col_br_wh",
@ -199,7 +198,6 @@
"fieldtype": "Link",
"label": "UOM",
"options": "UOM",
"print_hide": 1,
"reqd": 1
},
{
@ -763,22 +761,16 @@
"fetch_from": "item_code.asset_category",
"fieldname": "asset_category",
"fieldtype": "Data",
"in_preview": 1,
"label": "Asset Category",
"options": "Asset Category",
"read_only": 1
},
{
"fieldname": "from_warehouse",
"fieldtype": "Link",
"ignore_user_permissions": 1,
"label": "Supplier Warehouse",
"options": "Warehouse"
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2020-01-13 16:04:14.200462",
"modified": "2020-03-05 14:20:17.297284",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",

8
erpnext/selling/doctype/quotation_item/quotation_item.json
View File

@ -1,4 +1,5 @@
{
"actions": [],
"creation": "2013-03-07 11:42:57",
"doctype": "DocType",
"document_type": "Document",
@ -163,6 +164,7 @@
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
"options": "UOM",
"print_hide": 1,
"print_width": "100px",
"read_only": 1,
"width": "100px"
@ -176,7 +178,6 @@
"fieldtype": "Link",
"label": "UOM",
"options": "UOM",
"print_hide": 1,
"reqd": 1
},
{
@ -382,6 +383,7 @@
"read_only": 1
},
{
"default": "0",
"fieldname": "is_free_item",
"fieldtype": "Check",
"label": "Is Free Item",
@ -517,6 +519,7 @@
},
{
"allow_on_submit": 1,
"default": "0",
"fieldname": "page_break",
"fieldtype": "Check",
"label": "Page Break",
@ -574,7 +577,8 @@
],
"idx": 1,
"istable": 1,
"modified": "2019-05-01 17:39:14.228141",
"links": [],
"modified": "2020-03-05 14:18:58.783751",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation Item",

3
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

@ -212,7 +212,6 @@
"fieldtype": "Link",
"label": "UOM",
"options": "UOM",
"print_hide": 1,
"reqd": 1
},
{
@ -770,7 +769,7 @@
"idx": 1,
"istable": 1,
"links": [],
"modified": "2020-01-13 12:29:03.103797",
"modified": "2020-03-05 14:20:28.085117",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order Item",

6
erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
View File

@ -1,4 +1,5 @@
{
"actions": [],
"autoname": "hash",
"creation": "2013-04-22 13:15:44",
"doctype": "DocType",
@ -180,6 +181,7 @@
"oldfieldname": "stock_uom",
"oldfieldtype": "Data",
"options": "UOM",
"print_hide": 1,
"print_width": "50px",
"read_only": 1,
"reqd": 1,
@ -195,7 +197,6 @@
"in_list_view": 1,
"label": "UOM",
"options": "UOM",
"print_hide": 1,
"reqd": 1
},
{
@ -702,7 +703,8 @@
],
"idx": 1,
"istable": 1,
"modified": "2019-05-25 22:08:27.452734",
"links": [],
"modified": "2020-03-05 14:18:33.131672",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",

13
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@ -68,7 +68,6 @@
"warehouse_and_reference",
"warehouse",
"rejected_warehouse",
"from_warehouse",
"purchase_order",
"material_request",
"column_break_40",
@ -224,7 +223,6 @@
"oldfieldname": "uom",
"oldfieldtype": "Link",
"options": "UOM",
"print_hide": 1,
"print_width": "100px",
"reqd": 1,
"width": "100px"
@ -817,23 +815,16 @@
"fetch_from": "item_code.asset_category",
"fieldname": "asset_category",
"fieldtype": "Link",
"in_preview": 1,
"label": "Asset Category",
"options": "Asset Category",
"read_only": 1
},
{
"fieldname": "from_warehouse",
"fieldtype": "Link",
"hidden": 1,
"ignore_user_permissions": 1,
"label": "Supplier Warehouse",
"options": "Warehouse"
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2020-01-13 16:03:34.879827",
"modified": "2020-03-05 14:19:48.799370",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",