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

Merge branch 'develop' into global_search_modules

Browse Source
This commit is contained in:
Himanshu 2019-10-02 16:39:38 +05:30 committed by GitHub
commit c18b54fc08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '12.1.5' __version__ = '12.1.6'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

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

@ -274,4 +274,4 @@ def get_mode_of_payments(invoice_list):
for d in inv_mop: for d in inv_mop:
mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment) mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment)
return mode_of_payments return mode_of_payments