fix general_config tax 1 rate and name error message (#116)

application/language/de-CH/config_lang.php

@@ -67,6 +67,7 @@ $lang["config_default_tax_rate_1"] = "MWSt 1";
 $lang["config_default_tax_rate_2"] = "MWSt 2";
 $lang["config_default_tax_rate_number"] = "MWSt Rate";
 $lang["config_default_tax_rate_required"] = "MWSt ist erforderlich";
+$lang["config_default_tax_name_required"] = "";
 $lang["config_fax"] = "Fax";
 $lang["config_general_configuration"] = "Einstellungen";
 $lang["config_info"] = "Systemeinstellungen";

application/language/en/config_lang.php

@@ -67,6 +67,7 @@ $lang["config_default_tax_rate_1"] = "Tax 1 Rate";
 $lang["config_default_tax_rate_2"] = "Tax 2 Rate";
 $lang["config_default_tax_rate_number"] = "The default tax rate must be a number";
 $lang["config_default_tax_rate_required"] = "The default tax rate is a required field";
+$lang["config_default_tax_name_required"] = "The default tax name is a required field";
 $lang["config_fax"] = "Fax";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "Store Configuration Information";

application/language/es/config_lang.php

@@ -67,6 +67,7 @@ $lang["config_default_tax_rate_1"] = "Impuesto 1";
 $lang["config_default_tax_rate_2"] = "Impuesto 2";
 $lang["config_default_tax_rate_number"] = "El Impuesto Predeterminado debe ser un número";
 $lang["config_default_tax_rate_required"] = "El Impuesto Predeterminado es requerido";
+$lang["config_default_tax_name_required"] = "";
 $lang["config_fax"] = "Fax";
 $lang["config_general_configuration"] = "Configuración General ";
 $lang["config_info"] = "Información del Comercio";

application/language/fr/config_lang.php

@@ -67,6 +67,7 @@ $lang["config_default_tax_rate_1"] = "Taux d\'Imposition 1";
 $lang["config_default_tax_rate_2"] = "Taux d\'Imposition 2";
 $lang["config_default_tax_rate_number"] = "Le taux d\'imposition doit etre un nombre";
 $lang["config_default_tax_rate_required"] = "Le taux d\'imposition par défaut est requis";
+$lang["config_default_tax_name_required"] = "";
 $lang["config_fax"] = "Fax";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "Çonfiguration de l\'Entreprise";

application/language/id/config_lang.php

@@ -62,6 +62,7 @@ $lang["config_default_barcode_width_required"] = "The default barcode width is a
 $lang["config_default_sales_discount"] = "Default Sales Discount %";
 $lang["config_default_sales_discount_number"] = "The default sales discount must be a number";
 $lang["config_default_sales_discount_required"] = "The default sales discount is a required field";
+$lang["config_default_tax_name_required"] = "";
 $lang["config_default_tax_rate"] = "Tarif Pajak Biasa%";
 $lang["config_default_tax_rate_1"] = "Tarif Pajak 1";
 $lang["config_default_tax_rate_2"] = "Tarif Pajak 2";

application/language/nl-BE/config_lang.php

@@ -67,6 +67,7 @@ $lang["config_default_tax_rate_1"] = "VAT 1 %";
 $lang["config_default_tax_rate_2"] = "VAT 2 %";
 $lang["config_default_tax_rate_number"] = "Het percentage VAT moet een nummer zijn";
 $lang["config_default_tax_rate_required"] = "Het percentage VAT moet ingevuld worden";
+$lang["config_default_tax_name_required"] = "";
 $lang["config_fax"] = "Fax";
 $lang["config_general_configuration"] = "Algemene Instellingen";
 $lang["config_info"] = "Systeeminstellingen";

application/language/ru/config_lang.php

@@ -67,6 +67,7 @@ $lang["config_default_tax_rate_1"] = "ставка налога 1";
 $lang["config_default_tax_rate_2"] = "ставка налога 2";
 $lang["config_default_tax_rate_number"] = "Обычный ставка налога должен быть цифра";
 $lang["config_default_tax_rate_required"] = "Обычный ставка налога обязательный пробел";
+$lang["config_default_tax_name_required"] = "";
 $lang["config_fax"] = "Факс";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "информация о магазин конфигурация";

application/language/th/config_lang.php

@@ -67,6 +67,7 @@ $lang["config_default_tax_rate_1"] = "อัตราภาษี 1";
 $lang["config_default_tax_rate_2"] = "อัตราภาษี 2";
 $lang["config_default_tax_rate_number"] = "อัตราภาษีเริ่มต้นต้องเป็นตัวเลข";
 $lang["config_default_tax_rate_required"] = "อัตราภาษีเริ่มต้นต้องกรอก";
+$lang["config_default_tax_name_required"] = "";
 $lang["config_fax"] = "แฟ็กซ์";
 $lang["config_general_configuration"] = "ตั้งค่าทั่วไป";
 $lang["config_info"] = "ข้อมูลร้านค้า";

application/language/tr/config_lang.php

@@ -67,6 +67,7 @@ $lang["config_default_tax_rate_1"] = "Vergi Oranı 1";
 $lang["config_default_tax_rate_2"] = "Vergi Oranı 2";
 $lang["config_default_tax_rate_number"] = "Varsayılan Vergi Oranı sayı olmalıdır";
 $lang["config_default_tax_rate_required"] = "Varsayılan Vergi Oranı zorunlu alandır";
+$lang["config_default_tax_name_required"] = "";
 $lang["config_fax"] = "Faks";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "Mağaza yapılandırma bilgisi";

application/language/zh/config_lang.php

@@ -67,6 +67,7 @@ $lang["config_default_tax_rate_1"] = "稅率 1";
 $lang["config_default_tax_rate_2"] = "稅率 2";
 $lang["config_default_tax_rate_number"] = "預設稅率必需為數字";
 $lang["config_default_tax_rate_required"] = "預設稅率為必填";
+$lang["config_default_tax_name_required"] = "";
 $lang["config_fax"] = "傳真";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_info"] = "儲存組態";

application/views/configs/general_config.php

@@ -388,11 +388,12 @@ $(document).ready(function()
 			company: "required",
 			address: "required",
 			phone: "required",
-    		default_tax_rate:
+    		default_tax_1_rate:
     		{
     			required: true,
     			number: true
     		},
+			default_tax_1_name: "required",
     		email: "email",
     		return_policy: "required",
     		lines_per_page:
@@ -412,11 +413,16 @@ $(document).ready(function()
 			company: "<?php echo $this->lang->line('config_company_required'); ?>",
 			address: "<?php echo $this->lang->line('config_address_required'); ?>",
 			phone: "<?php echo $this->lang->line('config_phone_required'); ?>",
-			default_tax_rate:
+			default_tax_1_rate:
 			{
 				required: "<?php echo $this->lang->line('config_default_tax_rate_required'); ?>",
 				number: "<?php echo $this->lang->line('config_default_tax_rate_number'); ?>"
 			},
+			default_tax_1_name:
+			{
+				required: "<?php echo $this->lang->line('config_default_tax_name_required'); ?>",
+				number: "<?php echo $this->lang->line('config_default_tax_name_number'); ?>"
+			},
 			email: "<?php echo $this->lang->line('common_email_invalid_format'); ?>",
 			return_policy: "<?php echo $this->lang->line('config_return_policy_required'); ?>",
 			default_sales_discount:

translations/config_lang.csv

@@ -66,6 +66,7 @@ config_default_tax_rate_1,MWSt 1,VAT 1 %,Impuesto 1,Tax 1 Rate,Taux d\'Impositio
 config_default_tax_rate_2,MWSt 2,VAT 2 %,Impuesto 2,Tax 2 Rate,Taux d\'Imposition 2,稅率 2,ставка налога 2,อัตราภาษี 2,Vergi Oranı 2,Tarif Pajak 2
 config_default_tax_rate_number,MWSt Rate,Het percentage VAT moet een nummer zijn,El Impuesto Predeterminado debe ser un número,The default tax rate must be a number,Le taux d\'imposition doit etre un nombre,預設稅率必需為數字,Обычный ставка налога должен быть цифра,อัตราภาษีเริ่มต้นต้องเป็นตัวเลข,Varsayılan Vergi Oranı sayı olmalıdır,Tarif Pajak Biasa harus angka
 config_default_tax_rate_required,MWSt ist erforderlich,Het percentage VAT moet ingevuld worden,El Impuesto Predeterminado es requerido,The default tax rate is a required field,Le taux d\'imposition par défaut est requis,預設稅率為必填,Обычный ставка налога обязательный пробел,อัตราภาษีเริ่มต้นต้องกรอก,Varsayılan Vergi Oranı zorunlu alandır,Tarif Pajak Biasa wajib diisi
+config_default_tax_name_required,,,,The default tax name is a required field,,,,,
 config_fax,Fax,Fax,Fax,Fax,Fax,傳真,Факс,แฟ็กซ์,Faks,Fax
 config_general_configuration,Einstellungen,Algemene Instellingen,Configuración General ,General Configuration,General Configuration,General Configuration,General Configuration,ตั้งค่าทั่วไป,General Configuration,General Configuration
 config_info,Systemeinstellungen,Systeeminstellingen,Información del Comercio,Store Configuration Information,Çonfiguration de l\'Entreprise,儲存組態,информация о магазин конфигурация,ข้อมูลร้านค้า,Mağaza yapılandırma bilgisi,Informasi Konfigurasi Toko