CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-30 17:42:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: show material to supplier button (backport #41686) (#41688)

Browse Source 
fix: show material to supplier button (#41686)

(cherry picked from commit be9f960705)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2024-05-30 16:13:53 +05:30
committed by GitHub
parent 0a0970e0e7
commit 1a24914aed
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.js
View File

@@ -235,9 +235,11 @@ erpnext.buying.SubcontractingOrderController = class SubcontractingOrderControll
} }
has_unsupplied_items() { has_unsupplied_items() {
return this.frm.doc["supplied_items"].some( let over_transfer_allowance = this.frm.doc.__onload.over_transfer_allowance;
(item) => item.required_qty > item.supplied_qty - item.returned_qty return this.frm.doc["supplied_items"].some((item) => {
); let required_qty = item.required_qty + (item.required_qty * over_transfer_allowance) / 100;
return required_qty > item.supplied_qty - item.returned_qty;
});
} }
make_subcontracting_receipt() { make_subcontracting_receipt() {

6
erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
View File

@@ -99,6 +99,12 @@ class SubcontractingOrder(SubcontractingController):
} }
] ]
def onload(self):
self.set_onload(
"over_transfer_allowance",
frappe.db.get_single_value("Buying Settings", "over_transfer_allowance"),
)
def before_validate(self): def before_validate(self):
super().before_validate() super().before_validate()