Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14103 from rohitwaghchaure/asset_validation_issue_for_multiple_qty

Browse Source 
[Fix] Validation issue
This commit is contained in:
rohitwaghchaure 2018-05-16 23:58:09 +05:30 committed by GitHub
commit e8ef69ec33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -436,7 +436,7 @@ class PurchaseInvoice(BuyingController):
"remarks": self.get("remarks") or _("Accounting Entry for Stock"), "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
"credit": flt(item.rm_supp_cost) "credit": flt(item.rm_supp_cost)
}, warehouse_account[self.supplier_warehouse]["account_currency"])) }, warehouse_account[self.supplier_warehouse]["account_currency"]))
else: elif not item.is_fixed_asset:
gl_entries.append( gl_entries.append(
self.get_gl_dict({ self.get_gl_dict({
"account": item.expense_account, "account": item.expense_account,

4
erpnext/controllers/accounts_controller.py
View File

@ -621,8 +621,8 @@ class AccountsController(TransactionBase):
def validate_fixed_asset(self): def validate_fixed_asset(self):
for d in self.get("items"): for d in self.get("items"):
if d.is_fixed_asset: if d.is_fixed_asset:
if d.qty > 1: # if d.qty > 1:
frappe.throw(_("Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.").format(d.idx)) # frappe.throw(_("Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.").format(d.idx))
if d.meta.get_field("asset") and d.asset: if d.meta.get_field("asset") and d.asset:
asset = frappe.get_doc("Asset", d.asset) asset = frappe.get_doc("Asset", d.asset)