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

[fixes] default_website and stock reco

Browse Source
This commit is contained in:
Rushabh Mehta 2015-03-24 17:34:58 +05:30
parent b6061e5d3f
commit 308e6ea21e
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hooks.py
View File

@ -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"]

4
erpnext/setup/page/setup_wizard/default_website.py
View File

@ -22,9 +22,9 @@ class website_maker(object):
"doctype": "Web Page",
"title": self.company,
"published": 1,
"header": "<h1>{0}</h1>".format(self.tagline or "Headline")+\
"header": "<div class='hero text-center'><h1>{0}</h1>".format(self.tagline or "Headline")+\
'<p>'+_("This is an example website auto-generated from ERPNext")+"</p>"+\
'<p><a class="btn btn-primary" href="/login">Login</a></p>',
'<p><a class="btn btn-primary" href="/login">Login</a></p></div>',
"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({

4
erpnext/setup/page/setup_wizard/setup_wizard.py
View File

@ -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",
"<img src='%s' style='max-width: 100%%;'>" % fileurl)
frappe.db.set_value("Website Settings", "Website Settings", "brand_html",
"<img src='{0}' style='max-width: 40px; max-height: 25px;'> {1}".format(fileurl, args.get("company_name").strip()))
def add_all_roles_to(name):
user = frappe.get_doc("User", name)

6
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@ -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):