mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-02 11:49:10 +00:00
refactor: move logic to validate function
This commit is contained in:
@@ -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,6 +251,7 @@ class SubcontractingReceipt(SubcontractingController):
|
|||||||
if not item.cost_center:
|
if not item.cost_center:
|
||||||
item.cost_center = cost_center
|
item.cost_center = cost_center
|
||||||
|
|
||||||
|
def set_supplied_items_cost_center(self):
|
||||||
for item in self.supplied_items:
|
for item in self.supplied_items:
|
||||||
if not item.cost_center:
|
if not item.cost_center:
|
||||||
item.cost_center = get_default_cost_center(
|
item.cost_center = get_default_cost_center(
|
||||||
@@ -266,10 +270,17 @@ class SubcontractingReceipt(SubcontractingController):
|
|||||||
if not item.expense_account:
|
if not item.expense_account:
|
||||||
item.expense_account = expense_account
|
item.expense_account = expense_account
|
||||||
|
|
||||||
|
def set_supplied_items_expense_account(self):
|
||||||
for item in self.supplied_items:
|
for item in self.supplied_items:
|
||||||
if not item.expense_account:
|
if not item.expense_account:
|
||||||
item.expense_account = get_default_expense_account(
|
item.expense_account = get_default_expense_account(
|
||||||
frappe._dict({"expense_account": expense_account}),
|
frappe._dict(
|
||||||
|
{
|
||||||
|
"expense_account": self.get_company_default(
|
||||||
|
"default_expense_account", ignore_validation=True
|
||||||
|
)
|
||||||
|
}
|
||||||
|
),
|
||||||
get_item_defaults(item.rm_item_code, self.company),
|
get_item_defaults(item.rm_item_code, self.company),
|
||||||
get_item_group_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),
|
get_brand_defaults(item.rm_item_code, self.company),
|
||||||
|
|||||||
Reference in New Issue
Block a user