From e729516af7877b6fd1f80bd0f5c2a1bf6ca5c980 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 7 Jul 2014 15:54:11 +0530 Subject: [PATCH] Minor fix --- erpnext/accounts/utils.py | 2 +- erpnext/setup/doctype/item_group/item_group.py | 1 + erpnext/setup/doctype/sales_partner/sales_partner.py | 1 + erpnext/stock/doctype/item/item.py | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 60a755b440..bc005d7c94 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -184,7 +184,7 @@ def update_against_doc(d, jv_obj): ch = jv_obj.append("entries") ch.account = d['account'] ch.cost_center = cstr(jvd[0][0]) - ch.balance = cstr(jvd[0][1]) + ch.balance = flt(jvd[0][1]) ch.set(d['dr_or_cr'], flt(d['unadjusted_amt']) - flt(d['allocated_amt'])) ch.set(d['dr_or_cr']== 'debit' and 'credit' or 'debit', 0) ch.against_account = cstr(jvd[0][2]) diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py index cf3442d90b..745345e58a 100644 --- a/erpnext/setup/doctype/item_group/item_group.py +++ b/erpnext/setup/doctype/item_group/item_group.py @@ -19,6 +19,7 @@ class ItemGroup(NestedSet, WebsiteGenerator): self.name = self.item_group_name def validate(self): + WebsiteGenerator.validate(self) if not self.parent_website_route: if frappe.db.get_value("Item Group", self.parent_item_group, "show_in_website"): self.parent_website_route = frappe.get_website_route("Item Group", diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.py b/erpnext/setup/doctype/sales_partner/sales_partner.py index 296cd6aef9..0209df3302 100644 --- a/erpnext/setup/doctype/sales_partner/sales_partner.py +++ b/erpnext/setup/doctype/sales_partner/sales_partner.py @@ -14,6 +14,7 @@ class SalesPartner(WebsiteGenerator): self.name = self.partner_name def validate(self): + super(SalesPartner, self).validate() if self.partner_website and not self.partner_website.startswith("http"): self.partner_website = "http://" + self.partner_website diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index 1de9ad29be..21ed0571de 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/erpnext/stock/doctype/item/item.py @@ -30,6 +30,8 @@ class Item(WebsiteGenerator): self.name = self.item_code def validate(self): + super(Item, self).validate() + if not self.stock_uom: msgprint(_("Please enter default Unit of Measure"), raise_exception=1) if self.image and not self.website_image: