Merge pull request #3003 from neilLasrado/activity-type
time_log_for select field in TL changed to against_manufacturing (check)
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 64d8a3e..dee46aa 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -50,7 +50,9 @@
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/patches.txt b/erpnext/patches.txt
index 3c8ca5f..6e15779 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -133,3 +133,6 @@
erpnext.patches.v4_2.repost_reserved_qty
erpnext.patches.v4_2.repost_sle_for_si_with_no_warehouse
erpnext.patches.v5_0.newsletter
+execute:frappe.delete_doc("DocType", "Chart of Accounts")
+execute:frappe.delete_doc("DocType", "Style Settings")
+
diff --git a/erpnext/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py
index 240e438..afcc3b1 100644
--- a/erpnext/setup/doctype/company/test_company.py
+++ b/erpnext/setup/doctype/company/test_company.py
@@ -8,23 +8,7 @@
import unittest
class TestCompany(unittest.TestCase):
- def atest_coa(self):
- for country, chart_name in frappe.db.sql("""select country, chart_name
- from `tabChart of Accounts` where name = 'Deutscher Kontenplan SKR03'""", as_list=1):
- company_doc = frappe.get_doc({
- "doctype": "Company",
- "company_name": "_Test Company 2",
- "abbr": "_TC2",
- "default_currency": "INR",
- "country": country,
- "chart_of_accounts": chart_name
- })
-
- company_doc.insert()
- self.assertTrue(frappe.db.sql("""select count(*) from tabAccount
- where company='_Test Company 2'""")[0][0] > 10)
-
- frappe.delete_doc("Company", "_Test Company 2")
+ pass
test_records = frappe.get_test_records('Company')
diff --git a/erpnext/setup/page/setup_wizard/default_website.py b/erpnext/setup/page/setup_wizard/default_website.py
index 31e5fbb..081ffd6 100644
--- a/erpnext/setup/page/setup_wizard/default_website.py
+++ b/erpnext/setup/page/setup_wizard/default_website.py
@@ -22,9 +22,9 @@
"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({
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py
index 51920cc..455a45d 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.py
@@ -408,8 +408,8 @@
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)
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index af938f8..5614ee2 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -46,7 +46,7 @@
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 @@
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):