From b752ec99528278e70f2b4b947b64fec6ce1736c1 Mon Sep 17 00:00:00 2001
From: jekkos-t520 <jeroen.peelaerts@gmail.com>
Date: Tue, 24 Feb 2015 08:51:09 +0100
Subject: [PATCH] Fix item bulk update

---
 application/controllers/items.php     | 2 +-
 application/views/items/form_bulk.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/items.php b/application/controllers/items.php
index e6eb9d6af..b1c6a413c 100644
--- a/application/controllers/items.php
+++ b/application/controllers/items.php
@@ -499,7 +499,7 @@ class Items extends Secure_area implements iData_controller
 			{
 				$item_data["$key"]=$value == '' ? null : $value;
 			}
-			elseif($value!='' and !(in_array($key, array('item_ids', 'tax_names', 'tax_percents', 'category'))))
+			elseif($value!='' and !(in_array($key, array('submit', 'item_ids', 'tax_names', 'tax_percents', 'category'))))
 			{
 				$item_data["$key"]=$value;
 			}
diff --git a/application/views/items/form_bulk.php b/application/views/items/form_bulk.php
index a364c28d8..dda95b7f1 100644
--- a/application/views/items/form_bulk.php
+++ b/application/views/items/form_bulk.php
@@ -63,7 +63,7 @@ echo form_open('items/bulk_update/',array('id'=>'item_form'));
 		'name'=>'tax_names[]',
 		'id'=>'tax_name_1',
 		'size'=>'8',
-		'value'=> isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->lang->line('items_sales_tax'))
+		'value'=> isset($item_tax_info[0]['name']) ? $item_tax_info[0]['name'] : $this->lang->line('items_sales_tax_1'))
 	);?>
 	</div>
 	<div class='form_field'>
@@ -84,7 +84,7 @@ echo form_open('items/bulk_update/',array('id'=>'item_form'));
 		'name'=>'tax_names[]',
 		'id'=>'tax_name_2',
 		'size'=>'8',
-		'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : '')
+		'value'=> isset($item_tax_info[1]['name']) ? $item_tax_info[1]['name'] : $this->lang->line('items_sales_tax_2'))
 	);?>
 	</div>
 	<div class='form_field'>