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

fix(stock): validate over delivery/receipt allowance in stock settings

Browse Source 
(cherry picked from commit 446ec6030a)

# Conflicts:
#	erpnext/stock/doctype/stock_settings/stock_settings.json
#	erpnext/stock/doctype/stock_settings/stock_settings.py
This commit is contained in:
Afsal Syed
2026-08-02 02:31:21 +05:30
committed by Mergify
parent 833ccd3358
commit 3f3292ca4a
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +140,8 @@
"description": "The percentage you are allowed to receive or deliver more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed to receive 110 units.",
"fieldname": "over_delivery_receipt_allowance",
"fieldtype": "Float",
"label": "Over Delivery/Receipt Allowance (%)"
"label": "Over Delivery/Receipt Allowance (%)",
"non_negative": 1
},
{
"default": "Stop",
@@ -291,7 +292,8 @@
"description": "The percentage you are allowed to transfer more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed transfer 110 units.",
"fieldname": "mr_qty_allowance",
"fieldtype": "Float",
"label": "Over Transfer Allowance (%)"
"label": "Over Transfer Allowance (%)",
"non_negative": 1
},
{
"default": "0",
@@ -452,7 +454,8 @@
"description": "The percentage you are allowed to pick more items in the pick list than the ordered quantity.",
"fieldname": "over_picking_allowance",
"fieldtype": "Percent",
"label": "Over Picking Allowance (%)"
"label": "Over Picking Allowance (%)",
"non_negative": 1
},
{
"default": "1",
@@ -602,7 +605,11 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
<<<<<<< HEAD
"modified": "2026-06-13 12:38:02.202183",
=======
"modified": "2026-08-01 23:35:02.896836",
>>>>>>> 446ec6030a (fix(stock): validate over delivery/receipt allowance in stock settings)
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Settings",

10
erpnext/stock/doctype/stock_settings/stock_settings.py
View File

@@ -70,7 +70,7 @@ class StockSettings(Document):
use_naming_series: DF.Check
use_serial_batch_fields: DF.Check
validate_material_transfer_warehouses: DF.Check
valuation_method: DF.Literal["FIFO", "Moving Average", "LIFO"]
valuation_method: DF.Literal["FIFO", "Moving Average", "LIFO", "Standard Cost"]
# end: auto-generated types
def validate(self):
@@ -104,7 +104,11 @@ class StockSettings(Document):
validate_fields_for_doctype=False,
)
<<<<<<< HEAD
self.validate_warehouses()
=======
self.validate_over_delivery_receipt_allowance()
>>>>>>> 446ec6030a (fix(stock): validate over delivery/receipt allowance in stock settings)
self.validate_serial_and_batch_no_settings()
self.cant_change_valuation_method()
self.validate_clean_description_html()
@@ -116,6 +120,10 @@ class StockSettings(Document):
self.change_precision_for_stock_entry()
self.validate_do_not_use_batchwise_valuation()
def validate_over_delivery_receipt_allowance(self):
if not self.over_delivery_receipt_allowance:
self.role_allowed_to_over_deliver_receive = None
def validate_do_not_use_batchwise_valuation(self):
doc_before_save = self.get_doc_before_save()
if not doc_before_save: