Regenerate language file + js after rebase, fix various merge bugs

(#293)

application/controllers/Sales.php

@@ -71,9 +71,6 @@ class Sales extends Secure_area
 			'only_invoices' => $this->config->item('invoice_enable') && $this->input->get('only_invoices'),
 			'is_valid_receipt' => $is_valid_receipt);
 
-
-			
-
 		// check if any filter is set in the multiselect dropdown
 		$filledup = array_fill_keys($this->input->get('filters'), TRUE);
 		$filters = array_merge($filters, $filledup);

application/helpers/table_helper.php

@@ -17,7 +17,7 @@ function get_sales_manage_table_headers()
 	
 	if($CI->config->item('invoice_enable') == TRUE)
 	{
-		$headers[] = $CI->lang->line('sales_invoice_number');
+		$headers[] = array('invoice' => $CI->lang->line('sales_invoice_number'));
 	}
 	return transform_headers($headers);
 }
@@ -25,7 +25,7 @@ function get_sales_manage_table_headers()
 /*
  Gets the html data rows for the sales.
  */
-function get_sales_manage_table_data_rows($sales, $controller)
+function get_sale_data_last_row($sales, $controller)
 {
 	$CI =& get_instance();
 	$table_data_rows = '';
@@ -35,23 +35,16 @@ function get_sales_manage_table_data_rows($sales, $controller)
 
 	foreach($sales as $key=>$sale)
 	{
-		$table_data_rows .= get_sales_manage_sale_data_row($sale, $controller);
-		
 		$sum_amount_tendered += $sale['amount_tendered'];
 		$sum_amount_due += $sale['amount_due'];
 		$sum_change_due += $sale['change_due'];
 	}
 
-	if($table_data_rows == '')
-	{
-		$table_data_rows .= "<tr><td colspan='12'><div class='alert alert-dismissible alert-info'>".$CI->lang->line('sales_no_sales_to_display')."</div></td></tr>";
-	}
-	else
-	{
-		$table_data_rows .= "<tr class='static-last'><td>&nbsp;</td><td>".$CI->lang->line('sales_total')."</td><td>&nbsp;</td><td>&nbsp;</td><td>".to_currency($sum_amount_tendered)."</td><td>".to_currency($sum_amount_due)."</td><td>".to_currency($sum_change_due)."</td><td colspan=\"5\"></td></tr>";
-	}
-
-	return $table_data_rows;
+	return array(
+		'receipt_number' => $CI->lang->line('sales_total'),
+		'amount_tendered' => to_currency($sum_amount_tendered),
+		'amount_due' => to_currency($sum_change_due)
+	);
 }
 
 function get_sale_data_row($sale, $controller)
@@ -70,18 +63,21 @@ function get_sale_data_row($sale, $controller)
 		'payment_type' => $sale->payment_type,
 		'invoice_number' => $sale->invoice_number,
 		'receipt' => anchor($controller_name."/receipt/$sale->sale_id", '<span class="glyphicon glyphicon-print"></span>',
-			array('class'=>"modal-dlg modal-btn-submit", 'title'=>$CI->lang->line('sales_show_receipt'))
+			array('title'=>$CI->lang->line('sales_show_receipt'))
 		),
 		'edit' => anchor($controller_name."/edit/$sale->sale_id", '<span class="glyphicon glyphicon-edit"></span>',
 			array('class'=>"modal-dlg modal-btn-delete modal-btn-submit print_hide", 'title'=>$CI->lang->line($controller_name.'_update'))
 		)
 	);
+
 	if($CI->config->item('invoice_enable') == TRUE)
 	{
 		$row['invoice'] = anchor($controller_name."/invoice/$sale->sale_id", '<span class="glyphicon glyphicon-list-alt"></span>',
-			array('class'=>"modal-dlg modal-btn-submit", 'title'=>$CI->lang->line('sales_show_invoice'))
+			array('title'=>$CI->lang->line('sales_show_invoice'))
 		);		
 	}
+
+	return $row;
 }
 
 /*

application/language/de-CH/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Erforderlich";
+$lang["common_id"] = "Id";

application/language/de-CH/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "Ort";
 $lang["items_empty_upc_items"] = "Leere UPC Artikel";
 $lang["items_low_inventory_items"] = "nicht am Lager";
 $lang["items_manually_editing_of_quantity"] = "Manuelle Bestandesänderung";
-$lang["items_must_select_item_for_barcode"] = "Sie müssen mindestens einen Artikel wählen, um Barcodes zu generieren";
 $lang["items_name"] = "Artikelname";
 $lang["items_name_required"] = "Artikelname ist erforderlich";
 $lang["items_new"] = "Neuer Artikel";

application/language/de-CH/suppliers_lang.php

@@ -14,4 +14,5 @@ $lang["suppliers_successful_adding"] = "Erfolgreich hinzugefügt";
 $lang["suppliers_successful_deleted"] = "Löschung erfolgreich";
 $lang["suppliers_successful_updating"] = "Änderung erfolgreich";
 $lang["suppliers_supplier"] = "Lieferant";
+$lang["suppliers_supplier_id"] = "ID";
 $lang["suppliers_update"] = "Ändere Lieferant";

application/language/en/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
+$lang["common_id"] = "Id";

application/language/en/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "Location";
 $lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "Out Of Stock Items";
 $lang["items_manually_editing_of_quantity"] = "Manual Edit of Quantity";
-$lang["items_must_select_item_for_barcode"] = "You must select at least 1 item to generate barcodes";
 $lang["items_name"] = "Item Name";
 $lang["items_name_required"] = "Item Name is a required field";
 $lang["items_new"] = "New Item";

application/language/en/suppliers_lang.php

@@ -14,4 +14,5 @@ $lang["suppliers_successful_adding"] = "You have successfully added supplier";
 $lang["suppliers_successful_deleted"] = "You have successfully deleted";
 $lang["suppliers_successful_updating"] = "You have successfully updated supplier";
 $lang["suppliers_supplier"] = "Supplier";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Update Supplier";

application/language/es/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Requerido";
+$lang["common_id"] = "Id";

application/language/es/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "Ubicación";
 $lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "Artículos de Inventario Escaso";
 $lang["items_manually_editing_of_quantity"] = "Edición Manual de Cantidad";
-$lang["items_must_select_item_for_barcode"] = "Debes seleccionar al menos 1 artículo para generar códigos de barras";
 $lang["items_name"] = "Nombre del Artículo";
 $lang["items_name_required"] = "Nombre de Artículo es requerido";
 $lang["items_new"] = "Nuevo Artículo";

application/language/es/suppliers_lang.php

@@ -14,4 +14,5 @@ $lang["suppliers_successful_adding"] = "Has agregado el proveedor satisfactoriam
 $lang["suppliers_successful_deleted"] = "Has borrado satisfactoriamente a";
 $lang["suppliers_successful_updating"] = "Has actualizado el proveedor satisfactoriamente";
 $lang["suppliers_supplier"] = "Proveedor";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Actualizar Proveedor";

application/language/fr/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
+$lang["common_id"] = "Id";

application/language/fr/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "Location";
 $lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "Items à Stock Faible";
 $lang["items_manually_editing_of_quantity"] = "Édition Manuelle de Quantité";
-$lang["items_must_select_item_for_barcode"] = "Vous devez sélectionner au moins un item";
 $lang["items_name"] = "Nom";
 $lang["items_name_required"] = "Le Nom est requis";
 $lang["items_new"] = "Nouvel Item";

application/language/fr/suppliers_lang.php

@@ -14,4 +14,5 @@ $lang["suppliers_successful_adding"] = "Fournisseur ajouté avec succès";
 $lang["suppliers_successful_deleted"] = "Suppression réussie";
 $lang["suppliers_successful_updating"] = "Fournisseur édité avec succès";
 $lang["suppliers_supplier"] = "Fournisseur";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Éditer Fournisseur";

application/language/hr-HR/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel izvoz";
 $lang["common_export_excel_yes"] = "Da";
 $lang["common_export_excel_no"] = "Ne";
 $lang["common_required"] = "Potreban";
+$lang["common_id"] = "Id";

application/language/hr-HR/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "Mjesto";
 $lang["items_empty_upc_items"] = "UPC artikal";
 $lang["items_low_inventory_items"] = "Rasprodaja artikala";
 $lang["items_manually_editing_of_quantity"] = "Ručno uređivanje količine";
-$lang["items_must_select_item_for_barcode"] = "Morate odabrati barem jedan artikl da generirate barkod";
 $lang["items_name"] = "Naziv artikla";
 $lang["items_name_required"] = "Naziv artikla je potreban";
 $lang["items_new"] = "Novi artikal";

application/language/hu-HU/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Igen";
 $lang["common_export_excel_no"] = "Nem";
 $lang["common_required"] = "Kötelező";
+$lang["common_id"] = "ID";

application/language/hu-HU/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "Helyszín";
 $lang["items_empty_upc_items"] = "Üres UPC term.";
 $lang["items_low_inventory_items"] = "Kifogyott term.";
 $lang["items_manually_editing_of_quantity"] = "Mennyiség módosítása manuálisan";
-$lang["items_must_select_item_for_barcode"] = "Legalább 1 (egy) terméket ki kell választania vonalkód generálásához";
 $lang["items_name"] = "Terméknév";
 $lang["items_name_required"] = "Terméknév kötelező mező";
 $lang["items_new"] = "Új termék";

application/language/id/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
+$lang["common_id"] = "Id";

application/language/id/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "Lokasi Barang";
 $lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "Daftar Stock Rendah";
 $lang["items_manually_editing_of_quantity"] = "Perubahan jumlah Stok secara manual";
-$lang["items_must_select_item_for_barcode"] = "Anda harus memilih minimal 1 item untuk membuat barcode";
 $lang["items_name"] = "Nama Barang";
 $lang["items_name_required"] = "Nama item wajib diisi";
 $lang["items_new"] = "Buat Item Baru";

application/language/id/suppliers_lang.php

@@ -14,4 +14,5 @@ $lang["suppliers_successful_adding"] = "Anda telah berhasil menambahkan data pem
 $lang["suppliers_successful_deleted"] = "Anda telah berhasil menghapus data pemasok";
 $lang["suppliers_successful_updating"] = "Anda telah berhasil memperbarui data pemasok";
 $lang["suppliers_supplier"] = "Pemasok";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Ubah data Pemasok";

application/language/nl-BE/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
+$lang["common_id"] = "Id";

application/language/nl-BE/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "Locatie";
 $lang["items_empty_upc_items"] = "Zonder barcode";
 $lang["items_low_inventory_items"] = "Niet in stock";
 $lang["items_manually_editing_of_quantity"] = "Manuele aanpassing hoeveelheid";
-$lang["items_must_select_item_for_barcode"] = "U moet ten minste 1 product selecteren om een barcode te genereren";
 $lang["items_name"] = "Productnaam";
 $lang["items_name_required"] = "Productnaam moet ingevuld worden";
 $lang["items_new"] = "Nieuw Product";

application/language/nl-BE/suppliers_lang.php

@@ -14,4 +14,5 @@ $lang["suppliers_successful_adding"] = "Leverancier succesvol toegevoegd";
 $lang["suppliers_successful_deleted"] = "Er werd(en)";
 $lang["suppliers_successful_updating"] = "Wijzigingen leveranciersgegevens bewaard";
 $lang["suppliers_supplier"] = "Leverancier";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Bewerk Leverancier";

application/language/pt-BR/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Exportar para Excel";
 $lang["common_export_excel_yes"] = "Sim";
 $lang["common_export_excel_no"] = "Não";
 $lang["common_required"] = "Requerido";
+$lang["common_id"] = "Id";

application/language/pt-BR/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "Localização";
 $lang["items_empty_upc_items"] = "Vazio UPC Itens";
 $lang["items_low_inventory_items"] = "Itens sem estoque";
 $lang["items_manually_editing_of_quantity"] = "Editar manualmente a quantidade";
-$lang["items_must_select_item_for_barcode"] = "Você deve selecionar pelo menos um item para gerar códigos de barras";
 $lang["items_name"] = "Nome produto";
 $lang["items_name_required"] = "Nome do item é um campo obrigatório";
 $lang["items_new"] = "Novo Item";

application/language/pt-Br/customers_lang.php

@@ -0,0 +1,20 @@
+<?php 
+
+$lang["customers_account_number"] = "Conta nº";
+$lang["customers_account_number_duplicate"] = "Este número de conta já está presente na base de dados";
+$lang["customers_cannot_be_deleted"] = "Não foi possível excluir clientes selecionados um ou mais dos Clientes selecionados tem vendas.";
+$lang["customers_company_name"] = "Empresa";
+$lang["customers_confirm_delete"] = "Tem certeza de que deseja excluir os clientes selecionados?";
+$lang["customers_customer"] = "Cliente";
+$lang["customers_discount"] = "Discount";
+$lang["customers_error_adding_updating"] = "Erro adicionar/atualizar cliente";
+$lang["customers_new"] = "Novo Cliente";
+$lang["customers_none_selected"] = "Você não selecionou nenhum clientes para apagar";
+$lang["customers_one_or_multiple"] = "Cliente(s)";
+$lang["customers_successful_adding"] = "Você adicionou o cliente com sucesso";
+$lang["customers_successful_deleted"] = "Você excluiu com sucesso";
+$lang["customers_successful_updating"] = "Você atualizou o cliente com secesso";
+$lang["customers_taxable"] = "Tributável";
+$lang["customers_total"] = "Total";
+$lang["customers_update"] = "Atualizar Cliente";
+$lang["customers_import_items_excel"] = "Importar clientes com planilha do Excel";

application/language/ru/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
+$lang["common_id"] = "Id";

application/language/ru/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "место";
 $lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "Низкий инвентаризации товары";
 $lang["items_manually_editing_of_quantity"] = "Руководство Изменить количество";
-$lang["items_must_select_item_for_barcode"] = "Вы должны выбрать хотя бы 1 товар для создания штрих-кодов";
 $lang["items_name"] = "название товара";
 $lang["items_name_required"] = "Название товара обязательное пробелья";
 $lang["items_new"] = "Новый Товар";

application/language/ru/suppliers_lang.php

@@ -14,4 +14,5 @@ $lang["suppliers_successful_adding"] = "Вы успешно добавили п
 $lang["suppliers_successful_deleted"] = "Вы успешно удален";
 $lang["suppliers_successful_updating"] = "Вы успешно обновляли поставщиком";
 $lang["suppliers_supplier"] = "поставщик";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Обновить поставщика";

application/language/th/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "ต้องกรอก";
+$lang["common_id"] = "Id";

application/language/th/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "ที่ตั้ง";
 $lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "สินค้าคงเหลือน้อย";
 $lang["items_manually_editing_of_quantity"] = "แก้ไขจำนวน";
-$lang["items_must_select_item_for_barcode"] = "คุต้องเลือกสินค้าอย่างน้อยหนึ่งอย่างเพื่อจะสร้างบาร์โค๊ด";
 $lang["items_name"] = "ชื่อสินค้า";
 $lang["items_name_required"] = "ชื่อสินค้าต้องกรอก";
 $lang["items_new"] = "เพิ่มรายการสินค้า";

application/language/th/suppliers_lang.php

@@ -14,4 +14,5 @@ $lang["suppliers_successful_adding"] = "เพิ่มผู้ผลิตส
 $lang["suppliers_successful_deleted"] = "ลบสำเร็จ";
 $lang["suppliers_successful_updating"] = "ปรับปรุงผู้ผลิตสำเร็จ";
 $lang["suppliers_supplier"] = "ผู้ผลิต";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "ปรับปรุงผู้ผลิต";

application/language/tr/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
+$lang["common_id"] = "Id";

application/language/tr/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "Yer";
 $lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "";
 $lang["items_manually_editing_of_quantity"] = "Elle adet düzeltme";
-$lang["items_must_select_item_for_barcode"] = "Barkod üretmek için en az bir ürün seçmelisiniz";
 $lang["items_name"] = "Ürün Adı";
 $lang["items_name_required"] = "Ürün Adı zorunlu alandır";
 $lang["items_new"] = "Yeni Ürün";

application/language/tr/suppliers_lang.php

@@ -14,4 +14,5 @@ $lang["suppliers_successful_adding"] = "Sağlayıcı eklendi";
 $lang["suppliers_successful_deleted"] = "Sağlayıcı silindi";
 $lang["suppliers_successful_updating"] = "Sağlayıcı düzenlendi";
 $lang["suppliers_supplier"] = "Sağlayıcı";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Sağlayıcıyı Düzenle";

application/language/zh/common_lang.php

@@ -60,3 +60,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
+$lang["common_id"] = "Id";

application/language/zh/items_lang.php

@@ -44,7 +44,6 @@ $lang["items_location"] = "位置";
 $lang["items_empty_upc_items"] = "Empty UPC Items";
 $lang["items_low_inventory_items"] = "低庫存產品";
 $lang["items_manually_editing_of_quantity"] = "手動編輯數量";
-$lang["items_must_select_item_for_barcode"] = "您必須至少選擇一個產品生才能產生條碼";
 $lang["items_name"] = "產品名稱";
 $lang["items_name_required"] = "產品名稱為必填";
 $lang["items_new"] = "新增產品";

application/language/zh/suppliers_lang.php

@@ -14,4 +14,5 @@ $lang["suppliers_successful_adding"] = "您已成功新增供應商";
 $lang["suppliers_successful_deleted"] = "您已成功刪除供應商";
 $lang["suppliers_successful_updating"] = "您已成功更新供應商";
 $lang["suppliers_supplier"] = "供應商";
+$lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "更新供應商";

application/views/partial/header.php

@@ -61,10 +61,11 @@
 		<!-- start mincss template tags -->
 		<link rel="stylesheet" type="text/css" href="dist/bootstrap.min.css?rel=9ed20b1ee8"/>
 		<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
-		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=208d2df00e"/>
+		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=52c16a3504"/>
+		<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
 		<!-- end mincss template tags -->
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=3d8bf015a8" language="javascript"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=2b273b707f" language="javascript"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 

application/views/sales/manage.php

@@ -32,6 +32,11 @@ $(document).ready(function()
 				end_date: end_date,
 				filters: $("#filters").val() || [""]
 			});
+		},
+		columns: {
+			'invoice': {
+				align: 'center'
+			}
 		}
 	});
 

js/manage_tables.js

@@ -13,7 +13,6 @@
 	var submit = function(button_id) {
 		return function(dlog_ref) {
 			btn_id = button_id;
-			debugger;;
 			dialog_ref = dlog_ref;
 			if (button_id == 'submit') {
 				$('form', dlog_ref.$modalBody).first().submit();

templates/spacelab/views/partial/header.php

@@ -61,11 +61,12 @@
 		<link rel="stylesheet" type="text/css" href="templates/spacelab/css/bootstrap.min.css?rel=9ed20b1ee8"/>
 		<!-- start mincss template tags -->
 		<link rel="stylesheet" type="text/css" href="dist/jquery-ui.css"/>
-		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=208d2df00e"/>
+		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=52c16a3504"/>
+		<link rel="stylesheet" type="text/css" href="dist/opensourcepos_bower.css"/>
 		<!-- end mincss template tags -->
 		<link rel="stylesheet" type="text/css" href="templates/spacelab/css/style.css"/>
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=3d8bf015a8" language="javascript"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=2b273b707f" language="javascript"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 

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
+common_id,ID,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id,Id