diff --git a/application/controllers/Items.php b/application/controllers/Items.php
index c2e4d8347..e24e59293 100644
--- a/application/controllers/Items.php
+++ b/application/controllers/Items.php
@@ -492,7 +492,8 @@ class Items extends Secure_area implements iData_controller
}
//Item data could be empty if tax information is being updated
- if(empty($item_data) || $this->Item->update_multiple($item_data, $items_to_update))
+ $item_ids = explode(",", $items_to_update);
+ if(empty($item_data) || $this->Item->update_multiple($item_data, $item_ids))
{
$items_taxes_data = array();
$tax_names = $this->input->post('tax_names');
@@ -514,7 +515,7 @@ class Items extends Secure_area implements iData_controller
$this->Item_taxes->save_multiple($items_taxes_data, $items_to_update);
}
- echo json_encode(array('success'=>true,'message'=>$this->lang->line('items_successful_bulk_edit')));
+ echo json_encode(array('success'=>true,'message'=>$this->lang->line('items_successful_bulk_edit'), 'id'=>$item_ids));
}
else
{
diff --git a/application/language/de-CH/bootstrap_tables_lang.php b/application/language/de-CH/bootstrap_tables_lang.php
new file mode 100644
index 000000000..37b2862eb
--- /dev/null
+++ b/application/language/de-CH/bootstrap_tables_lang.php
@@ -0,0 +1,10 @@
+
$(document).ready(function()
{
+ load->view('partial/bootstrap_tables_locale'); ?>
table_support.init({
resource: '',
headers: ,
diff --git a/application/views/item_kits/manage.php b/application/views/item_kits/manage.php
index b1ee2958b..f9bb63520 100644
--- a/application/views/item_kits/manage.php
+++ b/application/views/item_kits/manage.php
@@ -3,6 +3,8 @@
+
diff --git a/application/views/people/manage.php b/application/views/people/manage.php
index d8670218b..1908facca 100644
--- a/application/views/people/manage.php
+++ b/application/views/people/manage.php
@@ -3,6 +3,8 @@
+
diff --git a/translations/bootstrap_tables_lang.csv b/translations/bootstrap_tables_lang.csv
new file mode 100644
index 000000000..6f70486be
--- /dev/null
+++ b/translations/bootstrap_tables_lang.csv
@@ -0,0 +1,9 @@
+label,hu-HU,de-CH,nl-BE,es,en,fr,zh,ru,th,tr,id,pt-BR,hr-HR
+tables_loading,"Betöltés, kérem várjon...","Lade, bitte warten...","Laden, even geduld...",Por favor espere...,"Loading, please wait...","Chargement en cours, patientez, s?il vous pla?t ...",正在努力地加载数据中，请稍候……,"Пожалуйста, подождите, идёт загрузка...","Loading, please wait...","Loading, please wait...","Loading, please wait...","Carregando, aguarde...",Molimo pričekajte ...
+tables_rows_per_page,{0} rekord per oldal,{0} Einträge pro Seite,{0} records per pagina,{0} resultados por página,{0} rows per page,{0} lignes par page,每页显示 {0} 条记录,{0} записей на страницу,{0} rows per page,{0} rows per page,{0} rows per page,{0} registros por página,{0} broj zapisa po stranici
+tables_page_from_to,Megjelenítve {0} {1} / {2} összesen,Zeige {0} bis {1} von {2} Zeile(n),Toon {0} tot {1} van {2} record(s),Mostrando desde {0} hasta {1} - En total {2} resultados,Showing {0} to {1} of {2} rows,Affichage des lignes {0} à {1} sur {2} lignes au total,显示第 {0} 到第 {1} 条记录，总共 {2} 条记录,Записи с {0} по {1} из {2},Showing {0} to {1} of {2} rows,Showing {0} to {1} of {2} rows,Showing {0} to {1} of {2} rows,Exibindo {0} até {1} de {2} linhas,Prikazujem {0}. - {1} od ukupnog broja zapisa {2}
+tables_hide_show_pagination,Lapozó elrejtése/megjelenítése,Hide/Show pagination,Toon %s record(s),Ocultar/Mostrar paginación,Hide/Show pagination,Hide/Show pagination,隐藏/显示分页,Hide/Show pagination,Hide/Show pagination,Hide/Show pagination,Hide/Show pagination,Hide/Show pagination,Prikaži/sakrij stranice
+tables_refresh,Refresh,Refresh,Vernieuwen,Refrescar,Refresh,Rafra?chir,刷新,Обновить,Refresh,Refresh,Refresh,Recarregar,Osvježi
+tables_toggle,Toggle,Umschalten,Omschakelen,Ocultar/Mostrar,Toggle,Alterner,切换,Переключить,Toggle,Toggle,Toggle,Ocultar/Exibir paginação,Promijeni prikaz
+tables_columns,Columns,Spalten,Kolommen,Columnas,Columns,Colonnes,列,Колонки,Columns,Columns,Columns,Colunas,Kolone
+tables_all,All,All,Alle,Todos,All,Tous,All,All,All,All,All,All,Sve
diff --git a/translations/common_lang.csv b/translations/common_lang.csv
index 4f99c9031..ef2213e5f 100644
--- a/translations/common_lang.csv
+++ b/translations/common_lang.csv
@@ -59,4 +59,4 @@ common_export_excel,Excel Export,Excel Export,Excel Export,Excel Export,Excel Ex
common_export_excel_yes,Igen,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Sim,Da
common_export_excel_no,Nem,No,No,No,No,No,No,No,No,No,No,Não,Ne
common_required,Kötelező,Erforderlich,Required,Requerido,Required,Required,Required,Required,ต้องกรอก,Required,Required,Requerido,Potreban
-common_id,ID,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id
+common_id,ID,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id
\ No newline at end of file