From 0509c24f311b21b194ea8fc3cc99482f1c0bb232 Mon Sep 17 00:00:00 2001 From: objecttothis Date: Tue, 27 Nov 2018 17:35:25 +0400 Subject: [PATCH 01/35] Check for and exclude empty custom values not just NULL custom values --- .../migrations/sqlscripts/attributes.sql | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/application/migrations/sqlscripts/attributes.sql b/application/migrations/sqlscripts/attributes.sql index 6eed72aa8..b883058f7 100644 --- a/application/migrations/sqlscripts/attributes.sql +++ b/application/migrations/sqlscripts/attributes.sql @@ -68,25 +68,25 @@ INSERT INTO `ospos_attribute_definitions` (definition_name, definition_type, def INSERT INTO `ospos_attribute_definitions` (definition_name, definition_type, definition_flags) SELECT `value`, 'TEXT', 1 FROM ospos_app_config WHERE `key` = 'custom10_name' AND `value` <> ''; INSERT INTO ospos_attribute_links (definition_id, item_id) SELECT definition_id, item_id FROM ospos_attribute_definitions, ospos_app_config, ospos_items - WHERE ospos_app_config.`key` = 'custom1_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom1 IS NOT NULL; + WHERE ospos_app_config.`key` = 'custom1_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom1 IS NOT NULL AND custom1 != ''; INSERT INTO ospos_attribute_links (definition_id, item_id) SELECT definition_id, item_id FROM ospos_attribute_definitions, ospos_app_config, ospos_items - WHERE ospos_app_config.`key` = 'custom2_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom2 IS NOT NULL; + WHERE ospos_app_config.`key` = 'custom2_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom2 IS NOT NULL AND custom2 != ''; INSERT INTO ospos_attribute_links (definition_id, item_id) SELECT definition_id, item_id FROM ospos_attribute_definitions, ospos_app_config, ospos_items - WHERE ospos_app_config.`key` = 'custom3_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom3 IS NOT NULL; + WHERE ospos_app_config.`key` = 'custom3_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom3 IS NOT NULL AND custom3 != ''; INSERT INTO ospos_attribute_links (definition_id, item_id) SELECT definition_id, item_id FROM ospos_attribute_definitions, ospos_app_config, ospos_items - WHERE ospos_app_config.`key` = 'custom4_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom4 IS NOT NULL; + WHERE ospos_app_config.`key` = 'custom4_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom4 IS NOT NULL AND custom4 != ''; INSERT INTO ospos_attribute_links (definition_id, item_id) SELECT definition_id, item_id FROM ospos_attribute_definitions, ospos_app_config, ospos_items - WHERE ospos_app_config.`key` = 'custom5_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom5 IS NOT NULL; + WHERE ospos_app_config.`key` = 'custom5_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom5 IS NOT NULL AND custom5 != ''; INSERT INTO ospos_attribute_links (definition_id, item_id) SELECT definition_id, item_id FROM ospos_attribute_definitions, ospos_app_config, ospos_items - WHERE ospos_app_config.`key` = 'custom6_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom6 IS NOT NULL; + WHERE ospos_app_config.`key` = 'custom6_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom6 IS NOT NULL AND custom6 != ''; INSERT INTO ospos_attribute_links (definition_id, item_id) SELECT definition_id, item_id FROM ospos_attribute_definitions, ospos_app_config, ospos_items - WHERE ospos_app_config.`key` = 'custom7_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom7 IS NOT NULL; + WHERE ospos_app_config.`key` = 'custom7_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom7 IS NOT NULL AND custom7 != ''; INSERT INTO ospos_attribute_links (definition_id, item_id) SELECT definition_id, item_id FROM ospos_attribute_definitions, ospos_app_config, ospos_items - WHERE ospos_app_config.`key` = 'custom8_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom8 IS NOT NULL; + WHERE ospos_app_config.`key` = 'custom8_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom8 IS NOT NULL AND custom8 != ''; INSERT INTO ospos_attribute_links (definition_id, item_id) SELECT definition_id, item_id FROM ospos_attribute_definitions, ospos_app_config, ospos_items - WHERE ospos_app_config.`key` = 'custom9_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom9 IS NOT NULL; + WHERE ospos_app_config.`key` = 'custom9_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom9 IS NOT NULL AND custom9 != ''; INSERT INTO ospos_attribute_links (definition_id, item_id) SELECT definition_id, item_id FROM ospos_attribute_definitions, ospos_app_config, ospos_items - WHERE ospos_app_config.`key` = 'custom10_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom10 IS NOT NULL; + WHERE ospos_app_config.`key` = 'custom10_name' AND ospos_app_config.`value` = ospos_attribute_definitions.definition_name AND custom10 IS NOT NULL AND custom10 != ''; INSERT INTO ospos_attribute_values (attribute_value) SELECT DISTINCT custom1 FROM ospos_items WHERE custom1 <> '' AND '' <> (SELECT `value` FROM ospos_app_config WHERE `key` = 'custom1_name'); INSERT INTO ospos_attribute_values (attribute_value) SELECT DISTINCT custom2 FROM ospos_items WHERE custom2 <> '' AND '' <> (SELECT `value` FROM ospos_app_config WHERE `key` = 'custom2_name'); From cc669eb347bb16be61d9805d7442ecaaf4b97c2c Mon Sep 17 00:00:00 2001 From: objecttothis Date: Tue, 27 Nov 2018 17:37:27 +0400 Subject: [PATCH 02/35] Increase maximum varchar size to 255 for attribute_value --- application/migrations/sqlscripts/attributes.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/migrations/sqlscripts/attributes.sql b/application/migrations/sqlscripts/attributes.sql index b883058f7..d7137c3b3 100644 --- a/application/migrations/sqlscripts/attributes.sql +++ b/application/migrations/sqlscripts/attributes.sql @@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS `ospos_attribute_definitions` ( CREATE TABLE IF NOT EXISTS `ospos_attribute_values` ( `attribute_id` INT NOT NULL AUTO_INCREMENT, - `attribute_value` VARCHAR(45) NULL, + `attribute_value` VARCHAR(255) NULL, `attribute_datetime` DATETIME NULL, PRIMARY KEY (`attribute_id`) ) ENGINE = InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; From 44ce09be0f00b5fbe0c2a7c6c33b8c4ce9d9db24 Mon Sep 17 00:00:00 2001 From: jekkos Date: Sun, 2 Dec 2018 01:02:57 +0000 Subject: [PATCH 03/35] Translated using Weblate (Flemish) Currently translated at 100.0% (26 of 26 strings) Translation: ospos/attributes Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/nl_BE/ --- application/language/nl-BE/attributes_lang.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/application/language/nl-BE/attributes_lang.php b/application/language/nl-BE/attributes_lang.php index 9b75faa48..9dcd54de0 100644 --- a/application/language/nl-BE/attributes_lang.php +++ b/application/language/nl-BE/attributes_lang.php @@ -1,5 +1,4 @@ - Date: Mon, 3 Dec 2018 21:16:47 +0100 Subject: [PATCH 04/35] Sync language files (#2253) --- .../language/ar-EG/attributes_lang.php | 3 + application/language/ar-EG/cashups_lang.php | 1 + application/language/ar-EG/config_lang.php | 3 +- application/language/ar-EG/expenses_lang.php | 1 + application/language/ar-EG/item_kits_lang.php | 3 +- application/language/ar-EG/sales_lang.php | 3 +- application/language/ar-EG/suppliers_lang.php | 3 + .../language/az-AZ/attributes_lang.php | 3 + application/language/az-AZ/cashups_lang.php | 1 + application/language/az-AZ/expenses_lang.php | 1 + application/language/az-AZ/suppliers_lang.php | 3 + application/language/bg/attributes_lang.php | 3 + application/language/bg/cashups_lang.php | 1 + application/language/bg/customers_lang.php | 6 +- application/language/bg/employees_lang.php | 3 +- application/language/bg/error_lang.php | 3 +- application/language/bg/expenses_lang.php | 1 + application/language/bg/sales_lang.php | 3 +- application/language/bg/suppliers_lang.php | 6 +- application/language/bg/taxes_lang.php | 3 +- application/language/cs/attributes_lang.php | 3 + application/language/cs/cashups_lang.php | 1 + application/language/cs/expenses_lang.php | 1 + application/language/cs/reports_lang.php | 7 +- application/language/cs/suppliers_lang.php | 3 + .../language/de-CH/attributes_lang.php | 3 + application/language/de-CH/cashups_lang.php | 1 + application/language/de-CH/expenses_lang.php | 1 + application/language/de-CH/suppliers_lang.php | 3 + application/language/de/attributes_lang.php | 3 + application/language/de/cashups_lang.php | 1 + application/language/de/expenses_lang.php | 1 + application/language/de/suppliers_lang.php | 3 + application/language/el/attributes_lang.php | 3 + application/language/el/cashups_lang.php | 1 + application/language/el/expenses_lang.php | 1 + application/language/el/suppliers_lang.php | 3 + .../language/en-GB/attributes_lang.php | 6 +- application/language/en-GB/cashups_lang.php | 47 ++-- application/language/en-GB/module_lang.php | 4 +- application/language/en-GB/suppliers_lang.php | 2 +- .../language/en-US/attributes_lang.php | 6 +- application/language/en-US/cashups_lang.php | 47 ++-- application/language/en-US/module_lang.php | 4 +- application/language/en-US/suppliers_lang.php | 2 +- application/language/es/attributes_lang.php | 3 + application/language/es/cashups_lang.php | 1 + application/language/es/suppliers_lang.php | 3 + application/language/fr/attributes_lang.php | 3 + application/language/fr/cashups_lang.php | 1 + application/language/fr/expenses_lang.php | 1 + application/language/fr/suppliers_lang.php | 3 + .../language/hr-HR/attributes_lang.php | 3 + application/language/hr-HR/cashups_lang.php | 1 + application/language/hr-HR/expenses_lang.php | 1 + application/language/hr-HR/suppliers_lang.php | 3 + .../language/hu-HU/attributes_lang.php | 3 + application/language/hu-HU/cashups_lang.php | 1 + application/language/hu-HU/expenses_lang.php | 1 + application/language/hu-HU/suppliers_lang.php | 3 + application/language/id/attributes_lang.php | 3 + application/language/id/cashups_lang.php | 1 + application/language/id/common_lang.php | 3 +- .../language/id/expenses_categories_lang.php | 1 - application/language/id/expenses_lang.php | 1 + application/language/id/item_kits_lang.php | 1 + application/language/id/module_lang.php | 2 - application/language/id/receivings_lang.php | 1 - application/language/id/sales_lang.php | 3 +- application/language/id/suppliers_lang.php | 6 +- application/language/it/attributes_lang.php | 3 + application/language/it/cashups_lang.php | 1 + application/language/it/expenses_lang.php | 1 + application/language/it/suppliers_lang.php | 3 + application/language/km/attributes_lang.php | 3 + application/language/km/cashups_lang.php | 1 + application/language/km/expenses_lang.php | 1 + application/language/km/suppliers_lang.php | 3 + application/language/lo/attributes_lang.php | 3 + application/language/lo/cashups_lang.php | 1 + application/language/lo/expenses_lang.php | 1 + application/language/lo/suppliers_lang.php | 3 + application/language/nl-BE/cashups_lang.php | 1 + application/language/nl-BE/expenses_lang.php | 1 + application/language/nl-BE/sales_lang.php | 3 +- application/language/nl-BE/suppliers_lang.php | 3 + application/language/nl/attributes_lang.php | 3 + application/language/nl/cashups_lang.php | 1 + application/language/nl/expenses_lang.php | 1 + application/language/nl/suppliers_lang.php | 3 + .../language/pt-BR/attributes_lang.php | 3 + application/language/pt-BR/cashups_lang.php | 1 + application/language/pt-BR/config_lang.php | 5 +- application/language/pt-BR/customers_lang.php | 9 +- application/language/pt-BR/enum_lang.php | 3 +- .../pt-BR/expenses_categories_lang.php | 5 +- application/language/pt-BR/expenses_lang.php | 1 + application/language/pt-BR/item_kits_lang.php | 9 +- application/language/pt-BR/items_lang.php | 11 +- application/language/pt-BR/module_lang.php | 9 +- .../language/pt-BR/receivings_lang.php | 5 +- application/language/pt-BR/reports_lang.php | 11 +- application/language/pt-BR/sales_lang.php | 3 +- application/language/pt-BR/suppliers_lang.php | 3 + application/language/ro/attributes_lang.php | 3 + application/language/ro/cashups_lang.php | 1 + application/language/ro/config_lang.php | 208 ++++++++++++++++++ application/language/ro/expenses_lang.php | 1 + application/language/ro/suppliers_lang.php | 3 + application/language/ru/attributes_lang.php | 3 + application/language/ru/cashups_lang.php | 1 + application/language/ru/expenses_lang.php | 1 + application/language/ru/suppliers_lang.php | 3 + application/language/sv/attributes_lang.php | 3 + application/language/sv/cashups_lang.php | 1 + application/language/sv/expenses_lang.php | 1 + application/language/sv/suppliers_lang.php | 3 + application/language/th/attributes_lang.php | 3 + application/language/th/cashups_lang.php | 1 + application/language/th/expenses_lang.php | 1 + application/language/th/suppliers_lang.php | 3 + application/language/tr/attributes_lang.php | 3 + application/language/tr/cashups_lang.php | 1 + application/language/tr/expenses_lang.php | 1 + application/language/tr/suppliers_lang.php | 3 + application/language/vi/attributes_lang.php | 3 + application/language/vi/cashups_lang.php | 1 + application/language/vi/expenses_lang.php | 1 + application/language/vi/suppliers_lang.php | 3 + .../language/zh-Hans/attributes_lang.php | 3 + application/language/zh-Hans/cashups_lang.php | 1 + .../language/zh-Hans/expenses_lang.php | 1 + .../language/zh-Hans/suppliers_lang.php | 3 + .../language/zh-Hant/attributes_lang.php | 3 + application/language/zh-Hant/cashups_lang.php | 1 + .../language/zh-Hant/expenses_lang.php | 1 + .../language/zh-Hant/suppliers_lang.php | 3 + 137 files changed, 542 insertions(+), 112 deletions(-) diff --git a/application/language/ar-EG/attributes_lang.php b/application/language/ar-EG/attributes_lang.php index 30bdd17e8..d6dd4c610 100644 --- a/application/language/ar-EG/attributes_lang.php +++ b/application/language/ar-EG/attributes_lang.php @@ -1,16 +1,19 @@ Date: Mon, 3 Dec 2018 21:42:36 +0000 Subject: [PATCH 05/35] Translated using Weblate (Flemish) Currently translated at 100.0% (39 of 39 strings) Translation: ospos/module Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/nl_BE/ --- application/language/nl-BE/module_lang.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/application/language/nl-BE/module_lang.php b/application/language/nl-BE/module_lang.php index efc450630..8efda03d9 100755 --- a/application/language/nl-BE/module_lang.php +++ b/application/language/nl-BE/module_lang.php @@ -1,7 +1,6 @@ - Date: Mon, 3 Dec 2018 23:09:11 +0100 Subject: [PATCH 06/35] Show attribute values in search results (#2248) --- application/models/Item.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/models/Item.php b/application/models/Item.php index 2efe8085e..dfe83c76c 100644 --- a/application/models/Item.php +++ b/application/models/Item.php @@ -192,7 +192,8 @@ class Item extends CI_Model $this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id'); } } - else if (count($filters['definition_ids']) > 0) + + if (count($filters['definition_ids']) > 0) { $this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\':\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values'); $this->db->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $filters['definition_ids']) . ')', 'left'); From e432cd9b4e862e349c5105e3afabfaea60877108 Mon Sep 17 00:00:00 2001 From: objecttothis Date: Tue, 4 Dec 2018 17:07:43 +0400 Subject: [PATCH 07/35] Removed deprecated language lines pertaining to custom fields which no longer exist as of 3.3.0 --- application/language/en-US/config_lang.php | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/application/language/en-US/config_lang.php b/application/language/en-US/config_lang.php index 30b68b02b..307f7d735 100644 --- a/application/language/en-US/config_lang.php +++ b/application/language/en-US/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; $lang["config_currency_decimals"] = "Currency Decimals"; $lang["config_currency_symbol"] = "Currency Symbol"; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = "Reward"; $lang["config_customer_reward_duplicate"] = "Reward must be unique."; $lang["config_customer_reward_enable"] = "Enable Customer Rewards"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Default Barcode Page Width $lang["config_default_barcode_page_width_required"] = "Default Barcode Page Width is a required field."; $lang["config_default_barcode_width_number"] = "Default Barcode Width must be a number."; $lang["config_default_barcode_width_required"] = "Default Barcode Width is a required field."; +$lang["config_default_item_columns"] = "Default Visible Item Columns"; $lang["config_default_origin_tax_code"] = "Default Origin Tax Code"; $lang["config_default_sales_discount"] = "Default Sales Discount"; $lang["config_default_sales_discount_number"] = "Default Sales Discount must be a number."; From 41db04eb0ebe85c3f1e9dd5df2c7025103cea74c Mon Sep 17 00:00:00 2001 From: objecttothis Date: Tue, 4 Dec 2018 17:38:17 +0400 Subject: [PATCH 08/35] Removed rows associated with custom fields in ospos_app_config --- application/migrations/sqlscripts/attributes.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/migrations/sqlscripts/attributes.sql b/application/migrations/sqlscripts/attributes.sql index d7137c3b3..74a61100b 100644 --- a/application/migrations/sqlscripts/attributes.sql +++ b/application/migrations/sqlscripts/attributes.sql @@ -180,3 +180,5 @@ ALTER TABLE `ospos_items` DROP COLUMN `custom8`, DROP COLUMN `custom9`, DROP COLUMN `custom10`; + + DELETE FROM `ospos_app_config` WHERE `key` IN ('custom1_name','custom2_name','custom3_name','custom4_name','custom5_name','custom6_name','custom7_name','custom8_name','custom9_name','custom10_name'); From 70ea30efbd947d088ebbbb3f1d0cafb576acec8a Mon Sep 17 00:00:00 2001 From: jekkos Date: Tue, 4 Dec 2018 23:16:36 +0100 Subject: [PATCH 09/35] Remove deprecated translations for custom fields (#2253) --- application/language/ar-EG/config_lang.php | 11 +---------- application/language/az-AZ/config_lang.php | 11 +---------- application/language/bg/config_lang.php | 11 +---------- application/language/cs/config_lang.php | 11 +---------- application/language/de-CH/config_lang.php | 11 +---------- application/language/de/config_lang.php | 11 +---------- application/language/el/config_lang.php | 11 +---------- application/language/en-GB/config_lang.php | 11 +---------- application/language/es/config_lang.php | 11 +---------- application/language/fr/config_lang.php | 11 +---------- application/language/hr-HR/config_lang.php | 11 +---------- application/language/hu-HU/config_lang.php | 11 +---------- application/language/id/config_lang.php | 11 +---------- application/language/it/config_lang.php | 11 +---------- application/language/km/config_lang.php | 11 +---------- application/language/lo/config_lang.php | 11 +---------- application/language/nl-BE/attributes_lang.php | 9 +++++---- application/language/nl-BE/config_lang.php | 11 +---------- application/language/nl-BE/module_lang.php | 3 ++- application/language/nl/config_lang.php | 11 +---------- application/language/pt-BR/config_lang.php | 11 +---------- application/language/ro/config_lang.php | 11 +---------- application/language/ru/config_lang.php | 11 +---------- application/language/sv/config_lang.php | 11 +---------- application/language/th/config_lang.php | 11 +---------- application/language/tr/config_lang.php | 11 +---------- application/language/vi/config_lang.php | 11 +---------- application/language/zh-Hans/config_lang.php | 11 +---------- application/language/zh-Hant/config_lang.php | 11 +---------- 29 files changed, 34 insertions(+), 275 deletions(-) diff --git a/application/language/ar-EG/config_lang.php b/application/language/ar-EG/config_lang.php index bdb7240b3..a0ec9ba3c 100644 --- a/application/language/ar-EG/config_lang.php +++ b/application/language/ar-EG/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "أكواد الدولة"; $lang["config_country_codes_tooltip"] = "قائمة مفصولة بفاصلة لاسماء الدول للبحث."; $lang["config_currency_decimals"] = "العلامة العشرية للعملة"; $lang["config_currency_symbol"] = "رمز العملة"; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = "المكافآت"; $lang["config_customer_reward_duplicate"] = "المكافئة يجب ان تكون فريدة."; $lang["config_customer_reward_enable"] = "تمكين مكافآت العميل"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "عرض الصفحة الا $lang["config_default_barcode_page_width_required"] = "عرض الصفحة الافتراضي للباركود مطلوب."; $lang["config_default_barcode_width_number"] = "العرض الافتراضي للباركود لابد ان يكون رقم."; $lang["config_default_barcode_width_required"] = "العرض الافتراضي للباركود مطلوب."; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = "كود الضريبة الاساسي الافتراضي"; $lang["config_default_sales_discount"] = "نسبة الخصم الافتراضية"; $lang["config_default_sales_discount_number"] = "نسبة الخصم الافتراضية لابد ان تكون رقم."; diff --git a/application/language/az-AZ/config_lang.php b/application/language/az-AZ/config_lang.php index bbe145ffc..08602ed0e 100644 --- a/application/language/az-AZ/config_lang.php +++ b/application/language/az-AZ/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Ölkə Kodları"; $lang["config_country_codes_tooltip"] = "Vergüllə ayrılmış ölkə kodları üçün nominantim adres axtarışı."; $lang["config_currency_decimals"] = "Məzənnə Rəqəmləri"; $lang["config_currency_symbol"] = "Valyuta Simvolu"; -$lang["config_custom1"] = "Xüsusi Sahə 1"; -$lang["config_custom10"] = "Xüsusi Sahə 10"; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = "Mükafat"; $lang["config_customer_reward_duplicate"] = "Mükafat unikal olmalıdir."; $lang["config_customer_reward_enable"] = "Müştəri mükafatlarını aktivləşdirin"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Standart Barkod Sahifə gen $lang["config_default_barcode_page_width_required"] = "Standart Barkod Səhifə Genişliyi olan sahə boş qala bilməz."; $lang["config_default_barcode_width_number"] = "Standart Barkod Genişliyi rəqəm ilə olmalıdır."; $lang["config_default_barcode_width_required"] = "Standart Barkod Genişliyi olan sahə boş qala bilməz."; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = "Vergi Kodunun Standart Mənbəyi"; $lang["config_default_sales_discount"] = "Standart Satış Endirimi %"; $lang["config_default_sales_discount_number"] = "Standart Satış Endirimi rəqəm ilə olmalıdır."; diff --git a/application/language/bg/config_lang.php b/application/language/bg/config_lang.php index f5f717266..56b407bf8 100644 --- a/application/language/bg/config_lang.php +++ b/application/language/bg/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; $lang["config_currency_decimals"] = "Currency Decimals"; $lang["config_currency_symbol"] = "Currency Symbol"; -$lang["config_custom1"] = "Custom Field 1"; -$lang["config_custom10"] = "Custom Field 10"; -$lang["config_custom2"] = "Custom Field 2"; -$lang["config_custom3"] = "Custom Field 3"; -$lang["config_custom4"] = "Custom Field 4"; -$lang["config_custom5"] = "Custom Field 5"; -$lang["config_custom6"] = "Custom Field 6"; -$lang["config_custom7"] = "Custom Field 7"; -$lang["config_custom8"] = "Custom Field 8"; -$lang["config_custom9"] = "Custom Field 9"; $lang["config_customer_reward"] = "Reward"; $lang["config_customer_reward_duplicate"] = "Reward must be unique."; $lang["config_customer_reward_enable"] = "Enable Customer Rewards"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Default Barcode Page Width $lang["config_default_barcode_page_width_required"] = "Default Barcode Page Width is a required field."; $lang["config_default_barcode_width_number"] = "Default Barcode Width must be a number."; $lang["config_default_barcode_width_required"] = "Default Barcode Width is a required field."; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = "Default Origin Tax Code"; $lang["config_default_sales_discount"] = "Default Sales Discount %"; $lang["config_default_sales_discount_number"] = "Default Sales Discount must be a number."; diff --git a/application/language/cs/config_lang.php b/application/language/cs/config_lang.php index ce834609a..90de30254 100644 --- a/application/language/cs/config_lang.php +++ b/application/language/cs/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = ""; $lang["config_country_codes_tooltip"] = ""; $lang["config_currency_decimals"] = ""; $lang["config_currency_symbol"] = ""; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = ""; $lang["config_customer_reward_duplicate"] = ""; $lang["config_customer_reward_enable"] = ""; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = ""; $lang["config_default_barcode_page_width_required"] = ""; $lang["config_default_barcode_width_number"] = ""; $lang["config_default_barcode_width_required"] = ""; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = ""; $lang["config_default_sales_discount"] = ""; $lang["config_default_sales_discount_number"] = ""; diff --git a/application/language/de-CH/config_lang.php b/application/language/de-CH/config_lang.php index 5e648b828..f51488337 100644 --- a/application/language/de-CH/config_lang.php +++ b/application/language/de-CH/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; $lang["config_currency_decimals"] = "Currency Decimals"; $lang["config_currency_symbol"] = "Währungssymbol"; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = ""; $lang["config_customer_reward_duplicate"] = ""; $lang["config_customer_reward_enable"] = ""; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Die Barcode Seitenbreite mu $lang["config_default_barcode_page_width_required"] = "Die Barcode Seitenbreite ist erforderlich"; $lang["config_default_barcode_width_number"] = "Die Barcode Breite muss eine Zahl sein"; $lang["config_default_barcode_width_required"] = "Die Barcode Breite ist erforderlich"; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = ""; $lang["config_default_sales_discount"] = "Standard Verkaufsrabatt"; $lang["config_default_sales_discount_number"] = "Der Standard Verkaufsrabatt muss eine Zahl sein"; diff --git a/application/language/de/config_lang.php b/application/language/de/config_lang.php index 380d6a017..6370f5d17 100644 --- a/application/language/de/config_lang.php +++ b/application/language/de/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Ländercodes"; $lang["config_country_codes_tooltip"] = "Kommagetrennte Liste der Ländercodes für den Adressvergleich."; $lang["config_currency_decimals"] = "Währungsdezimalzahlen"; $lang["config_currency_symbol"] = "Währungssymbol"; -$lang["config_custom1"] = "Zusatzfeld 1"; -$lang["config_custom10"] = "Zusatzfeld 10"; -$lang["config_custom2"] = "Zusatzfeld 2"; -$lang["config_custom3"] = "Zusatzfeld 3"; -$lang["config_custom4"] = "Zusatzfeld 4"; -$lang["config_custom5"] = "Zusatzfeld 5"; -$lang["config_custom6"] = "Zusatzfeld 6"; -$lang["config_custom7"] = "Zusatzfeld 7"; -$lang["config_custom8"] = "Zusatzfeld 8"; -$lang["config_custom9"] = "Zusatzfeld 9"; $lang["config_customer_reward"] = "Prämie"; $lang["config_customer_reward_duplicate"] = "Die Prämie muss eindeutig sein."; $lang["config_customer_reward_enable"] = "Kundenprämien aktivieren"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Standard Barcode Seitenbrei $lang["config_default_barcode_page_width_required"] = "Die Barcode Seitenbreite ist erforderlich."; $lang["config_default_barcode_width_number"] = "Standard Barcode Breite muss eine Zahl sein."; $lang["config_default_barcode_width_required"] = "Die Barcode Breite ist erforderlich."; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = "Standard Steuer Kürzel"; $lang["config_default_sales_discount"] = "Standard Verkaufsrabatt"; $lang["config_default_sales_discount_number"] = "Der Standard Verkaufsrabatt muss eine Zahl sein."; diff --git a/application/language/el/config_lang.php b/application/language/el/config_lang.php index 1205be828..c38345edd 100644 --- a/application/language/el/config_lang.php +++ b/application/language/el/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = ""; $lang["config_country_codes_tooltip"] = ""; $lang["config_currency_decimals"] = ""; $lang["config_currency_symbol"] = ""; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = ""; $lang["config_customer_reward_duplicate"] = ""; $lang["config_customer_reward_enable"] = ""; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = ""; $lang["config_default_barcode_page_width_required"] = ""; $lang["config_default_barcode_width_number"] = ""; $lang["config_default_barcode_width_required"] = ""; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = ""; $lang["config_default_sales_discount"] = ""; $lang["config_default_sales_discount_number"] = ""; diff --git a/application/language/en-GB/config_lang.php b/application/language/en-GB/config_lang.php index 6ade7c1f3..170fc04b9 100644 --- a/application/language/en-GB/config_lang.php +++ b/application/language/en-GB/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; $lang["config_currency_decimals"] = "Currency Decimals"; $lang["config_currency_symbol"] = "Currency Symbol"; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = "Reward"; $lang["config_customer_reward_duplicate"] = "Please use a unique reward name"; $lang["config_customer_reward_enable"] = "Enable Customer Rewards"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Default Barcode Page Width $lang["config_default_barcode_page_width_required"] = "Default Barcode Page Width is a required field"; $lang["config_default_barcode_width_number"] = "Default Barcode Width must be a number"; $lang["config_default_barcode_width_required"] = "Default Barcode Width is a required field"; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = "Default Origin Tax Code"; $lang["config_default_sales_discount"] = "Default Sales Discount"; $lang["config_default_sales_discount_number"] = "Default Sales Discount must be a number"; diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php index c11750f60..5434c699f 100644 --- a/application/language/es/config_lang.php +++ b/application/language/es/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Codigo de pais"; $lang["config_country_codes_tooltip"] = "Lista de codigo de paises separado por coma para busqueda de direcciones."; $lang["config_currency_decimals"] = "Decimales de moneda"; $lang["config_currency_symbol"] = "Símbolo de moneda"; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = "Premio"; $lang["config_customer_reward_duplicate"] = "Introduzca un nombre de premio único."; $lang["config_customer_reward_enable"] = "Activar los premios para los consumidores"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Ancho de página del códig $lang["config_default_barcode_page_width_required"] = "Ancho de página del código de barras es requerido."; $lang["config_default_barcode_width_number"] = "Ancho del código de barras debe ser número."; $lang["config_default_barcode_width_required"] = "Ancho del código de barras es requerido."; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = "Código de impuesto por defecto"; $lang["config_default_sales_discount"] = "Descuento en Ventas predeterminado"; $lang["config_default_sales_discount_number"] = "Descuento en ventas predeterminado debe ser un número."; diff --git a/application/language/fr/config_lang.php b/application/language/fr/config_lang.php index 1661b8c57..a8806cef4 100644 --- a/application/language/fr/config_lang.php +++ b/application/language/fr/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Codes de pays"; $lang["config_country_codes_tooltip"] = "Liste des codes de pays, séparés par des virgules, pour la recherche d'adresses nominatives."; $lang["config_currency_decimals"] = "Décimales"; $lang["config_currency_symbol"] = "Symbole Monétaire"; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = "Récompense"; $lang["config_customer_reward_duplicate"] = "La récompense doit être unique."; $lang["config_customer_reward_enable"] = "Activer les récompenses client"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "La largeur de page du code $lang["config_default_barcode_page_width_required"] = "Largeur de page de code-barres par défaut est un champ obligatoire."; $lang["config_default_barcode_width_number"] = "La largeur de code à barres par défaut doit être un nombre."; $lang["config_default_barcode_width_required"] = "La largeur de code à barres par défaut est un champ obligatoire."; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = "Code de taxe d'origine par défaut"; $lang["config_default_sales_discount"] = "Remboursement des ventes par défaut %"; $lang["config_default_sales_discount_number"] = "Le rabais de vente par défaut doit être un nombre."; diff --git a/application/language/hr-HR/config_lang.php b/application/language/hr-HR/config_lang.php index ebc30bbfd..d2480bac5 100644 --- a/application/language/hr-HR/config_lang.php +++ b/application/language/hr-HR/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; $lang["config_currency_decimals"] = "Velutne decimale"; $lang["config_currency_symbol"] = "Valutna oznaka"; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = ""; $lang["config_customer_reward_duplicate"] = ""; $lang["config_customer_reward_enable"] = ""; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Širina stranice barkod-a m $lang["config_default_barcode_page_width_required"] = "Širina stranice barkod-a je potrebna"; $lang["config_default_barcode_width_number"] = "Az alapértelmezett vonalkód szélességnek számnak kell lennie"; $lang["config_default_barcode_width_required"] = "Širina barkod-a mora bit broj"; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = ""; $lang["config_default_sales_discount"] = "Zadani popust %"; $lang["config_default_sales_discount_number"] = "Zadani popust mora biti broj"; diff --git a/application/language/hu-HU/config_lang.php b/application/language/hu-HU/config_lang.php index 11b87b0b0..9be3b655b 100644 --- a/application/language/hu-HU/config_lang.php +++ b/application/language/hu-HU/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Country Codes"; $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup."; $lang["config_currency_decimals"] = "Currency Decimals"; $lang["config_currency_symbol"] = "Pénznem"; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = ""; $lang["config_customer_reward_duplicate"] = ""; $lang["config_customer_reward_enable"] = ""; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Az alapértelmezett vonalk $lang["config_default_barcode_page_width_required"] = "Az alapértelmezett vonalkód oldal szésesség kötelező."; $lang["config_default_barcode_width_number"] = "Az alapértelmezett vonalkód szélességnek számnak kell lennie"; $lang["config_default_barcode_width_required"] = "Az alapértelmezett vonalkód szélesség kötelező mező"; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = ""; $lang["config_default_sales_discount"] = "Alapértelmezett kedvezmény %"; $lang["config_default_sales_discount_number"] = "Alapértelmezett kedvezménynek számnak kell lennie"; diff --git a/application/language/id/config_lang.php b/application/language/id/config_lang.php index fc02447d0..0fedcfaf0 100644 --- a/application/language/id/config_lang.php +++ b/application/language/id/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Kode negara"; $lang["config_country_codes_tooltip"] = "Daftar kode negara format CSV untuk lookup alamat."; $lang["config_currency_decimals"] = "Angka desimal"; $lang["config_currency_symbol"] = "Simbol Mata Uang"; -$lang["config_custom1"] = "Kolom kustom 1"; -$lang["config_custom10"] = "Kolom kustom 10"; -$lang["config_custom2"] = "Kolom kustom 2"; -$lang["config_custom3"] = "Kolom kustom 3"; -$lang["config_custom4"] = "Kolom kustom 4"; -$lang["config_custom5"] = "Kolom kustom 5"; -$lang["config_custom6"] = "Kolom kustom 6"; -$lang["config_custom7"] = "Kolom kustom 7"; -$lang["config_custom8"] = "Kolom kustom 8"; -$lang["config_custom9"] = "Kolom kustom 9"; $lang["config_customer_reward"] = "Hadiah"; $lang["config_customer_reward_duplicate"] = "Masukkan nama unik untuk hadiah."; $lang["config_customer_reward_enable"] = "Aktifkan Hadiah Konsumen"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Lebar halaman kode batang h $lang["config_default_barcode_page_width_required"] = "Lebar halaman kode batang harus diisi."; $lang["config_default_barcode_width_number"] = "Lebar kode batang harus berupa angka."; $lang["config_default_barcode_width_required"] = "Lebar kode batang harus diisi."; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = "Kode Pajak Asal Default"; $lang["config_default_sales_discount"] = "Diskon Penjualan %"; $lang["config_default_sales_discount_number"] = "Diskon penjualan harus berupa angka."; diff --git a/application/language/it/config_lang.php b/application/language/it/config_lang.php index 094a67ba7..ac3b455f6 100644 --- a/application/language/it/config_lang.php +++ b/application/language/it/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "Codice Postale"; $lang["config_country_codes_tooltip"] = "La lista di Codici Postali separate da virgole sono usate per la ricerca per indirizzo."; $lang["config_currency_decimals"] = "Decimali Valuta"; $lang["config_currency_symbol"] = "Simbolo Valuta"; -$lang["config_custom1"] = "Campo Personaliz. 1"; -$lang["config_custom10"] = "Campo Personaliz. 10"; -$lang["config_custom2"] = "Campo Personaliz. 2"; -$lang["config_custom3"] = "Campo Personaliz. 3"; -$lang["config_custom4"] = "Campo Personaliz. 4"; -$lang["config_custom5"] = "Campo Personaliz. 5"; -$lang["config_custom6"] = "Campo Personaliz. 6"; -$lang["config_custom7"] = "Campo Personaliz. 7"; -$lang["config_custom8"] = "Campo Personaliz. 8"; -$lang["config_custom9"] = "Campo Personaliz. 9"; $lang["config_customer_reward"] = "Raccolta Punti"; $lang["config_customer_reward_duplicate"] = "Punti Fedeltà deve essere unica."; $lang["config_customer_reward_enable"] = "Abilita la Raccolta Punti per i Clienti"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "Larghezza Codice a Barre di $lang["config_default_barcode_page_width_required"] = "Larghezza Codice a Barre di Default è un campo obbligatorio."; $lang["config_default_barcode_width_number"] = "Larghezza Codice a Barre di Default deve essere un numero."; $lang["config_default_barcode_width_required"] = "Larghezza Codice a Barre di Default è un campo obbligatorio."; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = "Codice Imposta di Origine Default"; $lang["config_default_sales_discount"] = "Sconto Vendita Default %"; $lang["config_default_sales_discount_number"] = "Sconto Vendita Default deve essere un numero."; diff --git a/application/language/km/config_lang.php b/application/language/km/config_lang.php index 1205be828..c38345edd 100644 --- a/application/language/km/config_lang.php +++ b/application/language/km/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = ""; $lang["config_country_codes_tooltip"] = ""; $lang["config_currency_decimals"] = ""; $lang["config_currency_symbol"] = ""; -$lang["config_custom1"] = ""; -$lang["config_custom10"] = ""; -$lang["config_custom2"] = ""; -$lang["config_custom3"] = ""; -$lang["config_custom4"] = ""; -$lang["config_custom5"] = ""; -$lang["config_custom6"] = ""; -$lang["config_custom7"] = ""; -$lang["config_custom8"] = ""; -$lang["config_custom9"] = ""; $lang["config_customer_reward"] = ""; $lang["config_customer_reward_duplicate"] = ""; $lang["config_customer_reward_enable"] = ""; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = ""; $lang["config_default_barcode_page_width_required"] = ""; $lang["config_default_barcode_width_number"] = ""; $lang["config_default_barcode_width_required"] = ""; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = ""; $lang["config_default_sales_discount"] = ""; $lang["config_default_sales_discount_number"] = ""; diff --git a/application/language/lo/config_lang.php b/application/language/lo/config_lang.php index c58d3295c..e5602b918 100644 --- a/application/language/lo/config_lang.php +++ b/application/language/lo/config_lang.php @@ -46,16 +46,6 @@ $lang["config_country_codes"] = "ລະຫັດປະເທດ"; $lang["config_country_codes_tooltip"] = "ໃຊ້ເຄື່ອງຫມາຍຈຸດເພື່ອແຍກຫົວຫນ່ວຍເງິນຕາ"; $lang["config_currency_decimals"] = "ຈຳນວນຕົວເລກເສດເງິນ"; $lang["config_currency_symbol"] = "ສັນຍະລັກຂອງເງິນ"; -$lang["config_custom1"] = "Custom Field 1"; -$lang["config_custom10"] = "Custom Field 10"; -$lang["config_custom2"] = "Custom Field 2"; -$lang["config_custom3"] = "Custom Field 3"; -$lang["config_custom4"] = "Custom Field 4"; -$lang["config_custom5"] = "Custom Field 5"; -$lang["config_custom6"] = "Custom Field 6"; -$lang["config_custom7"] = "Custom Field 7"; -$lang["config_custom8"] = "Custom Field 8"; -$lang["config_custom9"] = "Custom Field 9"; $lang["config_customer_reward"] = "ລາງວັນ"; $lang["config_customer_reward_duplicate"] = "ລາງວັນສຳຫລັບລູກຄ້າຕ້ອງມີຄວາມແຕກຕ່າງ"; $lang["config_customer_reward_enable"] = "ໃຊ້ງານລະບົບລາງວັນສຳຫລັບລູກຄ້າ"; @@ -77,6 +67,7 @@ $lang["config_default_barcode_page_width_number"] = "ຄວາມກວ້າງ $lang["config_default_barcode_page_width_required"] = "ກະລຸນາໃສ່ຄວາມກວ້າງຂອງຫນ້າ Barcode."; $lang["config_default_barcode_width_number"] = "ຄວາມກວ້າງຂອງ Barcode ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ."; $lang["config_default_barcode_width_required"] = "ກະລຸນາກຳນົດຄວາມກວ້າງຂອງ Barcode."; +$lang["config_default_item_columns"] = ""; $lang["config_default_origin_tax_code"] = "ທີ່ມາຂອງອາກອນ"; $lang["config_default_sales_discount"] = "ເປີເຊັນສ່ວນຫລຸດ %"; $lang["config_default_sales_discount_number"] = "ເປເຊັນສ່ວນຫລຸດ ຕ້ອງເປັນຕົວເລກເທົ່ານັ້ນ."; diff --git a/application/language/nl-BE/attributes_lang.php b/application/language/nl-BE/attributes_lang.php index 9dcd54de0..444f64597 100644 --- a/application/language/nl-BE/attributes_lang.php +++ b/application/language/nl-BE/attributes_lang.php @@ -1,15 +1,19 @@ - Date: Tue, 4 Dec 2018 15:03:20 +0000 Subject: [PATCH 10/35] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (65 of 65 strings) Translation: ospos/common Translate-URL: http://weblate.jpeelaer.net/projects/ospos/common/pt_BR/ --- application/language/pt-BR/common_lang.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/application/language/pt-BR/common_lang.php b/application/language/pt-BR/common_lang.php index d74c55feb..4d5e64cb8 100644 --- a/application/language/pt-BR/common_lang.php +++ b/application/language/pt-BR/common_lang.php @@ -1,5 +1,4 @@ - Date: Tue, 4 Dec 2018 16:04:54 +0000 Subject: [PATCH 11/35] Translated using Weblate (Arabic (Egypt)) Currently translated at 11.5% (3 of 26 strings) Translation: ospos/attributes Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/ar_EG/ --- application/language/ar-EG/attributes_lang.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/application/language/ar-EG/attributes_lang.php b/application/language/ar-EG/attributes_lang.php index d6dd4c610..58a9ad7ef 100644 --- a/application/language/ar-EG/attributes_lang.php +++ b/application/language/ar-EG/attributes_lang.php @@ -1,15 +1,14 @@ - Date: Tue, 4 Dec 2018 14:29:37 +0000 Subject: [PATCH 12/35] Translated using Weblate (English (United Kingdom)) Currently translated at 100.0% (26 of 26 strings) Translation: ospos/attributes Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/en_GB/ --- application/language/en-GB/attributes_lang.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/language/en-GB/attributes_lang.php b/application/language/en-GB/attributes_lang.php index 5bf870ade..e48ed2783 100644 --- a/application/language/en-GB/attributes_lang.php +++ b/application/language/en-GB/attributes_lang.php @@ -1,5 +1,4 @@ - Date: Tue, 4 Dec 2018 14:08:57 +0000 Subject: [PATCH 13/35] Translated using Weblate (English (United States)) Currently translated at 100.0% (26 of 26 strings) Translation: ospos/attributes Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/en_US/ --- application/language/en-US/attributes_lang.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/language/en-US/attributes_lang.php b/application/language/en-US/attributes_lang.php index 5bf870ade..e48ed2783 100644 --- a/application/language/en-US/attributes_lang.php +++ b/application/language/en-US/attributes_lang.php @@ -1,5 +1,4 @@ - Date: Tue, 4 Dec 2018 13:56:22 +0000 Subject: [PATCH 14/35] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (26 of 26 strings) Translation: ospos/attributes Translate-URL: http://weblate.jpeelaer.net/projects/ospos/attributes/pt_BR/ --- .../language/pt-BR/attributes_lang.php | 55 +++++++++---------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/application/language/pt-BR/attributes_lang.php b/application/language/pt-BR/attributes_lang.php index d6dd4c610..c55e75277 100644 --- a/application/language/pt-BR/attributes_lang.php +++ b/application/language/pt-BR/attributes_lang.php @@ -1,28 +1,27 @@ - Date: Tue, 4 Dec 2018 08:26:42 +0000 Subject: [PATCH 15/35] Translated using Weblate (Indonesian) Currently translated at 11.1% (4 of 36 strings) Translation: ospos/cashups Translate-URL: http://weblate.jpeelaer.net/projects/ospos/cashups/id/ --- application/language/id/cashups_lang.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/application/language/id/cashups_lang.php b/application/language/id/cashups_lang.php index 47655e3ba..f899349c7 100644 --- a/application/language/id/cashups_lang.php +++ b/application/language/id/cashups_lang.php @@ -1,10 +1,9 @@ - Date: Tue, 4 Dec 2018 13:30:48 +0000 Subject: [PATCH 16/35] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (36 of 36 strings) Translation: ospos/cashups Translate-URL: http://weblate.jpeelaer.net/projects/ospos/cashups/pt_BR/ --- application/language/pt-BR/cashups_lang.php | 75 ++++++++++----------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/application/language/pt-BR/cashups_lang.php b/application/language/pt-BR/cashups_lang.php index 47655e3ba..fc7a87e07 100644 --- a/application/language/pt-BR/cashups_lang.php +++ b/application/language/pt-BR/cashups_lang.php @@ -1,38 +1,37 @@ - Date: Tue, 4 Dec 2018 15:04:52 +0000 Subject: [PATCH 17/35] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (262 of 262 strings) Translation: ospos/config Translate-URL: http://weblate.jpeelaer.net/projects/ospos/config/pt_BR/ --- application/language/pt-BR/config_lang.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/language/pt-BR/config_lang.php b/application/language/pt-BR/config_lang.php index d7c31418f..cb89fce8f 100644 --- a/application/language/pt-BR/config_lang.php +++ b/application/language/pt-BR/config_lang.php @@ -1,5 +1,4 @@ - Date: Tue, 4 Dec 2018 08:21:15 +0000 Subject: [PATCH 18/35] Translated using Weblate (Indonesian) Currently translated at 100.0% (20 of 20 strings) Translation: ospos/datepicker Translate-URL: http://weblate.jpeelaer.net/projects/ospos/datepicker/id/ --- application/language/id/datepicker_lang.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/application/language/id/datepicker_lang.php b/application/language/id/datepicker_lang.php index 787676601..f13962b67 100644 --- a/application/language/id/datepicker_lang.php +++ b/application/language/id/datepicker_lang.php @@ -1,5 +1,4 @@ - Date: Tue, 4 Dec 2018 13:54:14 +0000 Subject: [PATCH 19/35] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (20 of 20 strings) Translation: ospos/datepicker Translate-URL: http://weblate.jpeelaer.net/projects/ospos/datepicker/pt_BR/ --- application/language/pt-BR/datepicker_lang.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/application/language/pt-BR/datepicker_lang.php b/application/language/pt-BR/datepicker_lang.php index cbec45c04..a2e83fd58 100644 --- a/application/language/pt-BR/datepicker_lang.php +++ b/application/language/pt-BR/datepicker_lang.php @@ -1,5 +1,4 @@ - Date: Tue, 4 Dec 2018 13:55:16 +0000 Subject: [PATCH 20/35] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (44 of 44 strings) Translation: ospos/expenses Translate-URL: http://weblate.jpeelaer.net/projects/ospos/expenses/pt_BR/ --- application/language/pt-BR/expenses_lang.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/language/pt-BR/expenses_lang.php b/application/language/pt-BR/expenses_lang.php index f94002a54..5e2b13d15 100644 --- a/application/language/pt-BR/expenses_lang.php +++ b/application/language/pt-BR/expenses_lang.php @@ -1,5 +1,4 @@ - Date: Tue, 4 Dec 2018 08:24:44 +0000 Subject: [PATCH 21/35] Translated using Weblate (Indonesian) Currently translated at 100.0% (33 of 33 strings) Translation: ospos/item_kits Translate-URL: http://weblate.jpeelaer.net/projects/ospos/item_kits/id/ --- application/language/id/item_kits_lang.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/application/language/id/item_kits_lang.php b/application/language/id/item_kits_lang.php index 7760f096c..9ed299c10 100644 --- a/application/language/id/item_kits_lang.php +++ b/application/language/id/item_kits_lang.php @@ -1,15 +1,14 @@ - Date: Tue, 4 Dec 2018 16:09:57 +0000 Subject: [PATCH 22/35] Translated using Weblate (Arabic (Egypt)) Currently translated at 87.5% (7 of 8 strings) Translation: ospos/login Translate-URL: http://weblate.jpeelaer.net/projects/ospos/login/ar_EG/ --- application/language/ar-EG/login_lang.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/application/language/ar-EG/login_lang.php b/application/language/ar-EG/login_lang.php index fb2149a2b..337ddf583 100644 --- a/application/language/ar-EG/login_lang.php +++ b/application/language/ar-EG/login_lang.php @@ -1,9 +1,8 @@ - Date: Tue, 4 Dec 2018 08:22:04 +0000 Subject: [PATCH 23/35] Translated using Weblate (Indonesian) Currently translated at 100.0% (8 of 8 strings) Translation: ospos/login Translate-URL: http://weblate.jpeelaer.net/projects/ospos/login/id/ --- application/language/id/login_lang.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/application/language/id/login_lang.php b/application/language/id/login_lang.php index ce06093eb..baf12c74d 100644 --- a/application/language/id/login_lang.php +++ b/application/language/id/login_lang.php @@ -1,10 +1,9 @@ - Date: Tue, 4 Dec 2018 13:22:25 +0000 Subject: [PATCH 24/35] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (8 of 8 strings) Translation: ospos/login Translate-URL: http://weblate.jpeelaer.net/projects/ospos/login/pt_BR/ --- application/language/pt-BR/login_lang.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/application/language/pt-BR/login_lang.php b/application/language/pt-BR/login_lang.php index b5be66264..a0405c284 100644 --- a/application/language/pt-BR/login_lang.php +++ b/application/language/pt-BR/login_lang.php @@ -1,10 +1,9 @@ - Date: Tue, 4 Dec 2018 13:25:31 +0000 Subject: [PATCH 25/35] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (12 of 12 strings) Translation: ospos/messages Translate-URL: http://weblate.jpeelaer.net/projects/ospos/messages/pt_BR/ --- application/language/pt-BR/messages_lang.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/application/language/pt-BR/messages_lang.php b/application/language/pt-BR/messages_lang.php index 56696941c..de65a6473 100644 --- a/application/language/pt-BR/messages_lang.php +++ b/application/language/pt-BR/messages_lang.php @@ -1,14 +1,13 @@ - Date: Tue, 4 Dec 2018 13:51:45 +0000 Subject: [PATCH 26/35] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (39 of 39 strings) Translation: ospos/module Translate-URL: http://weblate.jpeelaer.net/projects/ospos/module/pt_BR/ --- application/language/pt-BR/module_lang.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/application/language/pt-BR/module_lang.php b/application/language/pt-BR/module_lang.php index 99478fbdc..1e6501746 100644 --- a/application/language/pt-BR/module_lang.php +++ b/application/language/pt-BR/module_lang.php @@ -1,7 +1,6 @@ - Date: Tue, 4 Dec 2018 13:52:42 +0000 Subject: [PATCH 27/35] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (20 of 20 strings) Translation: ospos/suppliers Translate-URL: http://weblate.jpeelaer.net/projects/ospos/suppliers/pt_BR/ --- application/language/pt-BR/suppliers_lang.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/application/language/pt-BR/suppliers_lang.php b/application/language/pt-BR/suppliers_lang.php index dd2d6868e..7e7943050 100644 --- a/application/language/pt-BR/suppliers_lang.php +++ b/application/language/pt-BR/suppliers_lang.php @@ -1,16 +1,15 @@ - Date: Wed, 5 Dec 2018 11:01:11 +0000 Subject: [PATCH 28/35] Added translation using Weblate (Malayalam) --- application/language/ml/attributes_lang.php | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 application/language/ml/attributes_lang.php diff --git a/application/language/ml/attributes_lang.php b/application/language/ml/attributes_lang.php new file mode 100644 index 000000000..e48ed2783 --- /dev/null +++ b/application/language/ml/attributes_lang.php @@ -0,0 +1,27 @@ + Date: Wed, 5 Dec 2018 14:46:21 +0000 Subject: [PATCH 29/35] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (65 of 65 strings) Translation: ospos/common Translate-URL: http://weblate.jpeelaer.net/projects/ospos/common/zh_Hant/ --- application/language/zh-Hant/common_lang.php | 47 ++++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/application/language/zh-Hant/common_lang.php b/application/language/zh-Hant/common_lang.php index 4c0d3f295..c02c7b27d 100644 --- a/application/language/zh-Hant/common_lang.php +++ b/application/language/zh-Hant/common_lang.php @@ -1,65 +1,64 @@ - Date: Wed, 5 Dec 2018 15:05:24 +0000 Subject: [PATCH 30/35] Translated using Weblate (Chinese (Traditional)) Currently translated at 45.0% (23 of 51 strings) Translation: ospos/customers Translate-URL: http://weblate.jpeelaer.net/projects/ospos/customers/zh_Hant/ --- application/language/zh-Hant/customers_lang.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/language/zh-Hant/customers_lang.php b/application/language/zh-Hant/customers_lang.php index cb09945f0..986e93c0d 100644 --- a/application/language/zh-Hant/customers_lang.php +++ b/application/language/zh-Hant/customers_lang.php @@ -1,8 +1,7 @@ - Date: Wed, 5 Dec 2018 15:05:24 +0000 Subject: [PATCH 31/35] Translated using Weblate (Chinese (Traditional)) Currently translated at 79.6% (129 of 162 strings) Translation: ospos/sales Translate-URL: http://weblate.jpeelaer.net/projects/ospos/sales/zh_Hant/ --- application/language/zh-Hant/sales_lang.php | 39 ++++++++++----------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/application/language/zh-Hant/sales_lang.php b/application/language/zh-Hant/sales_lang.php index 60dacee38..e1a7d85c2 100644 --- a/application/language/zh-Hant/sales_lang.php +++ b/application/language/zh-Hant/sales_lang.php @@ -1,42 +1,41 @@ - Date: Fri, 7 Dec 2018 00:26:04 +0100 Subject: [PATCH 32/35] Update gitter URL link (point to new ospos room) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d8f11514f..26c23fe15 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [ ![Download](https://api.bintray.com/packages/jekkos/opensourcepos/opensourcepos/images/download.svg?version=3.2.3) ](https://bintray.com/jekkos/opensourcepos/opensourcepos/3.2.3/link) [![Build Status](https://travis-ci.org/opensourcepos/opensourcepos.svg?branch=master)](https://travis-ci.org/opensourcepos/opensourcepos) -[![Join the chat at https://gitter.im/jekkos/opensourcepos](https://badges.gitter.im/jekkos/opensourcepos.svg)](https://gitter.im/jekkos/opensourcepos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Join the chat at https://gitter.im/opensourcepos](https://badges.gitter.im/jekkos/opensourcepos.svg)](https://gitter.im/opensourcepos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![devDependency Status](https://david-dm.org/jekkos/opensourcepos/dev-status.svg)](https://david-dm.org/jekkos/opensourcepos#info=dev) [![GitHub version](https://badge.fury.io/gh/jekkos%2Fopensourcepos.svg)](https://badge.fury.io/gh/jekkos%2Fopensourcepos) [![Translation status](http://weblate.jpeelaer.net/widgets/ospos/-/svg-badge.svg)](http://weblate.jpeelaer.net/engage/ospos/?utm_source=widget) From 21ae79378480da25a9db2ff6ba3b7102c9e099c0 Mon Sep 17 00:00:00 2001 From: Gary Sze Date: Thu, 6 Dec 2018 23:28:00 +0000 Subject: [PATCH 33/35] Translated using Weblate (Chinese (Traditional)) Currently translated at 83.3% (135 of 162 strings) Translation: ospos/sales Translate-URL: http://weblate.jpeelaer.net/projects/ospos/sales/zh_Hant/ --- application/language/zh-Hant/sales_lang.php | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/application/language/zh-Hant/sales_lang.php b/application/language/zh-Hant/sales_lang.php index e1a7d85c2..146e56935 100644 --- a/application/language/zh-Hant/sales_lang.php +++ b/application/language/zh-Hant/sales_lang.php @@ -26,7 +26,7 @@ $lang["sales_customer_address"] = "客戶地址"; $lang["sales_customer_discount"] = "折扣"; $lang["sales_customer_email"] = "客戶電郵地址"; $lang["sales_customer_location"] = "客戶所在地"; -$lang["sales_customer_mailchimp_status"] = ""; +$lang["sales_customer_mailchimp_status"] = "Mailchimp電子報行銷狀態"; $lang["sales_customer_optional"] = "非必需"; $lang["sales_customer_required"] = "必需"; $lang["sales_customer_total"] = "總數"; @@ -41,39 +41,39 @@ $lang["sales_delete_entire_sale"] = "刪除全部銷售資料"; $lang["sales_delete_successful"] = "您已成功刪除銷售資料"; $lang["sales_delete_unsuccessful"] = "銷售資料刪除失敗"; $lang["sales_description_abbrv"] = "倒序"; -$lang["sales_discard"] = ""; +$lang["sales_discard"] = "放棄"; $lang["sales_discard_quote"] = ""; $lang["sales_discount"] = "折扣 %"; $lang["sales_discount_included"] = "% 折扣"; $lang["sales_discount_short"] = "%"; $lang["sales_due"] = "由"; -$lang["sales_due_filter"] = ""; +$lang["sales_due_filter"] = "由...選項"; $lang["sales_edit"] = "編輯"; $lang["sales_edit_item"] = "編輯產品"; $lang["sales_edit_sale"] = "編輯銷售資料"; $lang["sales_email_receipt"] = "Email 銷售單"; $lang["sales_employee"] = "員工"; -$lang["sales_entry"] = ""; +$lang["sales_entry"] = "加入項目"; $lang["sales_error_editing_item"] = "編輯產品錯誤"; $lang["sales_find_or_scan_item"] = "查找/掃描商品"; $lang["sales_find_or_scan_item_or_receipt"] = "查找/掃描產品或收貨單"; $lang["sales_giftcard"] = "禮金券"; -$lang["sales_giftcard_balance"] = "Giftcard Balance"; +$lang["sales_giftcard_balance"] = "䄠金劵餘額"; $lang["sales_giftcard_number"] = "禮金券編號"; -$lang["sales_group_by_category"] = ""; -$lang["sales_group_by_type"] = ""; +$lang["sales_group_by_category"] = "以類別分類"; +$lang["sales_group_by_type"] = "以類型分類"; $lang["sales_id"] = "銷售編號"; $lang["sales_include_prices"] = ""; -$lang["sales_invoice"] = "Invoice"; -$lang["sales_invoice_confirm"] = "This invoice will be sent to"; -$lang["sales_invoice_enable"] = "Create Invoice"; -$lang["sales_invoice_filter"] = "Invoices"; -$lang["sales_invoice_no_email"] = "This customer does not have a valid email address"; -$lang["sales_invoice_number"] = "Invoice #"; -$lang["sales_invoice_number_duplicate"] = "Please enter an unique invoice number"; -$lang["sales_invoice_sent"] = "Invoice sent to"; -$lang["sales_invoice_unsent"] = "Invoice failed to be sent to"; -$lang["sales_invoice_update"] = "Recount"; +$lang["sales_invoice"] = "發票"; +$lang["sales_invoice_confirm"] = "已傳送發票到"; +$lang["sales_invoice_enable"] = "建立發票"; +$lang["sales_invoice_filter"] = "發票選項"; +$lang["sales_invoice_no_email"] = "此客戶沒有正確的電郵地址"; +$lang["sales_invoice_number"] = "發票編號#"; +$lang["sales_invoice_number_duplicate"] = "重覆的發票號碼"; +$lang["sales_invoice_sent"] = "發票已發送到"; +$lang["sales_invoice_unsent"] = "發票傳送失敗"; +$lang["sales_invoice_update"] = "重新清點"; $lang["sales_item_insufficient_of_stock"] = "產品庫存不足"; $lang["sales_item_name"] = "產品名稱"; $lang["sales_item_number"] = "產品 #"; From 26fdac75e3b85731798ddf3d49b0acaf08ef0959 Mon Sep 17 00:00:00 2001 From: jekkos Date: Wed, 12 Dec 2018 21:49:12 +0100 Subject: [PATCH 34/35] Upgrade docker php version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5696ad2e9..1cf7a4f7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.0.29-apache +FROM php:7.2.13-apache MAINTAINER jekkos RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libicu-dev \ From 06a6f8201528dd57b328aa8220f7e6f0f8cff00e Mon Sep 17 00:00:00 2001 From: jekkos Date: Wed, 12 Dec 2018 23:20:25 +0100 Subject: [PATCH 35/35] Fix attribute search (#2268) --- application/models/Item.php | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/application/models/Item.php b/application/models/Item.php index dfe83c76c..479709eaf 100644 --- a/application/models/Item.php +++ b/application/models/Item.php @@ -172,28 +172,24 @@ class Item extends CI_Model $this->db->where('trans_date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date']))); } + $attributes_enabled = count($filters['definition_ids']) > 0; + if(!empty($search)) { - if($filters['search_custom'] == FALSE) - { - $this->db->group_start(); - $this->db->like('name', $search); - $this->db->or_like('item_number', $search); - $this->db->or_like('items.item_id', $search); - $this->db->or_like('company_name', $search); - $this->db->or_like('items.category', $search); - $this->db->group_end(); - } - else - { - $this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\':\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values'); - $this->db->like('attribute_value', $search); - $this->db->join('attribute_links', 'attribute_links.item_id = items.item_id AND sale_id IS NULL AND receiving_id IS NULL'); - $this->db->join('attribute_values', 'attribute_links.attribute_id = attribute_values.attribute_id'); - } + $this->db->group_start(); + $this->db->like('name', $search); + $this->db->or_like('item_number', $search); + $this->db->or_like('items.item_id', $search); + $this->db->or_like('company_name', $search); + $this->db->or_like('items.category', $search); + if ($filters['search_custom'] && $attributes_enabled) + { + $this->db->or_like('attribute_value', $search); + } + $this->db->group_end(); } - if (count($filters['definition_ids']) > 0) + if ($attributes_enabled) { $this->db->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\':\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values'); $this->db->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $filters['definition_ids']) . ')', 'left');