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

refactor: move logic to validate function

Browse Source
This commit is contained in:
Mihir Kandoi
2025-05-27 16:23:42 +05:30
parent 44bec1f981
commit 93b33faabf
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
View File

@@ -145,6 +145,9 @@ class SubcontractingReceipt(SubcontractingController):
self.reset_default_field_value("rejected_warehouse", "items", "rejected_warehouse") self.reset_default_field_value("rejected_warehouse", "items", "rejected_warehouse")
self.get_current_stock() self.get_current_stock()
self.set_supplied_items_expense_account()
self.set_supplied_items_cost_center()
def on_submit(self): def on_submit(self):
self.validate_closed_subcontracting_order() self.validate_closed_subcontracting_order()
self.validate_available_qty_for_consumption() self.validate_available_qty_for_consumption()
@@ -248,15 +251,16 @@ class SubcontractingReceipt(SubcontractingController):
if not item.cost_center: if not item.cost_center:
item.cost_center = cost_center item.cost_center = cost_center
for item in self.supplied_items: def set_supplied_items_cost_center(self):
if not item.cost_center: for item in self.supplied_items:
item.cost_center = get_default_cost_center( if not item.cost_center:
{"project": self.project}, item.cost_center = get_default_cost_center(
get_item_defaults(item.rm_item_code, self.company), {"project": self.project},
get_item_group_defaults(item.rm_item_code, self.company), get_item_defaults(item.rm_item_code, self.company),
get_brand_defaults(item.rm_item_code, self.company), get_item_group_defaults(item.rm_item_code, self.company),
self.company, get_brand_defaults(item.rm_item_code, self.company),
) self.company,
)
def set_items_expense_account(self): def set_items_expense_account(self):
if self.company: if self.company:
@@ -266,14 +270,21 @@ class SubcontractingReceipt(SubcontractingController):
if not item.expense_account: if not item.expense_account:
item.expense_account = expense_account item.expense_account = expense_account
for item in self.supplied_items: def set_supplied_items_expense_account(self):
if not item.expense_account: for item in self.supplied_items:
item.expense_account = get_default_expense_account( if not item.expense_account:
frappe._dict({"expense_account": expense_account}), item.expense_account = get_default_expense_account(
get_item_defaults(item.rm_item_code, self.company), frappe._dict(
get_item_group_defaults(item.rm_item_code, self.company), {
get_brand_defaults(item.rm_item_code, self.company), "expense_account": self.get_company_default(
) "default_expense_account", ignore_validation=True
)
}
),
get_item_defaults(item.rm_item_code, self.company),
get_item_group_defaults(item.rm_item_code, self.company),
get_brand_defaults(item.rm_item_code, self.company),
)
def reset_supplied_items(self): def reset_supplied_items(self):
if ( if (