From 00cb0d029464a713fdc1046c7be1c3c05a745cab Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Tue, 29 Mar 2022 10:47:27 +0530 Subject: [PATCH] fix(asset): do not validate warehouse on asset purchase (cherry picked from commit 136466d255651ba29be16248e822c2a374114c67) # Conflicts: # erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py --- .../accounts/doctype/purchase_invoice/purchase_invoice.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 49a01dcaa19..a026445831d 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -245,6 +245,7 @@ class PurchaseInvoice(BuyingController): def validate_warehouse(self, for_validate=True): if self.update_stock and for_validate: +<<<<<<< HEAD for d in self.get("items"): if not d.warehouse: frappe.throw( @@ -252,6 +253,12 @@ class PurchaseInvoice(BuyingController): "Warehouse required at Row No {0}, please set default warehouse for the item {1} for the company {2}" ).format(d.idx, d.item_code, self.company) ) +======= + for d in self.get('items'): + if not d.warehouse and not d.is_fixed_asset: + frappe.throw(_("Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"). + format(d.idx, d.item_code, self.company), exc=WarehouseMissingError) +>>>>>>> 136466d255 (fix(asset): do not validate warehouse on asset purchase) super(PurchaseInvoice, self).validate_warehouse()