From b7b49f6da7c7b9498b9f55bcb2d89900d5f32600 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 19 Jun 2017 09:58:48 +0530 Subject: [PATCH] [fixes] fix message and type conversion; --- erpnext/hr/doctype/expense_claim_type/expense_claim_type.py | 5 +++-- erpnext/stock/doctype/stock_entry/stock_entry.py | 3 ++- erpnext/utilities/transaction_base.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py index 5e6a7a868d..2595506486 100644 --- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py +++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py @@ -10,7 +10,7 @@ class ExpenseClaimType(Document): def validate(self): self.validate_accounts() self.validate_repeating_companies() - + def validate_repeating_companies(self): """Error when Same Company is entered multiple times in accounts""" accounts_list = [] @@ -24,4 +24,5 @@ class ExpenseClaimType(Document): for entry in self.accounts: """Error when Company of Ledger account doesn't match with Company Selected""" if frappe.db.get_value("Account", entry.default_account, "company") != entry.company: - frappe.throw(_("Account does not match with Company")) \ No newline at end of file + frappe.throw(_("Account {0} does not match with Company {1}" + ).format(entry.default_account, entry.company)) \ No newline at end of file diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py index 169bfd9121..c31d7acb21 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry.py +++ b/erpnext/stock/doctype/stock_entry/stock_entry.py @@ -83,7 +83,8 @@ class StockEntry(StockController): frappe.throw(_("Row {0}: Qty is mandatory").format(item.idx)) if not flt(item.conversion_factor): frappe.throw(_("Row {0}: UOM Conversion Factor is mandatory").format(item.idx)) - item.transfer_qty = flt(item.qty * item.conversion_factor, self.precision("transfer_qty", item)) + item.transfer_qty = flt(flt(item.qty) * flt(item.conversion_factor), + self.precision("transfer_qty", item)) def validate_item(self): stock_items = self.get_stock_items() diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py index 7657188bb0..256f847a65 100644 --- a/erpnext/utilities/transaction_base.py +++ b/erpnext/utilities/transaction_base.py @@ -149,5 +149,5 @@ def validate_uom_is_integer(doc, uom_field, qty_fields, child_dt=None): for f in qty_fields: qty = d.get(f) if qty: - if abs(int(qty) - float(qty)) > 0.0000001: + if abs(cint(qty) - flt(qty)) > 0.0000001: frappe.throw(_("Quantity ({0}) cannot be a fraction in row {1}").format(qty, d.idx), UOMMustBeIntegerError)