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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
mbauskar 2017-07-01 14:16:46 +05:30
commit a06a600d0a
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '8.2.2' __version__ = '8.2.3'
def get_default_company(user=None): def get_default_company(user=None):

2
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@ -24,7 +24,7 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum
"fieldtype": "Data", "fieldtype": "Data",
"width": 80 "width": 80
}) })
company_currency = frappe.db.get_value("Company", filters.company, "default_currency") company_currency = frappe.db.get_value("Company", filters.get("company"), "default_currency")
mode_of_payments = get_mode_of_payments(set([d.parent for d in item_list])) mode_of_payments = get_mode_of_payments(set([d.parent for d in item_list]))
data = [] data = []

2
erpnext/accounts/report/sales_register/sales_register.py
View File

@ -26,7 +26,7 @@ def _execute(filters, additional_table_columns=None, additional_query_columns=No
invoice_so_dn_map = get_invoice_so_dn_map(invoice_list) invoice_so_dn_map = get_invoice_so_dn_map(invoice_list)
customers = list(set([inv.customer for inv in invoice_list])) customers = list(set([inv.customer for inv in invoice_list]))
customer_map = get_customer_details(customers) customer_map = get_customer_details(customers)
company_currency = frappe.db.get_value("Company", filters.company, "default_currency") company_currency = frappe.db.get_value("Company", filters.get("company"), "default_currency")
mode_of_payments = get_mode_of_payments([inv.name for inv in invoice_list]) mode_of_payments = get_mode_of_payments([inv.name for inv in invoice_list])
data = [] data = []

1
erpnext/patches.txt
View File

@ -409,3 +409,4 @@ erpnext.patches.v8_0.update_sales_cost_in_project
erpnext.patches.v8_0.save_system_settings erpnext.patches.v8_0.save_system_settings
erpnext.patches.v8_1.delete_deprecated_reports erpnext.patches.v8_1.delete_deprecated_reports
erpnext.patches.v8_1.setup_gst_india #2017-06-27 erpnext.patches.v8_1.setup_gst_india #2017-06-27
execute:frappe.reload_doc('regional', 'doctype', 'gst_hsn_code')