diff --git a/controllers/accounts_controller.py b/controllers/accounts_controller.py index a3dae8e2e87..4ee7e53e151 100644 --- a/controllers/accounts_controller.py +++ b/controllers/accounts_controller.py @@ -291,7 +291,12 @@ class AccountsController(TransactionBase): current_tax_amount = flt(current_tax_amount, self.precision("tax_amount", tax)) # store tax breakup for each item - tax.item_wise_tax_detail[item.item_code or item.item_name] = [tax_rate, current_tax_amount] + key = item.item_code or item.item_name + if tax.item_wise_tax_detail.get(key): + item_wise_tax_amount = tax.item_wise_tax_detail[key][1] + current_tax_amount + tax.item_wise_tax_detail[key] = [tax_rate, item_wise_tax_amount] + else: + tax.item_wise_tax_detail[key] = [tax_rate, current_tax_amount] return current_tax_amount diff --git a/patches/patch_list.py b/patches/patch_list.py index f587563599b..3c13e0eb471 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -261,6 +261,6 @@ patch_list = [ "execute:webnotes.reload_doc('accounts', 'Print Format', 'POS Invoice') # 2013-09-02", "patches.september_2013.p01_fix_buying_amount_gl_entries", "patches.september_2013.p01_update_communication", - "patches.september_2013.p02_make_pos_view_checked_in_features_setup", + "execute:webnotes.reload_doc('setup', 'doctype', 'features_setup') # 2013-09-05", "patches.september_2013.p02_fix_serial_no_status", ] \ No newline at end of file diff --git a/patches/september_2013/p02_make_pos_view_checked_in_features_setup.py b/patches/september_2013/p02_make_pos_view_checked_in_features_setup.py deleted file mode 100644 index c5e2c7bc606..00000000000 --- a/patches/september_2013/p02_make_pos_view_checked_in_features_setup.py +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. -# License: GNU General Public License v3. See license.txt - -from __future__ import unicode_literals -import webnotes - -def execute(): - webnotes.reload_doc("setup", "doctype", "features_setup") - fs = webnotes.bean("Features Setup") - fs.doc.fs_pos_view = 1 - fs.save() \ No newline at end of file diff --git a/public/js/transaction.js b/public/js/transaction.js index 1d06a9f487d..0ff957a820b 100644 --- a/public/js/transaction.js +++ b/public/js/transaction.js @@ -338,8 +338,19 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({ var headings = $.map([wn._("Item Name")].concat($.map(tax_accounts, function(head) { return head[1]; })), function(head) { return '