diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json index 2c1552f0269..a2d962cd959 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.json +++ b/erpnext/assets/doctype/asset_repair/asset_repair.json @@ -21,13 +21,12 @@ "column_break_14", "project", "accounting_details", - "payable_account", - "purchase_invoice", + "repair_cost", + "capitalize_repair_cost", "stock_consumption", "column_break_8", - "repair_cost", "total_repair_cost", - "capitalize_repair_cost", + "purchase_invoice", "stock_consumption_details_section", "warehouse", "stock_items", @@ -149,12 +148,6 @@ "fieldtype": "Read Only", "label": "Asset Name" }, - { - "fieldname": "payable_account", - "fieldtype": "Link", - "label": "Payable Account", - "options": "Account" - }, { "fieldname": "column_break_8", "fieldtype": "Column Break" @@ -243,7 +236,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2021-05-13 23:01:03.638835", + "modified": "2021-05-14 02:31:57.226273", "modified_by": "Administrator", "module": "Assets", "name": "Asset Repair", diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py index 2807c0f5bd6..5849c8ddd60 100644 --- a/erpnext/assets/doctype/asset_repair/asset_repair.py +++ b/erpnext/assets/doctype/asset_repair/asset_repair.py @@ -38,7 +38,6 @@ class AssetRepair(Document): def on_submit(self): self.check_repair_status() - self.check_for_payable_account() self.check_for_cost_center() if self.stock_consumption or self.capitalize_repair_cost: @@ -60,10 +59,6 @@ class AssetRepair(Document): if not self.warehouse: frappe.throw(_("Please enter Warehouse from which Stock Items consumed during Asset Repair were taken.")) - def check_for_payable_account(self): - if not self.payable_account: - frappe.throw(_("Please enter Payable Account.")) - def check_for_cost_center(self): if not self.cost_center: frappe.throw(_("Please enter Cost Center.")) @@ -98,8 +93,7 @@ class AssetRepair(Document): frappe.throw(_("Please link Purchase Invoice.")) def on_cancel(self): - if self.payable_account: - self.make_gl_entries(cancel=True) + self.make_gl_entries(cancel=True) def make_gl_entries(self, cancel=False): if flt(self.repair_cost) > 0: