mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-06 13:49:13 +00:00
fix: set sco_qty field of PO to non negative
(cherry picked from commit dfc3dc4944)
# Conflicts:
# erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
This commit is contained in:
@@ -910,13 +910,46 @@
|
|||||||
{
|
{
|
||||||
"fieldname": "column_break_fyqr",
|
"fieldname": "column_break_fyqr",
|
||||||
"fieldtype": "Column Break"
|
"fieldtype": "Column Break"
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "column_break_pjyo",
|
||||||
|
"fieldtype": "Column Break"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "job_card",
|
||||||
|
"fieldtype": "Link",
|
||||||
|
"label": "Job Card",
|
||||||
|
"options": "Job Card",
|
||||||
|
"search_index": 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fieldname": "distributed_discount_amount",
|
||||||
|
"fieldtype": "Currency",
|
||||||
|
"label": "Distributed Discount Amount",
|
||||||
|
"options": "currency"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"allow_on_submit": 1,
|
||||||
|
"fieldname": "sco_qty",
|
||||||
|
"fieldtype": "Float",
|
||||||
|
"label": "Subcontracted Quantity",
|
||||||
|
"no_copy": 1,
|
||||||
|
"non_negative": 1,
|
||||||
|
"read_only": 1
|
||||||
|
>>>>>>> dfc3dc4944 (fix: set sco_qty field of PO to non negative)
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"idx": 1,
|
"idx": 1,
|
||||||
"index_web_pages_for_search": 1,
|
"index_web_pages_for_search": 1,
|
||||||
"istable": 1,
|
"istable": 1,
|
||||||
"links": [],
|
"links": [],
|
||||||
|
<<<<<<< HEAD
|
||||||
"modified": "2024-02-05 11:23:24.859435",
|
"modified": "2024-02-05 11:23:24.859435",
|
||||||
|
=======
|
||||||
|
"modified": "2025-02-18 12:35:04.432636",
|
||||||
|
>>>>>>> dfc3dc4944 (fix: set sco_qty field of PO to non negative)
|
||||||
"modified_by": "Administrator",
|
"modified_by": "Administrator",
|
||||||
"module": "Buying",
|
"module": "Buying",
|
||||||
"name": "Purchase Order Item",
|
"name": "Purchase Order Item",
|
||||||
|
|||||||
Reference in New Issue
Block a user