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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Saurabh 2018-04-24 12:09:38 +05:30
commit ede0af97cd
3 changed files with 4 additions and 4 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__ = '10.1.24' __version__ = '10.1.25'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

4
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -344,8 +344,8 @@ class SalesInvoice(SellingController):
self.terms = frappe.db.get_value("Terms and Conditions", self.tc_name, "terms") self.terms = frappe.db.get_value("Terms and Conditions", self.tc_name, "terms")
# fetch charges # fetch charges
if self.taxes_and_charges and not len(self.get("taxes")): if self.taxes_and_charges:
self.set_taxes() self.set_other_charges()
return pos return pos

2
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@ -100,7 +100,7 @@ def get_item_details(items, sl_entries):
select name, item_name, description, item_group, brand, stock_uom select name, item_name, description, item_group, brand, stock_uom
from `tabItem` from `tabItem`
where name in ({0}) where name in ({0})
""".format(', '.join(['"' + frappe.db.escape(i,percent=False) + '"' for i in items])), as_dict=1, debug=1): """.format(', '.join(['"' + frappe.db.escape(i,percent=False) + '"' for i in items])), as_dict=1):
item_details.setdefault(item.name, item) item_details.setdefault(item.name, item)
return item_details return item_details