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

Merge branch 'develop' into gstr1-total

Browse Source
This commit is contained in:
Deepesh Garg 2019-07-01 12:36:35 +05:30 committed by GitHub
commit 0cdf55033a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/report/accounts_payable/accounts_payable.js
View File

@ -8,6 +8,7 @@ frappe.query_reports["Accounts Payable"] = {
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"reqd": 1,
"default": frappe.defaults.get_user_default("Company") "default": frappe.defaults.get_user_default("Company")
}, },
{ {

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

@ -8,6 +8,7 @@ frappe.query_reports["Accounts Receivable"] = {
"label": __("Company"), "label": __("Company"),
"fieldtype": "Link", "fieldtype": "Link",
"options": "Company", "options": "Company",
"reqd": 1,
"default": frappe.defaults.get_user_default("Company") "default": frappe.defaults.get_user_default("Company")
}, },
{ {

1
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -541,6 +541,7 @@ class ReceivablePayableReport(object):
conditions.append("""cost_center in (select name from `tabCost Center` where conditions.append("""cost_center in (select name from `tabCost Center` where
lft >= {0} and rgt <= {1})""".format(lft, rgt)) lft >= {0} and rgt <= {1})""".format(lft, rgt))
if self.filters.company:
accounts = [d.name for d in frappe.get_all("Account", accounts = [d.name for d in frappe.get_all("Account",
filters={"account_type": account_type, "company": self.filters.company})] filters={"account_type": account_type, "company": self.filters.company})]
conditions.append("account in (%s)" % ','.join(['%s'] *len(accounts))) conditions.append("account in (%s)" % ','.join(['%s'] *len(accounts)))

2
erpnext/support/doctype/service_level_agreement/service_level_agreement.py
View File

@ -18,7 +18,7 @@ class ServiceLevelAgreement(Document):
if self.start_date >= self.end_date: if self.start_date >= self.end_date:
frappe.throw(_("Start Date of Agreement can't be greater than or equal to End Date.")) frappe.throw(_("Start Date of Agreement can't be greater than or equal to End Date."))
if self.end_date < frappe.utils.nowdate(): if self.end_date < frappe.utils.getdate():
frappe.throw(_("End Date of Agreement can't be less than today.")) frappe.throw(_("End Date of Agreement can't be less than today."))
if self.entity_type and self.entity: if self.entity_type and self.entity: