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

Merge branch 'hotfix' of https://github.com/frappe/erpnext into hotfix

Browse Source
This commit is contained in:
Faris Ansari 2018-05-01 10:52:15 +05:30
commit 5df63e36d4
4 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/report/accounts_receivable/accounts_receivable.html
View File

@ -19,7 +19,13 @@
<h2 class="text-center">{%= __(report.report_name) %}</h2> <h2 class="text-center">{%= __(report.report_name) %}</h2>
<h4 class="text-center">{%= filters.customer || filters.supplier %} </h4> <h4 class="text-center">
{% if (filters.customer_name) { %}
{%= filters.customer_name %}
{% } else { %}
{%= filters.customer || filters.supplier %}
{% } %}
</h4>
<h6 class="text-center"> <h6 class="text-center">
{% if (filters.tax_id) { %} {% if (filters.tax_id) { %}
{%= __("Tax Id: ")%} {%= filters.tax_id %} {%= __("Tax Id: ")%} {%= filters.tax_id %}

9
erpnext/accounts/report/accounts_receivable/accounts_receivable.js
View File

@ -17,8 +17,9 @@ frappe.query_reports["Accounts Receivable"] = {
"options": "Customer", "options": "Customer",
on_change: () => { on_change: () => {
var customer = frappe.query_report_filters_by_name.customer.get_value(); var customer = frappe.query_report_filters_by_name.customer.get_value();
frappe.db.get_value('Customer', customer, "tax_id", function(value) { frappe.db.get_value('Customer', customer, ["tax_id", "customer_name"], function(value) {
frappe.query_report_filters_by_name.tax_id.set_value(value["tax_id"]); frappe.query_report_filters_by_name.tax_id.set_value(value["tax_id"]);
frappe.query_report_filters_by_name.customer_name.set_value(value["customer_name"]);
}); });
} }
}, },
@ -81,6 +82,12 @@ frappe.query_reports["Accounts Receivable"] = {
"label": __("Tax Id"), "label": __("Tax Id"),
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 1 "hidden": 1
},
{
"fieldname":"customer_name",
"label": __("Customer Name"),
"fieldtype": "Data",
"hidden": 1
} }
], ],

3
erpnext/setup/setup_wizard/operations/company_setup.py
View File

@ -113,8 +113,7 @@ def create_logo(args):
"<img src='{0}' style='max-width: 40px; max-height: 25px;'> {1}".format(fileurl, args.get("company_name") )) "<img src='{0}' style='max-width: 40px; max-height: 25px;'> {1}".format(fileurl, args.get("company_name") ))
def create_website(args): def create_website(args):
if args.get('setup_website'): website_maker(args)
website_maker(args)
def get_fy_details(fy_start_date, fy_end_date): def get_fy_details(fy_start_date, fy_end_date):
start_year = getdate(fy_start_date).year start_year = getdate(fy_start_date).year

20
erpnext/setup/setup_wizard/operations/default_website.py
View File

@ -12,7 +12,7 @@ class website_maker(object):
self.args = args self.args = args
self.company = args.company_name self.company = args.company_name
self.tagline = args.company_tagline self.tagline = args.company_tagline
self.user = args.name self.user = args.get('email')
self.make_web_page() self.make_web_page()
self.make_website_settings() self.make_website_settings()
self.make_blog() self.make_blog()
@ -50,6 +50,17 @@ class website_maker(object):
website_settings.save() website_settings.save()
def make_blog(self): def make_blog(self):
blog_category = frappe.get_doc({
"doctype": "Blog Category",
"category_name": "general",
"published": 1,
"title": _("General")
}).insert()
if not self.user:
# Admin setup
return
blogger = frappe.new_doc("Blogger") blogger = frappe.new_doc("Blogger")
user = frappe.get_doc("User", self.user) user = frappe.get_doc("User", self.user)
blogger.user = self.user blogger.user = self.user
@ -58,13 +69,6 @@ class website_maker(object):
blogger.avatar = user.user_image blogger.avatar = user.user_image
blogger.insert() blogger.insert()
blog_category = frappe.get_doc({
"doctype": "Blog Category",
"category_name": "general",
"published": 1,
"title": _("General")
}).insert()
frappe.get_doc({ frappe.get_doc({
"doctype": "Blog Post", "doctype": "Blog Post",
"title": "Welcome", "title": "Welcome",