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

Merge branch 'staging-fixes' into patch-to-rename-additional-salary-component

Browse Source
This commit is contained in:
Sagar Vora 2019-01-07 15:12:44 +05:30 committed by GitHub
commit 278d7a44f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@ -25,7 +25,7 @@ def execute(filters=None):
account_details.setdefault(acc.name, acc) account_details.setdefault(acc.name, acc)
if filters.get('party'): if filters.get('party'):
parties = str(filters.get("party")).strip() parties = cstr(filters.get("party")).strip()
filters.party = [d.strip() for d in parties.split(',') if d] filters.party = [d.strip() for d in parties.split(',') if d]
validate_filters(filters, account_details) validate_filters(filters, account_details)
@ -60,11 +60,11 @@ def validate_filters(filters, account_details):
frappe.throw(_("From Date must be before To Date")) frappe.throw(_("From Date must be before To Date"))
if filters.get('project'): if filters.get('project'):
projects = str(filters.get("project")).strip() projects = cstr(filters.get("project")).strip()
filters.project = [d.strip() for d in projects.split(',') if d] filters.project = [d.strip() for d in projects.split(',') if d]
if filters.get('cost_center'): if filters.get('cost_center'):
cost_centers = str(filters.get("cost_center")).strip() cost_centers = cstr(filters.get("cost_center")).strip()
filters.cost_center = [d.strip() for d in cost_centers.split(',') if d] filters.cost_center = [d.strip() for d in cost_centers.split(',') if d]

4
erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py
View File

@ -65,8 +65,8 @@ def get_quantity_list(item):
if item: if item:
qty_list = frappe.db.sql("""select distinct qty from `tabSupplier Quotation Item` qty_list = frappe.db.sql("""select distinct qty from `tabSupplier Quotation Item`
where ifnull(item_code,'')=%s and docstatus < 2""", item, as_dict=1) where ifnull(item_code,'')=%s and docstatus < 2 order by qty""", item, as_dict=1)
qty_list.sort(reverse=False)
for qt in qty_list: for qt in qty_list:
col = frappe._dict({ col = frappe._dict({
"key": str(qt.qty), "key": str(qt.qty),

2
erpnext/hooks.py
View File

@ -12,7 +12,7 @@ app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"
develop_version = '12.x.x-develop' develop_version = '12.x.x-develop'
staging_version = '11.0.3-beta.32' staging_version = '11.0.3-beta.33'
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

1
erpnext/hr/doctype/salary_structure/salary_structure.js
View File

@ -124,6 +124,7 @@ frappe.ui.form.on('Salary Structure', {
"label":__("Employee"), "label":__("Employee"),
"fieldname":"employee", "fieldname":"employee",
"fieldtype":"Select", "fieldtype":"Select",
"reqd": true,
options: employees options: employees
}, { }, {
fieldname:"fetch", fieldname:"fetch",