From 308e6ea21eca26e908a1f664305b00a13ce70225 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 24 Mar 2015 17:34:58 +0530 Subject: [PATCH] [fixes] default_website and stock reco --- erpnext/hooks.py | 4 +++- erpnext/setup/page/setup_wizard/default_website.py | 4 ++-- erpnext/setup/page/setup_wizard/setup_wizard.py | 4 ++-- .../doctype/stock_reconciliation/stock_reconciliation.py | 6 +++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/erpnext/hooks.py b/erpnext/hooks.py index 64d8a3ee4c..dee46aae84 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -50,7 +50,9 @@ before_tests = "erpnext.setup.utils.before_tests" website_generators = ["Item Group", "Item", "Sales Partner"] -standard_queries = "Customer:erpnext.selling.doctype.customer.customer.get_customer_list" +standard_queries = { + "Customer": "erpnext.selling.doctype.customer.customer.get_customer_list" +} communication_covert_to = ["Lead", "Issue", "Job Application"] diff --git a/erpnext/setup/page/setup_wizard/default_website.py b/erpnext/setup/page/setup_wizard/default_website.py index 31e5fbb169..081ffd60fc 100644 --- a/erpnext/setup/page/setup_wizard/default_website.py +++ b/erpnext/setup/page/setup_wizard/default_website.py @@ -22,9 +22,9 @@ class website_maker(object): "doctype": "Web Page", "title": self.company, "published": 1, - "header": "

{0}

".format(self.tagline or "Headline")+\ + "header": "

{0}

".format(self.tagline or "Headline")+\ '

'+_("This is an example website auto-generated from ERPNext")+"

"+\ - '

Login

', + '

Login

', "description": self.company + ":" + (self.tagline or ""), "css": frappe.get_template("setup/page/setup_wizard/data/sample_home_page.css").render(), "main_section": frappe.get_template("setup/page/setup_wizard/data/sample_home_page.html").render({ diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py index 51920ccf5b..455a45d8f2 100644 --- a/erpnext/setup/page/setup_wizard/setup_wizard.py +++ b/erpnext/setup/page/setup_wizard/setup_wizard.py @@ -408,8 +408,8 @@ def create_logo(args): filename, filetype, content = attach_logo fileurl = save_file(filename, content, "Website Settings", "Website Settings", decode=True).file_url - frappe.db.set_value("Website Settings", "Website Settings", "banner_html", - "" % fileurl) + frappe.db.set_value("Website Settings", "Website Settings", "brand_html", + " {1}".format(fileurl, args.get("company_name").strip())) def add_all_roles_to(name): user = frappe.get_doc("User", name) diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py index af938f826e..5614ee23d3 100644 --- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -46,7 +46,7 @@ class StockReconciliation(StockController): else: item.current_qty = qty item.current_valuation_rate = rate - self.difference_amount += ((item.qty or qty) * (item.valuation_rate or rate) - (qty * rate)) + self.difference_amount += (flt(item.qty or qty) * flt(item.valuation_rate or rate) - (flt(qty) * flt(rate))) return True items = filter(lambda d: _changed(d), self.items) @@ -165,11 +165,11 @@ class StockReconciliation(StockController): if row.qty and not row.valuation_rate: frappe.throw(_("Valuation Rate required for Item {0}").format(row.item_code)) - + if previous_sle and row.qty == previous_sle.get("qty_after_transaction") \ and row.valuation_rate == previous_sle.get("valuation_rate"): continue - + self.insert_entries(row) def insert_entries(self, row):