nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'version-14-hotfix' into patch-2

Browse Source
This commit is contained in:
Sagar Sharma
2022-11-05 10:29:11 +05:30
committed by GitHub
parent 2f145f9912 d9147c1975
commit d443925b1e
18 changed files with 351 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@
"engine": "InnoDB",
"field_order": [
"barcode",
"has_item_scanned",
"item_code",
"item_name",
"col_break1",
@@ -809,13 +810,21 @@
"label": "Purchase Order Item",
"print_hide": 1,
"read_only": 1
},
{
"default": "0",
"depends_on": "barcode",
"fieldname": "has_item_scanned",
"fieldtype": "Check",
"label": "Has Item Scanned",
"read_only": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2022-10-26 16:05:17.720768",
"modified": "2022-11-02 12:54:07.225623",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",

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

@@ -8,6 +8,7 @@
"engine": "InnoDB",
"field_order": [
"barcode",
"has_item_scanned",
"section_break_2",
"item_code",
"product_bundle",
@@ -996,12 +997,20 @@
{
"fieldname": "column_break_102",
"fieldtype": "Column Break"
},
{
"default": "0",
"depends_on": "barcode",
"fieldname": "has_item_scanned",
"fieldtype": "Check",
"label": "Has Item Scanned",
"read_only": 1
}
],
"idx": 1,
"istable": 1,
"links": [],
"modified": "2022-10-26 16:06:02.524435",
"modified": "2022-11-02 12:49:28.746701",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",

27
erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
View File

@@ -8,6 +8,7 @@
"engine": "InnoDB",
"field_order": [
"barcode",
"has_item_scanned",
"section_break_2",
"s_warehouse",
"col_break1",
@@ -498,14 +499,14 @@
"read_only": 1
},
{
"fieldname": "sco_rm_detail",
"fieldtype": "Data",
"hidden": 1,
"label": "SCO Supplied Item",
"no_copy": 1,
"print_hide": 1,
"read_only": 1
},
"fieldname": "sco_rm_detail",
"fieldtype": "Data",
"hidden": 1,
"label": "SCO Supplied Item",
"no_copy": 1,
"print_hide": 1,
"read_only": 1
},
{
"default": "0",
"depends_on": "eval:parent.purpose===\"Repack\" && doc.t_warehouse",
@@ -563,13 +564,21 @@
"fieldname": "is_process_loss",
"fieldtype": "Check",
"label": "Is Process Loss"
},
{
"default": "0",
"depends_on": "barcode",
"fieldname": "has_item_scanned",
"fieldtype": "Check",
"label": "Has Item Scanned",
"read_only": 1
}
],
"idx": 1,
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
"modified": "2022-06-17 05:06:33.621264",
"modified": "2022-11-02 13:00:34.258828",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry Detail",

10
erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
View File

@@ -7,6 +7,7 @@
"engine": "InnoDB",
"field_order": [
"barcode",
"has_item_scanned",
"item_code",
"item_name",
"warehouse",
@@ -177,11 +178,18 @@
"label": "Allow Zero Valuation Rate",
"print_hide": 1,
"read_only": 1
},
{
"depends_on": "barcode",
"fieldname": "has_item_scanned",
"fieldtype": "Data",
"label": "Has Item Scanned",
"read_only": 1
}
],
"istable": 1,
"links": [],
"modified": "2022-04-02 04:19:40.380587",
"modified": "2022-11-02 13:01:23.580937",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reconciliation Item",