From 31edddace6fb32dcaa738736d0892c91329dfbd7 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 23 Apr 2018 15:46:51 +0530 Subject: [PATCH 1/3] [Fix] Tax not changes when user change the POS profile in the sales invoice --- erpnext/accounts/doctype/sales_invoice/sales_invoice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py index b174d9b224..d8220528d4 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py @@ -344,8 +344,8 @@ class SalesInvoice(SellingController): self.terms = frappe.db.get_value("Terms and Conditions", self.tc_name, "terms") # fetch charges - if self.taxes_and_charges and not len(self.get("taxes")): - self.set_taxes() + if self.taxes_and_charges: + self.set_other_charges() return pos From d2065ce3bf4e1cb5c9e99ce7a4b695f73c0341cb Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 24 Apr 2018 12:07:37 +0530 Subject: [PATCH 2/3] typo fix --- erpnext/stock/report/stock_ledger/stock_ledger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py index e29f50a549..1a91ab48d2 100644 --- a/erpnext/stock/report/stock_ledger/stock_ledger.py +++ b/erpnext/stock/report/stock_ledger/stock_ledger.py @@ -100,7 +100,7 @@ def get_item_details(items, sl_entries): select name, item_name, description, item_group, brand, stock_uom from `tabItem` 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) return item_details From ad4ede0e230e0235768b884384d807077caa9132 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 24 Apr 2018 12:39:38 +0600 Subject: [PATCH 3/3] bumped to version 10.1.25 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 178d7e803d..c202fd59ea 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.24' +__version__ = '10.1.25' def get_default_company(user=None): '''Get default company for user'''