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

fix: Sider + Fields UX

Browse Source 
- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM
This commit is contained in:
marination 2021-11-15 17:17:29 +05:30
parent 5fb5a757cf
commit afe1c45f7f
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,10 +22,10 @@
"received_qty", "received_qty",
"qty", "qty",
"rejected_qty", "rejected_qty",
"stock_uom",
"col_break2", "col_break2",
"uom", "uom",
"conversion_factor", "conversion_factor",
"stock_uom",
"stock_qty", "stock_qty",
"sec_break1", "sec_break1",
"price_list_rate", "price_list_rate",
@ -175,7 +175,8 @@
{ {
"fieldname": "received_qty", "fieldname": "received_qty",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Received Qty" "label": "Received Qty",
"read_only": 1
}, },
{ {
"bold": 1, "bold": 1,
@ -223,7 +224,7 @@
{ {
"fieldname": "stock_qty", "fieldname": "stock_qty",
"fieldtype": "Float", "fieldtype": "Float",
"label": "Stock Qty", "label": "Accepted Qty in Stock UOM",
"print_hide": 1, "print_hide": 1,
"read_only": 1, "read_only": 1,
"reqd": 1 "reqd": 1
@ -870,10 +871,11 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-09-01 16:04:03.538643", "modified": "2021-11-15 17:04:07.191013",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Item", "name": "Purchase Invoice Item",
"naming_rule": "Random",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"sort_field": "modified", "sort_field": "modified",

2
erpnext/controllers/buying_controller.py
View File

@ -365,7 +365,7 @@ class BuyingController(StockController, Subcontracting):
d.received_qty = flt(d.qty) + flt(d.rejected_qty) d.received_qty = flt(d.qty) + flt(d.rejected_qty)
# Check Received Qty = Accepted Qty + Rejected Qty # Check Received Qty = Accepted Qty + Rejected Qty
val = flt(d.qty) + flt(d.rejected_qty) val = flt(d.qty) + flt(d.rejected_qty)
if (flt(val, d.precision("received_qty")) != flt(d.received_qty, d.precision("received_qty"))): if (flt(val, d.precision("received_qty")) != flt(d.received_qty, d.precision("received_qty"))):
frappe.throw(_("Accepted + Rejected Qty must be equal to Received quantity for Item {0}").format(d.item_code)) frappe.throw(_("Accepted + Rejected Qty must be equal to Received quantity for Item {0}").format(d.item_code))

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

@ -221,8 +221,10 @@
"width": "100px" "width": "100px"
}, },
{ {
"columns": 1,
"fieldname": "rejected_qty", "fieldname": "rejected_qty",
"fieldtype": "Float", "fieldtype": "Float",
"in_list_view": 1,
"label": "Rejected Quantity", "label": "Rejected Quantity",
"oldfieldname": "rejected_qty", "oldfieldname": "rejected_qty",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@ -329,7 +331,7 @@
}, },
{ {
"bold": 1, "bold": 1,
"columns": 3, "columns": 2,
"fieldname": "rate", "fieldname": "rate",
"fieldtype": "Currency", "fieldtype": "Currency",
"in_list_view": 1, "in_list_view": 1,
@ -974,7 +976,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2021-11-03 17:56:53.916921", "modified": "2021-11-15 15:46:10.591600",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt Item", "name": "Purchase Receipt Item",