From 12b62119bf422ee349e5d20975a803d15345bab6 Mon Sep 17 00:00:00 2001 From: ratana chhun Date: Mon, 12 Feb 2018 06:52:27 +0000 Subject: [PATCH 01/37] Added translation using Weblate (Central Khmer) --- application/language/km/customers_lang.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 application/language/km/customers_lang.php diff --git a/application/language/km/customers_lang.php b/application/language/km/customers_lang.php new file mode 100644 index 000000000..b3d9bbc7f --- /dev/null +++ b/application/language/km/customers_lang.php @@ -0,0 +1 @@ + Date: Mon, 12 Feb 2018 07:41:11 +0000 Subject: [PATCH 02/37] Added translation using Weblate (Central Khmer) --- application/language/km/employees_lang.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 application/language/km/employees_lang.php diff --git a/application/language/km/employees_lang.php b/application/language/km/employees_lang.php new file mode 100644 index 000000000..b3d9bbc7f --- /dev/null +++ b/application/language/km/employees_lang.php @@ -0,0 +1 @@ + Date: Tue, 13 Feb 2018 02:37:33 +0000 Subject: [PATCH 03/37] Added translation using Weblate (Central Khmer) --- application/language/km/items_lang.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 application/language/km/items_lang.php diff --git a/application/language/km/items_lang.php b/application/language/km/items_lang.php new file mode 100644 index 000000000..b3d9bbc7f --- /dev/null +++ b/application/language/km/items_lang.php @@ -0,0 +1 @@ + Date: Fri, 9 Feb 2018 16:21:06 +0000 Subject: [PATCH 04/37] Translated using Weblate (Bulgarian) Currently translated at 99.2% (255 of 257 strings) --- application/language/bg/config_lang.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/application/language/bg/config_lang.php b/application/language/bg/config_lang.php index 3f7074a3a..974b68d0d 100644 --- a/application/language/bg/config_lang.php +++ b/application/language/bg/config_lang.php @@ -1,16 +1,16 @@ Date: Mon, 12 Feb 2018 16:54:36 +0000 Subject: [PATCH 05/37] Translated using Weblate (German) Currently translated at 98.0% (252 of 257 strings) --- application/language/de/config_lang.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/language/de/config_lang.php b/application/language/de/config_lang.php index aecf612aa..09966445c 100644 --- a/application/language/de/config_lang.php +++ b/application/language/de/config_lang.php @@ -55,10 +55,10 @@ $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"] = ""; -$lang["config_customer_reward_enable"] = ""; -$lang["config_customer_reward_invalid_chars"] = ""; -$lang["config_customer_reward_required"] = ""; +$lang["config_customer_reward_duplicate"] = "Die Prämie muss eindeutig sein."; +$lang["config_customer_reward_enable"] = "Kundenprämien aktivieren"; +$lang["config_customer_reward_invalid_chars"] = "Eine Prämie darf kein '_' enthalten"; +$lang["config_customer_reward_required"] = "Prämie ist erforderlich"; $lang["config_customer_sales_tax_support"] = ""; $lang["config_date_or_time_format"] = "Datum und Uhrzeit Filter"; $lang["config_datetimeformat"] = "Datum und Zeit Format"; @@ -117,9 +117,9 @@ $lang["config_financial_year_nov"] = "1. November"; $lang["config_financial_year_oct"] = "1. Oktober"; $lang["config_financial_year_sep"] = "1. September"; $lang["config_gcaptcha_enable"] = "Login reCAPTCHA"; -$lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key"; +$lang["config_gcaptcha_secret_key"] = "reCAPTCHA: Geheimer Schlüssel"; $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key wird benötigt"; -$lang["config_gcaptcha_site_key"] = "reCAPTCHA Site Key"; +$lang["config_gcaptcha_site_key"] = "reCAPTCHA: Seitenschlüssel"; $lang["config_gcaptcha_site_key_required"] = "reCAPTCHA Site Key wird benötigt"; $lang["config_gcaptcha_tooltip"] = "Login mit Google reCAPTCHA schützen, das Icon anklicken um ein Schlüsselpaar zu erhalten."; $lang["config_general"] = "Einstellungen"; @@ -233,8 +233,8 @@ $lang["config_table_configuration"] = "Tabelle konfigurieren"; $lang["config_takings_printer"] = "Einnahmendrucker"; $lang["config_tax"] = "Steuer"; $lang["config_tax_category"] = "Steuerkategorie"; -$lang["config_tax_category_used"] = ""; -$lang["config_tax_configuration"] = ""; +$lang["config_tax_category_used"] = "Die Steuerkategorie kann nicht gelöscht werden, da sie in Benutzung ist."; +$lang["config_tax_configuration"] = "Steuer-Konfiguration"; $lang["config_tax_decimals"] = "Steuer Dezimalstellen"; $lang["config_tax_included"] = "MWSt inbegriffen"; $lang["config_theme"] = "Design"; From 5cc2898a4b864f3d4217635c9b5ba6d22a9b9ba1 Mon Sep 17 00:00:00 2001 From: Chiraq Bookstore Date: Mon, 12 Feb 2018 09:01:42 +0000 Subject: [PATCH 06/37] Translated using Weblate (az_AZ (generated)) Currently translated at 93.1% (41 of 44 strings) --- application/language/az-AZ/customers_lang.php | 62 +++++++++---------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/application/language/az-AZ/customers_lang.php b/application/language/az-AZ/customers_lang.php index 5c5a41bfb..610489392 100644 --- a/application/language/az-AZ/customers_lang.php +++ b/application/language/az-AZ/customers_lang.php @@ -8,38 +8,38 @@ $lang["customers_account_number"] = "hesab nömrəsi"; $lang["customers_account_number_duplicate"] = ""; $lang["customers_available_points"] = ""; $lang["customers_average"] = ""; -$lang["customers_avg_discount"] = "siz əminsiniz ki seçilmiş müştəriləri silmək istəyirsiniz?"; -$lang["customers_basic_information"] = "müştəri"; -$lang["customers_cannot_be_deleted"] = ""; -$lang["customers_company_name"] = ""; -$lang["customers_confirm_delete"] = "müştəri əlavə etmək və ya yeniləməkdə səhv var"; -$lang["customers_customer"] = ""; -$lang["customers_discount"] = ""; -$lang["customers_email_duplicate"] = ""; -$lang["customers_error_adding_updating"] = ""; -$lang["customers_excel_import_failed"] = ""; -$lang["customers_excel_import_nodata_wrongformat"] = ""; -$lang["customers_excel_import_partially_failed"] = ""; -$lang["customers_excel_import_success"] = ""; -$lang["customers_import_items_excel"] = ""; -$lang["customers_mailchimp_activity_click"] = ""; -$lang["customers_mailchimp_activity_lastopen"] = ""; -$lang["customers_mailchimp_activity_open"] = ""; -$lang["customers_mailchimp_activity_total"] = ""; -$lang["customers_mailchimp_activity_unopen"] = ""; +$lang["customers_avg_discount"] = "Orta endirim"; +$lang["customers_basic_information"] = "Məlumat"; +$lang["customers_cannot_be_deleted"] = "Seçilmiş müştərilər silinə bilməz, bir və ya birdən çox müştərilərin satışları var"; +$lang["customers_company_name"] = "Şirkət"; +$lang["customers_confirm_delete"] = "Siz seçilmiş müştərini (lər) silməyə əminsinizmi?"; +$lang["customers_customer"] = "Müştəri"; +$lang["customers_discount"] = "Endirim"; +$lang["customers_email_duplicate"] = "Məlumat bazasında artıq elektron poçt adresi var"; +$lang["customers_error_adding_updating"] = "Müştəri əlavəsində ya da yenilənməsində səhv"; +$lang["customers_excel_import_failed"] = "Excel idxalı alınmadı"; +$lang["customers_excel_import_nodata_wrongformat"] = "Yüklənmiş faylda heç bir məlumat yoxdur ya da səhv farmat edilib"; +$lang["customers_excel_import_partially_failed"] = "Müştəri əlavəsi bəzi səhvlər olmaqla uğurla alındı"; +$lang["customers_excel_import_success"] = "Müştəri Əlavəsi uğurla alındı"; +$lang["customers_import_items_excel"] = "Exceldən müştəri əlavə et"; +$lang["customers_mailchimp_activity_click"] = "Elektron poçt düyməsi"; +$lang["customers_mailchimp_activity_lastopen"] = "Son açılan məktub"; +$lang["customers_mailchimp_activity_open"] = "Açıq məktub"; +$lang["customers_mailchimp_activity_total"] = "Məktub göndərildi"; +$lang["customers_mailchimp_activity_unopen"] = "Açılmamış məktub"; $lang["customers_mailchimp_email_client"] = ""; $lang["customers_mailchimp_info"] = ""; -$lang["customers_mailchimp_member_rating"] = ""; -$lang["customers_mailchimp_status"] = "yeni müştəri"; +$lang["customers_mailchimp_member_rating"] = "Reytinq"; +$lang["customers_mailchimp_status"] = "Status"; $lang["customers_mailchimp_vip"] = "siz silmək üçün heç bir müştəri seçməmisiniz"; -$lang["customers_max"] = "müştəri"; -$lang["customers_min"] = ""; -$lang["customers_new"] = ""; -$lang["customers_none_selected"] = "siz uğurla müştəri əlavə etdiniz"; -$lang["customers_one_or_multiple"] = "siz uğurla sildiniz"; -$lang["customers_quantity"] = "siz uğurla müştəri yenilədiniz"; +$lang["customers_max"] = "Ən çox xərclənən"; +$lang["customers_min"] = "Ən az xərclənən"; +$lang["customers_new"] = "Yeni Müştəri"; +$lang["customers_none_selected"] = "Siz silmək üçün müştəri seçməmisiniz"; +$lang["customers_one_or_multiple"] = "müştəri (lər)"; +$lang["customers_quantity"] = "Miqdarı"; $lang["customers_stats_info"] = ""; -$lang["customers_successful_adding"] = "vergiyə cəlb olunan"; -$lang["customers_successful_deleted"] = ""; -$lang["customers_successful_updating"] = "müştərini yeniləmək"; -$lang["customers_tax_code"] = ""; +$lang["customers_successful_adding"] = "Siz uğurla müştəri əlavə etdiniz"; +$lang["customers_successful_deleted"] = "Siz uğurla sildiniz"; +$lang["customers_successful_updating"] = "Siz uğurla müştərini sildiniz"; +$lang["customers_tax_code"] = "Vergi Kodu"; From 73b97de3e55a03fa1abfc99c8f3139b07e2e1d02 Mon Sep 17 00:00:00 2001 From: Chiraq Bookstore Date: Sat, 10 Feb 2018 09:27:16 +0000 Subject: [PATCH 07/37] Translated using Weblate (az_AZ (generated)) Currently translated at 100.0% (35 of 35 strings) Translation: opensourcepos/module Translate-URL: http://*/projects/ospos/module/az_AZ/ --- application/language/az-AZ/module_lang.php | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/application/language/az-AZ/module_lang.php b/application/language/az-AZ/module_lang.php index b0cf19268..a804b2257 100644 --- a/application/language/az-AZ/module_lang.php +++ b/application/language/az-AZ/module_lang.php @@ -1,29 +1,29 @@ Date: Mon, 12 Feb 2018 12:38:05 +0000 Subject: [PATCH 08/37] Translated using Weblate (az_AZ (generated)) Currently translated at 74.2% (118 of 159 strings) --- application/language/az-AZ/sales_lang.php | 132 +++++++++++----------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/application/language/az-AZ/sales_lang.php b/application/language/az-AZ/sales_lang.php index 960667381..e3682aa21 100644 --- a/application/language/az-AZ/sales_lang.php +++ b/application/language/az-AZ/sales_lang.php @@ -1,89 +1,89 @@ Date: Mon, 12 Feb 2018 12:58:14 +0000 Subject: [PATCH 09/37] Translated using Weblate (Russian) Currently translated at 66.6% (20 of 30 strings) Translation: opensourcepos/taxes Translate-URL: http://*/projects/ospos/taxes/ru/ --- application/language/ru/taxes_lang.php | 38 +++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/application/language/ru/taxes_lang.php b/application/language/ru/taxes_lang.php index feb59c695..1597fc338 100644 --- a/application/language/ru/taxes_lang.php +++ b/application/language/ru/taxes_lang.php @@ -1,29 +1,29 @@ Date: Thu, 15 Feb 2018 07:50:39 +0000 Subject: [PATCH 10/37] Translated using Weblate (az_AZ (generated)) Currently translated at 100.0% (35 of 35 strings) --- application/language/az-AZ/employees_lang.php | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/application/language/az-AZ/employees_lang.php b/application/language/az-AZ/employees_lang.php index 5be0566fa..d70b4bec4 100644 --- a/application/language/az-AZ/employees_lang.php +++ b/application/language/az-AZ/employees_lang.php @@ -1,34 +1,34 @@ Date: Thu, 15 Feb 2018 15:51:23 +0000 Subject: [PATCH 11/37] Translated using Weblate (French) Currently translated at 100.0% (65 of 65 strings) --- application/language/fr/common_lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/language/fr/common_lang.php b/application/language/fr/common_lang.php index 6a14adba3..6a96ff52f 100644 --- a/application/language/fr/common_lang.php +++ b/application/language/fr/common_lang.php @@ -57,8 +57,8 @@ $lang["common_search_options"] = "Options de recherche"; $lang["common_searched_for"] = "Recherché"; $lang["common_state"] = "État"; $lang["common_submit"] = "Envoyer"; -$lang["common_total_spent"] = ""; -$lang["common_unknown"] = ""; +$lang["common_total_spent"] = "Dépense Totale"; +$lang["common_unknown"] = "Inconnu"; $lang["common_view_recent_sales"] = "Voir Ventes Récentes"; $lang["common_website"] = "site-web"; $lang["common_welcome"] = "Bienvenue"; From 48d58b822ac30a96dd6224c4ba06d39b3596dd6d Mon Sep 17 00:00:00 2001 From: jekkos Date: Thu, 15 Feb 2018 22:26:24 +0100 Subject: [PATCH 12/37] Sync translations (#1841) --- application/language/ar-EG/common_lang.php | 1 + application/language/ar-EG/config_lang.php | 15 + application/language/ar-EG/customers_lang.php | 1 + application/language/ar-EG/employees_lang.php | 3 + .../ar-EG/expenses_categories_lang.php | 21 +- application/language/ar-EG/expenses_lang.php | 45 +++ application/language/ar-EG/giftcards_lang.php | 1 + application/language/ar-EG/item_kits_lang.php | 1 + application/language/ar-EG/items_lang.php | 3 + application/language/ar-EG/module_lang.php | 8 + .../language/ar-EG/receivings_lang.php | 1 + application/language/ar-EG/reports_lang.php | 20 ++ application/language/ar-EG/sales_lang.php | 19 ++ application/language/ar-EG/suppliers_lang.php | 1 + application/language/ar-EG/taxes_lang.php | 1 + application/language/az-AZ/common_lang.php | 5 +- application/language/az-AZ/config_lang.php | 23 +- application/language/az-AZ/employees_lang.php | 3 + .../az-AZ/expenses_categories_lang.php | 20 ++ application/language/az-AZ/expenses_lang.php | 45 +++ application/language/az-AZ/giftcards_lang.php | 5 + application/language/az-AZ/item_kits_lang.php | 1 + application/language/az-AZ/items_lang.php | 3 + .../language/az-AZ/receivings_lang.php | 13 +- application/language/az-AZ/reports_lang.php | 32 ++- application/language/az-AZ/suppliers_lang.php | 1 + application/language/az-AZ/taxes_lang.php | 1 + application/language/bg/customers_lang.php | 1 + application/language/bg/employees_lang.php | 1 + .../language/bg/expenses_categories_lang.php | 4 +- application/language/bg/expenses_lang.php | 56 ++-- application/language/bg/giftcards_lang.php | 1 + application/language/bg/item_kits_lang.php | 1 + application/language/bg/items_lang.php | 3 + application/language/bg/module_lang.php | 2 +- application/language/bg/receivings_lang.php | 1 + application/language/bg/reports_lang.php | 5 +- application/language/bg/sales_lang.php | 6 +- application/language/bg/suppliers_lang.php | 1 + application/language/bg/taxes_lang.php | 1 + application/language/de-CH/common_lang.php | 1 + application/language/de-CH/config_lang.php | 15 + application/language/de-CH/customers_lang.php | 1 + application/language/de-CH/employees_lang.php | 3 + .../de-CH/expenses_categories_lang.php | 20 ++ application/language/de-CH/expenses_lang.php | 45 +++ application/language/de-CH/giftcards_lang.php | 1 + application/language/de-CH/item_kits_lang.php | 1 + application/language/de-CH/items_lang.php | 3 + application/language/de-CH/module_lang.php | 8 + .../language/de-CH/receivings_lang.php | 1 + application/language/de-CH/reports_lang.php | 20 ++ application/language/de-CH/sales_lang.php | 19 ++ application/language/de-CH/suppliers_lang.php | 1 + application/language/de-CH/taxes_lang.php | 1 + application/language/de/common_lang.php | 1 + application/language/de/customers_lang.php | 1 + application/language/de/employees_lang.php | 3 + .../language/de/expenses_categories_lang.php | 20 ++ application/language/de/expenses_lang.php | 45 +++ application/language/de/giftcards_lang.php | 1 + application/language/de/item_kits_lang.php | 1 + application/language/de/items_lang.php | 3 + application/language/de/module_lang.php | 8 + application/language/de/receivings_lang.php | 1 + application/language/de/reports_lang.php | 20 ++ application/language/de/sales_lang.php | 19 ++ application/language/de/suppliers_lang.php | 1 + application/language/de/taxes_lang.php | 1 + application/language/en-GB/config_lang.php | 2 +- .../en-GB/expenses_categories_lang.php | 4 +- application/language/en-GB/expenses_lang.php | 55 ++-- application/language/en-GB/module_lang.php | 2 +- application/language/en-GB/reports_lang.php | 2 +- application/language/en-GB/sales_lang.php | 3 +- application/language/en-US/config_lang.php | 4 +- .../en-US/expenses_categories_lang.php | 4 +- application/language/en-US/expenses_lang.php | 55 ++-- application/language/en-US/module_lang.php | 2 +- application/language/en-US/reports_lang.php | 2 +- application/language/en-US/sales_lang.php | 3 +- application/language/es/common_lang.php | 1 + application/language/es/config_lang.php | 15 + application/language/es/customers_lang.php | 1 + application/language/es/employees_lang.php | 3 + .../language/es/expenses_categories_lang.php | 20 ++ application/language/es/expenses_lang.php | 45 +++ application/language/es/giftcards_lang.php | 1 + application/language/es/item_kits_lang.php | 1 + application/language/es/items_lang.php | 3 + application/language/es/module_lang.php | 8 + application/language/es/receivings_lang.php | 1 + application/language/es/reports_lang.php | 20 ++ application/language/es/sales_lang.php | 19 ++ application/language/es/suppliers_lang.php | 1 + application/language/es/taxes_lang.php | 1 + application/language/fr/common_lang.php | 1 + application/language/fr/config_lang.php | 15 + application/language/fr/customers_lang.php | 1 + application/language/fr/employees_lang.php | 3 + .../language/fr/expenses_categories_lang.php | 20 ++ application/language/fr/expenses_lang.php | 45 +++ application/language/fr/giftcards_lang.php | 1 + application/language/fr/item_kits_lang.php | 1 + application/language/fr/items_lang.php | 3 + application/language/fr/module_lang.php | 8 + application/language/fr/receivings_lang.php | 1 + application/language/fr/reports_lang.php | 20 ++ application/language/fr/sales_lang.php | 19 ++ application/language/fr/suppliers_lang.php | 1 + application/language/fr/taxes_lang.php | 1 + application/language/hr-HR/common_lang.php | 1 + application/language/hr-HR/config_lang.php | 15 + application/language/hr-HR/customers_lang.php | 1 + application/language/hr-HR/employees_lang.php | 3 + .../hr-HR/expenses_categories_lang.php | 20 ++ application/language/hr-HR/expenses_lang.php | 45 +++ application/language/hr-HR/giftcards_lang.php | 1 + application/language/hr-HR/item_kits_lang.php | 1 + application/language/hr-HR/items_lang.php | 3 + application/language/hr-HR/module_lang.php | 8 + .../language/hr-HR/receivings_lang.php | 1 + application/language/hr-HR/reports_lang.php | 20 ++ application/language/hr-HR/sales_lang.php | 19 ++ application/language/hr-HR/suppliers_lang.php | 1 + application/language/hr-HR/taxes_lang.php | 1 + application/language/hu-HU/common_lang.php | 1 + application/language/hu-HU/config_lang.php | 15 + application/language/hu-HU/customers_lang.php | 1 + application/language/hu-HU/employees_lang.php | 3 + .../hu-HU/expenses_categories_lang.php | 20 ++ application/language/hu-HU/expenses_lang.php | 45 +++ application/language/hu-HU/giftcards_lang.php | 1 + application/language/hu-HU/item_kits_lang.php | 1 + application/language/hu-HU/items_lang.php | 3 + application/language/hu-HU/module_lang.php | 8 + .../language/hu-HU/receivings_lang.php | 1 + application/language/hu-HU/reports_lang.php | 20 ++ application/language/hu-HU/sales_lang.php | 19 ++ application/language/hu-HU/suppliers_lang.php | 1 + application/language/hu-HU/taxes_lang.php | 1 + application/language/id/common_lang.php | 1 + application/language/id/config_lang.php | 15 + application/language/id/customers_lang.php | 1 + application/language/id/employees_lang.php | 3 + .../language/id/expenses_categories_lang.php | 20 ++ application/language/id/expenses_lang.php | 45 +++ application/language/id/giftcards_lang.php | 1 + application/language/id/item_kits_lang.php | 1 + application/language/id/items_lang.php | 3 + application/language/id/module_lang.php | 8 + application/language/id/receivings_lang.php | 1 + application/language/id/reports_lang.php | 20 ++ application/language/id/sales_lang.php | 19 ++ application/language/id/suppliers_lang.php | 1 + application/language/id/taxes_lang.php | 1 + application/language/it/config_lang.php | 5 +- application/language/it/customers_lang.php | 1 + application/language/it/employees_lang.php | 1 + .../language/it/expenses_categories_lang.php | 4 +- application/language/it/expenses_lang.php | 56 ++-- application/language/it/giftcards_lang.php | 1 + application/language/it/item_kits_lang.php | 1 + application/language/it/module_lang.php | 2 +- application/language/it/receivings_lang.php | 1 + application/language/it/reports_lang.php | 3 +- application/language/it/sales_lang.php | 3 +- application/language/it/suppliers_lang.php | 1 + application/language/it/taxes_lang.php | 1 + .../language/km/bootstrap_tables_lang.php | 10 + application/language/km/common_lang.php | 68 +++++ application/language/km/config_lang.php | 260 +++++++++++++++++- application/language/km/datepicker_lang.php | 22 ++ application/language/km/enum_lang.php | 9 + application/language/km/error_lang.php | 4 + .../language/km/expenses_categories_lang.php | 20 ++ application/language/km/expenses_lang.php | 45 +++ .../language/km/form_validation_lang.php | 18 ++ application/language/km/giftcards_lang.php | 70 +++++ application/language/km/item_kits_lang.php | 32 +++ application/language/km/login_lang.php | 10 + application/language/km/messages_lang.php | 14 + application/language/km/migrate_lang.php | 7 + application/language/km/module_lang.php | 37 +++ application/language/km/receivings_lang.php | 53 ++++ application/language/km/reports_lang.php | 120 ++++++++ application/language/km/sales_lang.php | 163 ++++++++++- application/language/km/suppliers_lang.php | 19 ++ application/language/km/taxes_lang.php | 32 +++ application/language/lo/config_lang.php | 7 +- application/language/lo/customers_lang.php | 1 + application/language/lo/employees_lang.php | 1 + .../language/lo/expenses_categories_lang.php | 4 +- application/language/lo/expenses_lang.php | 56 ++-- application/language/lo/giftcards_lang.php | 1 + application/language/lo/item_kits_lang.php | 1 + application/language/lo/items_lang.php | 3 + application/language/lo/module_lang.php | 2 +- application/language/lo/receivings_lang.php | 1 + application/language/lo/reports_lang.php | 5 +- application/language/lo/sales_lang.php | 3 +- application/language/lo/suppliers_lang.php | 1 + application/language/lo/taxes_lang.php | 1 + application/language/nl-BE/common_lang.php | 1 + application/language/nl-BE/config_lang.php | 15 + application/language/nl-BE/customers_lang.php | 1 + application/language/nl-BE/employees_lang.php | 3 + .../nl-BE/expenses_categories_lang.php | 21 +- application/language/nl-BE/expenses_lang.php | 45 +++ application/language/nl-BE/giftcards_lang.php | 1 + application/language/nl-BE/item_kits_lang.php | 1 + application/language/nl-BE/items_lang.php | 3 + application/language/nl-BE/module_lang.php | 8 + .../language/nl-BE/receivings_lang.php | 1 + application/language/nl-BE/reports_lang.php | 20 ++ application/language/nl-BE/sales_lang.php | 19 ++ application/language/nl-BE/suppliers_lang.php | 1 + application/language/nl-BE/taxes_lang.php | 1 + application/language/pt-BR/common_lang.php | 1 + application/language/pt-BR/config_lang.php | 15 + application/language/pt-BR/customers_lang.php | 1 + application/language/pt-BR/employees_lang.php | 3 + .../pt-BR/expenses_categories_lang.php | 20 ++ application/language/pt-BR/expenses_lang.php | 45 +++ application/language/pt-BR/giftcards_lang.php | 1 + application/language/pt-BR/item_kits_lang.php | 1 + application/language/pt-BR/items_lang.php | 3 + application/language/pt-BR/module_lang.php | 8 + .../language/pt-BR/receivings_lang.php | 1 + application/language/pt-BR/reports_lang.php | 20 ++ application/language/pt-BR/sales_lang.php | 19 ++ application/language/pt-BR/suppliers_lang.php | 1 + application/language/pt-BR/taxes_lang.php | 1 + application/language/ru/common_lang.php | 1 + application/language/ru/config_lang.php | 15 + application/language/ru/customers_lang.php | 1 + application/language/ru/employees_lang.php | 3 + .../language/ru/expenses_categories_lang.php | 20 ++ application/language/ru/expenses_lang.php | 45 +++ application/language/ru/giftcards_lang.php | 1 + application/language/ru/item_kits_lang.php | 1 + application/language/ru/items_lang.php | 3 + application/language/ru/module_lang.php | 8 + application/language/ru/receivings_lang.php | 1 + application/language/ru/reports_lang.php | 20 ++ application/language/ru/sales_lang.php | 19 ++ application/language/ru/suppliers_lang.php | 1 + application/language/sv/common_lang.php | 1 + application/language/sv/config_lang.php | 15 + application/language/sv/customers_lang.php | 1 + application/language/sv/employees_lang.php | 3 + .../language/sv/expenses_categories_lang.php | 20 ++ application/language/sv/expenses_lang.php | 45 +++ application/language/sv/giftcards_lang.php | 1 + application/language/sv/item_kits_lang.php | 1 + application/language/sv/items_lang.php | 3 + application/language/sv/module_lang.php | 8 + application/language/sv/receivings_lang.php | 1 + application/language/sv/reports_lang.php | 20 ++ application/language/sv/sales_lang.php | 19 ++ application/language/sv/suppliers_lang.php | 1 + application/language/sv/taxes_lang.php | 1 + application/language/th/common_lang.php | 1 + application/language/th/config_lang.php | 15 + application/language/th/customers_lang.php | 1 + application/language/th/employees_lang.php | 3 + .../language/th/expenses_categories_lang.php | 20 ++ application/language/th/expenses_lang.php | 45 +++ application/language/th/giftcards_lang.php | 1 + application/language/th/item_kits_lang.php | 1 + application/language/th/items_lang.php | 3 + application/language/th/module_lang.php | 8 + application/language/th/receivings_lang.php | 1 + application/language/th/reports_lang.php | 20 ++ application/language/th/sales_lang.php | 19 ++ application/language/th/suppliers_lang.php | 1 + application/language/th/taxes_lang.php | 1 + application/language/tr/common_lang.php | 1 + application/language/tr/config_lang.php | 15 + application/language/tr/customers_lang.php | 1 + application/language/tr/employees_lang.php | 3 + .../language/tr/expenses_categories_lang.php | 20 ++ application/language/tr/expenses_lang.php | 45 +++ application/language/tr/giftcards_lang.php | 1 + application/language/tr/item_kits_lang.php | 1 + application/language/tr/items_lang.php | 3 + application/language/tr/module_lang.php | 8 + application/language/tr/receivings_lang.php | 1 + application/language/tr/reports_lang.php | 20 ++ application/language/tr/sales_lang.php | 19 ++ application/language/tr/suppliers_lang.php | 1 + application/language/tr/taxes_lang.php | 1 + application/language/vi/config_lang.php | 4 +- .../language/vi/expenses_categories_lang.php | 4 +- application/language/vi/expenses_lang.php | 55 ++-- application/language/vi/module_lang.php | 2 +- application/language/vi/reports_lang.php | 2 +- application/language/vi/sales_lang.php | 3 +- application/language/zh/common_lang.php | 1 + application/language/zh/config_lang.php | 15 + application/language/zh/customers_lang.php | 1 + application/language/zh/employees_lang.php | 3 + .../language/zh/expenses_categories_lang.php | 4 +- application/language/zh/expenses_lang.php | 56 ++-- application/language/zh/giftcards_lang.php | 1 + application/language/zh/item_kits_lang.php | 1 + application/language/zh/items_lang.php | 3 + application/language/zh/module_lang.php | 8 + application/language/zh/receivings_lang.php | 1 + application/language/zh/reports_lang.php | 20 ++ application/language/zh/sales_lang.php | 19 ++ application/language/zh/suppliers_lang.php | 1 + application/language/zh/taxes_lang.php | 1 + 313 files changed, 3445 insertions(+), 259 deletions(-) create mode 100644 application/language/ar-EG/expenses_lang.php create mode 100644 application/language/az-AZ/expenses_categories_lang.php create mode 100644 application/language/az-AZ/expenses_lang.php create mode 100644 application/language/de-CH/expenses_categories_lang.php create mode 100644 application/language/de-CH/expenses_lang.php create mode 100644 application/language/de/expenses_categories_lang.php create mode 100644 application/language/de/expenses_lang.php create mode 100644 application/language/es/expenses_categories_lang.php create mode 100644 application/language/es/expenses_lang.php create mode 100644 application/language/fr/expenses_categories_lang.php create mode 100644 application/language/fr/expenses_lang.php create mode 100644 application/language/hr-HR/expenses_categories_lang.php create mode 100644 application/language/hr-HR/expenses_lang.php create mode 100644 application/language/hu-HU/expenses_categories_lang.php create mode 100644 application/language/hu-HU/expenses_lang.php create mode 100644 application/language/id/expenses_categories_lang.php create mode 100644 application/language/id/expenses_lang.php create mode 100644 application/language/km/bootstrap_tables_lang.php create mode 100644 application/language/km/common_lang.php create mode 100644 application/language/km/datepicker_lang.php create mode 100644 application/language/km/enum_lang.php create mode 100644 application/language/km/error_lang.php create mode 100644 application/language/km/expenses_categories_lang.php create mode 100644 application/language/km/expenses_lang.php create mode 100644 application/language/km/form_validation_lang.php create mode 100644 application/language/km/giftcards_lang.php create mode 100644 application/language/km/item_kits_lang.php create mode 100644 application/language/km/login_lang.php create mode 100644 application/language/km/messages_lang.php create mode 100644 application/language/km/migrate_lang.php create mode 100644 application/language/km/module_lang.php create mode 100644 application/language/km/receivings_lang.php create mode 100644 application/language/km/reports_lang.php create mode 100644 application/language/km/suppliers_lang.php create mode 100644 application/language/km/taxes_lang.php create mode 100644 application/language/nl-BE/expenses_lang.php create mode 100644 application/language/pt-BR/expenses_categories_lang.php create mode 100644 application/language/pt-BR/expenses_lang.php create mode 100644 application/language/ru/expenses_categories_lang.php create mode 100644 application/language/ru/expenses_lang.php create mode 100644 application/language/sv/expenses_categories_lang.php create mode 100644 application/language/sv/expenses_lang.php create mode 100644 application/language/th/expenses_categories_lang.php create mode 100644 application/language/th/expenses_lang.php create mode 100644 application/language/tr/expenses_categories_lang.php create mode 100644 application/language/tr/expenses_lang.php diff --git a/application/language/ar-EG/common_lang.php b/application/language/ar-EG/common_lang.php index 4bd1d2fb3..b96994e39 100644 --- a/application/language/ar-EG/common_lang.php +++ b/application/language/ar-EG/common_lang.php @@ -51,6 +51,7 @@ $lang["common_price"] = "السعر"; $lang["common_print"] = "طباعة"; $lang["common_remove"] = "إزالة"; $lang["common_required"] = "مطلوب"; +$lang["common_restore"] = ""; $lang["common_return_policy"] = "سياسة الاسترجاع"; $lang["common_search"] = "بحث"; $lang["common_search_options"] = "خيارات البحث"; diff --git a/application/language/ar-EG/config_lang.php b/application/language/ar-EG/config_lang.php index bbecc8ecb..5afee3d00 100644 --- a/application/language/ar-EG/config_lang.php +++ b/application/language/ar-EG/config_lang.php @@ -2,6 +2,7 @@ $lang["config_address"] = "عنوان الشركة"; $lang["config_address_required"] = "عنوان الشركة مطلوب"; +$lang["config_allow_duplicate_barcodes"] = ""; $lang["config_apostrophe"] = "الفاصلة"; $lang["config_backup_button"] = "نسخ إحتياطى"; $lang["config_backup_database"] = "نسخ إحتياطى لقاعدة البيانات"; @@ -25,6 +26,7 @@ $lang["config_barcode_page_width"] = "عرض الصفحة"; $lang["config_barcode_price"] = "السعر"; $lang["config_barcode_second_row"] = "الصف 2"; $lang["config_barcode_third_row"] = "الصف 3"; +$lang["config_barcode_tooltip"] = ""; $lang["config_barcode_type"] = "نوعية الباركود"; $lang["config_barcode_width"] = "العرض (px)"; $lang["config_bottom"] = "الأسفل"; @@ -86,6 +88,8 @@ $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_derive_sale_quantity"] = ""; +$lang["config_derive_sale_quantity_tooltip"] = ""; $lang["config_dinner_table"] = ""; $lang["config_dinner_table_duplicate"] = ""; $lang["config_dinner_table_enable"] = ""; @@ -139,6 +143,7 @@ $lang["config_jsprintsetup_required"] = "تحذير! هذه الخاصية غي $lang["config_language"] = "اللغة"; $lang["config_last_used_invoice_number"] = "اخر رقم مستخدم للفاتورة"; $lang["config_last_used_quote_number"] = "اخر رقم مستخدم لعرض الاسعار"; +$lang["config_last_used_work_order_number"] = ""; $lang["config_left"] = "يسار"; $lang["config_license"] = "الرخصة"; $lang["config_license_configuration"] = "نص الرخصة"; @@ -222,17 +227,25 @@ $lang["config_sales_invoice_format"] = "شكل فاتورة البيع"; $lang["config_sales_quote_format"] = "شكل فاتورة عرض الاسعار"; $lang["config_saved_successfully"] = "تم حفظ التهيئة بنجاح"; $lang["config_saved_unsuccessfully"] = "لم يتم حفظ التهيئة بنجاح"; +$lang["config_show_office_group"] = ""; $lang["config_statistics"] = "إرسال اﻹحصائيات"; $lang["config_statistics_tooltip"] = "إرسال اﻹحصائيات ﻷغراض التطوير و التحسين"; $lang["config_stock_location"] = "مكان المخزون"; $lang["config_stock_location_duplicate"] = "من فضلك إستخدم اسم مكان غير مكرر"; $lang["config_stock_location_invalid_chars"] = "مكان المخزون لايمكن أن يحتوى على '_'"; $lang["config_stock_location_required"] = "مكان المخزون مطلوب"; +$lang["config_suggestions_first_column"] = ""; +$lang["config_suggestions_layout"] = ""; +$lang["config_suggestions_second_column"] = ""; +$lang["config_suggestions_third_column"] = ""; $lang["config_table"] = "جدول"; $lang["config_table_configuration"] = "اعدادات الجدول"; $lang["config_takings_printer"] = "طابعة الإيراد"; $lang["config_tax"] = "الضريبة"; $lang["config_tax_category"] = "تصنيف الضريبة"; +$lang["config_tax_category_duplicate"] = ""; +$lang["config_tax_category_invalid_chars"] = ""; +$lang["config_tax_category_required"] = ""; $lang["config_tax_category_used"] = ""; $lang["config_tax_configuration"] = "إعدادات الضريبة"; $lang["config_tax_decimals"] = "العلامة العشرية للضريبة"; @@ -242,3 +255,5 @@ $lang["config_thousands_separator"] = "فاصل الاف"; $lang["config_timezone"] = "المنطقة الزمنية"; $lang["config_top"] = "علوى"; $lang["config_website"] = "موقع الشركة"; +$lang["config_work_order_enable"] = ""; +$lang["config_work_order_format"] = ""; diff --git a/application/language/ar-EG/customers_lang.php b/application/language/ar-EG/customers_lang.php index fcb3a9e1d..909aa6452 100644 --- a/application/language/ar-EG/customers_lang.php +++ b/application/language/ar-EG/customers_lang.php @@ -9,6 +9,7 @@ $lang["customers_basic_information"] = ""; $lang["customers_cannot_be_deleted"] = "لايمكن حذف هؤلاء العملاء، أحدهم/كلهم مرتبط/مرتبطين بمبيعات"; $lang["customers_company_name"] = "اسم الشركة"; $lang["customers_confirm_delete"] = "هل تريد حذف هؤلاء العملاء حقاً؟"; +$lang["customers_confirm_restore"] = ""; $lang["customers_customer"] = "العميل"; $lang["customers_discount"] = "نسبة الخصم"; $lang["customers_email_duplicate"] = ""; diff --git a/application/language/ar-EG/employees_lang.php b/application/language/ar-EG/employees_lang.php index b923551c4..5a91c15e7 100644 --- a/application/language/ar-EG/employees_lang.php +++ b/application/language/ar-EG/employees_lang.php @@ -4,12 +4,14 @@ $lang["employees_basic_information"] = "المعلومات الأساسية لل $lang["employees_cannot_be_deleted"] = "لايمكن حذف الموظفين ، واحد أو أكثر من المظفين قام بإجراء مبيعات :)"; $lang["employees_change_password"] = ""; $lang["employees_confirm_delete"] = "هل أنت متأكد أنك تريد حذف الموظفين المختارين؟"; +$lang["employees_confirm_restore"] = ""; $lang["employees_current_password"] = ""; $lang["employees_current_password_invalid"] = ""; $lang["employees_employee"] = "موظف"; $lang["employees_error_adding_updating"] = "خطاء فى إضافة/تعديل موظف"; $lang["employees_error_deleting_demo_admin"] = "لايمكن حذف المستخدم admin الخاص بنسخة العرض"; $lang["employees_error_updating_demo_admin"] = "لايمكن تغيير بيانات المستخدم admin الخاص بنسخة العرض"; +$lang["employees_language"] = ""; $lang["employees_login_info"] = "معلومات دخول الموظف"; $lang["employees_new"] = "موظف جديد"; $lang["employees_none_selected"] = "لم تختار أى من الموظفين للحذف"; @@ -27,6 +29,7 @@ $lang["employees_successful_adding"] = "لقد تم إضافة الموظف بن $lang["employees_successful_change_password"] = ""; $lang["employees_successful_deleted"] = "لقد تم حذف الموظف بنجاح"; $lang["employees_successful_updating"] = "لقد تم تحديث بيانات الموظف بنجاح"; +$lang["employees_system_language"] = ""; $lang["employees_unsuccessful_change_password"] = ""; $lang["employees_update"] = "تحديث بيانات موظف"; $lang["employees_username"] = "اسم المستخدم"; diff --git a/application/language/ar-EG/expenses_categories_lang.php b/application/language/ar-EG/expenses_categories_lang.php index b3d9bbc7f..54b71323c 100644 --- a/application/language/ar-EG/expenses_categories_lang.php +++ b/application/language/ar-EG/expenses_categories_lang.php @@ -1 +1,20 @@ -Pendent"; +$lang["sales_suspended_doc_id"] = ""; $lang["sales_suspended_sale_id"] = "ID"; $lang["sales_suspended_sales"] = "Pendente Aufträge"; $lang["sales_table"] = ""; @@ -136,8 +149,14 @@ $lang["sales_total_tax_exclusive"] = "Total exkl. MWSt."; $lang["sales_transaction_failed"] = "Verarbeitung fehlerhaft"; $lang["sales_unable_to_add_item"] = "Kann Artikel nicht zum Auftrag hinzufügen"; $lang["sales_unsuccessfully_deleted"] = "Löschung nicht erfolgreich"; +$lang["sales_unsuccessfully_restored"] = ""; $lang["sales_unsuccessfully_suspended_sale"] = "Auftrag wurde erfolgreich pendent gehalten"; $lang["sales_unsuccessfully_updated"] = "Änderung nicht erfolgreich"; $lang["sales_unsuspend"] = "Aktivieren"; $lang["sales_unsuspend_and_delete"] = "Aktivieren und löschen"; $lang["sales_update"] = "Ändern"; +$lang["sales_work_order"] = ""; +$lang["sales_work_order_number"] = ""; +$lang["sales_work_order_number_duplicate"] = ""; +$lang["sales_work_order_sent"] = ""; +$lang["sales_work_order_unsent"] = ""; diff --git a/application/language/de-CH/suppliers_lang.php b/application/language/de-CH/suppliers_lang.php index f5afc0705..a6ae22cd2 100644 --- a/application/language/de-CH/suppliers_lang.php +++ b/application/language/de-CH/suppliers_lang.php @@ -6,6 +6,7 @@ $lang["suppliers_cannot_be_deleted"] = "Kann gewählte Lieferanten nicht lösche $lang["suppliers_company_name"] = "Firmenname"; $lang["suppliers_company_name_required"] = "Firmenname ist erforderlich"; $lang["suppliers_confirm_delete"] = "Wollen Sie die gewählten Lieferanten löschen?"; +$lang["suppliers_confirm_restore"] = ""; $lang["suppliers_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern"; $lang["suppliers_new"] = "Neuer Lieferant"; $lang["suppliers_none_selected"] = "Sie haben keinen Lieferanten zum Löschen ausgewählt"; diff --git a/application/language/de-CH/taxes_lang.php b/application/language/de-CH/taxes_lang.php index feb59c695..d242b9c97 100644 --- a/application/language/de-CH/taxes_lang.php +++ b/application/language/de-CH/taxes_lang.php @@ -2,6 +2,7 @@ $lang["taxes_add_exception"] = ""; $lang["taxes_confirm_delete"] = ""; +$lang["taxes_confirm_restore"] = ""; $lang["taxes_default_tax_category"] = ""; $lang["taxes_error_adding_updating"] = ""; $lang["taxes_new"] = ""; diff --git a/application/language/de/common_lang.php b/application/language/de/common_lang.php index 7f2f05ef8..3d525c5f7 100644 --- a/application/language/de/common_lang.php +++ b/application/language/de/common_lang.php @@ -51,6 +51,7 @@ $lang["common_price"] = "Preis"; $lang["common_print"] = "Drucken"; $lang["common_remove"] = "Annulieren"; $lang["common_required"] = "Erforderlich"; +$lang["common_restore"] = ""; $lang["common_return_policy"] = "Rücknahmeerklärung"; $lang["common_search"] = "Suche"; $lang["common_search_options"] = "Suchkriterien"; diff --git a/application/language/de/customers_lang.php b/application/language/de/customers_lang.php index cedc2edf0..6688df010 100644 --- a/application/language/de/customers_lang.php +++ b/application/language/de/customers_lang.php @@ -9,6 +9,7 @@ $lang["customers_basic_information"] = "Grundlegende Informationen"; $lang["customers_cannot_be_deleted"] = "Kunde kann nicht gelöscht werden, ein oder mehrere Kunden weisen Verkäufe auf."; $lang["customers_company_name"] = "Firmenname"; $lang["customers_confirm_delete"] = "Wollen Sie die gewählten Kunden wirklich löschen?"; +$lang["customers_confirm_restore"] = ""; $lang["customers_customer"] = "Kunde"; $lang["customers_discount"] = "Rabatt"; $lang["customers_email_duplicate"] = "E-Mail Adresse ist bereits in der Datenbank vorhanden."; diff --git a/application/language/de/employees_lang.php b/application/language/de/employees_lang.php index 473fed531..ac8b6e1f3 100644 --- a/application/language/de/employees_lang.php +++ b/application/language/de/employees_lang.php @@ -4,12 +4,14 @@ $lang["employees_basic_information"] = "Mitarbeiter-Information"; $lang["employees_cannot_be_deleted"] = "Konnte gewählten Mitarbeiter nicht löschen, einer oder mehrere weisen Verkäufe aus."; $lang["employees_change_password"] = "Passwort Ändern"; $lang["employees_confirm_delete"] = "Wollen Sie diesen Mitarbeiter wirklich löschen?"; +$lang["employees_confirm_restore"] = ""; $lang["employees_current_password"] = "Aktuelles Passwort"; $lang["employees_current_password_invalid"] = "Aktuelles Passwort ist ungültig."; $lang["employees_employee"] = "Mitarbeiter"; $lang["employees_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern."; $lang["employees_error_deleting_demo_admin"] = "Sie können den Demo-Administrator nicht löschen."; $lang["employees_error_updating_demo_admin"] = "Sie können den Demo-Administrator nicht verändern."; +$lang["employees_language"] = ""; $lang["employees_login_info"] = "Mitarbeiter Login"; $lang["employees_new"] = "Neuer Mitarbeiter"; $lang["employees_none_selected"] = "Sie haben keine Mitarbeiter zum Löschen gewählt."; @@ -27,6 +29,7 @@ $lang["employees_successful_adding"] = "Hinzufügen erfolgreich."; $lang["employees_successful_change_password"] = "Passwort erfolgreich geändert."; $lang["employees_successful_deleted"] = "Löschung erfolgreich"; $lang["employees_successful_updating"] = "Änderung erfolgreich"; +$lang["employees_system_language"] = ""; $lang["employees_unsuccessful_change_password"] = "Passwort ändern fehlgeschlagen."; $lang["employees_update"] = "Mitarbeiter ändern"; $lang["employees_username"] = "Benutzername"; diff --git a/application/language/de/expenses_categories_lang.php b/application/language/de/expenses_categories_lang.php new file mode 100644 index 000000000..54b71323c --- /dev/null +++ b/application/language/de/expenses_categories_lang.php @@ -0,0 +1,20 @@ + Aussetzen"; +$lang["sales_suspended_doc_id"] = ""; $lang["sales_suspended_sale_id"] = "ID"; $lang["sales_suspended_sales"] = "Ausgesetzte Aufträge"; $lang["sales_table"] = "Tisch"; @@ -136,8 +149,14 @@ $lang["sales_total_tax_exclusive"] = "Total exkl. MWSt."; $lang["sales_transaction_failed"] = "Verarbeitung fehlerhaft"; $lang["sales_unable_to_add_item"] = "Kann Artikel nicht zum Auftrag hinzufügen"; $lang["sales_unsuccessfully_deleted"] = "Löschung nicht erfolgreich"; +$lang["sales_unsuccessfully_restored"] = ""; $lang["sales_unsuccessfully_suspended_sale"] = "Auftrag wurde erfolgreich pendent gehalten"; $lang["sales_unsuccessfully_updated"] = "Änderung nicht erfolgreich"; $lang["sales_unsuspend"] = "Aktivieren"; $lang["sales_unsuspend_and_delete"] = "Aktivieren und löschen"; $lang["sales_update"] = "Ändern"; +$lang["sales_work_order"] = ""; +$lang["sales_work_order_number"] = ""; +$lang["sales_work_order_number_duplicate"] = ""; +$lang["sales_work_order_sent"] = ""; +$lang["sales_work_order_unsent"] = ""; diff --git a/application/language/de/suppliers_lang.php b/application/language/de/suppliers_lang.php index 50f4823e0..a9ebd001b 100644 --- a/application/language/de/suppliers_lang.php +++ b/application/language/de/suppliers_lang.php @@ -6,6 +6,7 @@ $lang["suppliers_cannot_be_deleted"] = "Kann gewählte Lieferanten nicht lösche $lang["suppliers_company_name"] = "Firmenname"; $lang["suppliers_company_name_required"] = "Firmenname ist erforderlich."; $lang["suppliers_confirm_delete"] = "Wollen Sie die gewählten Lieferanten löschen?"; +$lang["suppliers_confirm_restore"] = ""; $lang["suppliers_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern."; $lang["suppliers_new"] = "Neuer Lieferant"; $lang["suppliers_none_selected"] = "Sie haben keinen Lieferanten zum Löschen ausgewählt."; diff --git a/application/language/de/taxes_lang.php b/application/language/de/taxes_lang.php index c4bbd86b4..23baf93f7 100644 --- a/application/language/de/taxes_lang.php +++ b/application/language/de/taxes_lang.php @@ -2,6 +2,7 @@ $lang["taxes_add_exception"] = "Ausnahme hinzufügen"; $lang["taxes_confirm_delete"] = ""; +$lang["taxes_confirm_restore"] = ""; $lang["taxes_default_tax_category"] = ""; $lang["taxes_error_adding_updating"] = ""; $lang["taxes_new"] = ""; diff --git a/application/language/en-GB/config_lang.php b/application/language/en-GB/config_lang.php index 1c7187b27..d525508cb 100644 --- a/application/language/en-GB/config_lang.php +++ b/application/language/en-GB/config_lang.php @@ -149,8 +149,8 @@ $lang["config_license"] = "License"; $lang["config_license_configuration"] = "License Statement"; $lang["config_line_sequence"] = "Line Sequence"; $lang["config_lines_per_page"] = "Lines Per Page"; -$lang["config_lines_per_page_required"] = "Lines Per Page is a required field"; $lang["config_lines_per_page_number"] = "Lines Per Page must be a number"; +$lang["config_lines_per_page_required"] = "Lines Per Page is a required field"; $lang["config_locale"] = "Localisation"; $lang["config_locale_configuration"] = "Localisation Configuration"; $lang["config_locale_info"] = "Localisation Configuration Information"; diff --git a/application/language/en-GB/expenses_categories_lang.php b/application/language/en-GB/expenses_categories_lang.php index 95139f3a3..ec6ad7ad0 100644 --- a/application/language/en-GB/expenses_categories_lang.php +++ b/application/language/en-GB/expenses_categories_lang.php @@ -1,12 +1,13 @@ Date: Thu, 15 Feb 2018 18:49:45 +0000 Subject: [PATCH 13/37] Translated using Weblate (French) Currently translated at 74.7% (192 of 257 strings) --- application/language/fr/config_lang.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/application/language/fr/config_lang.php b/application/language/fr/config_lang.php index f2b23e1f8..dcc318d30 100644 --- a/application/language/fr/config_lang.php +++ b/application/language/fr/config_lang.php @@ -11,7 +11,7 @@ $lang["config_barcode_configuration"] = "Configuration du Code à barre"; $lang["config_barcode_content"] = "Contenu du Code à barre"; $lang["config_barcode_first_row"] = "Ligne numéro 1"; $lang["config_barcode_font"] = "Police"; -$lang["config_barcode_formats"] = ""; +$lang["config_barcode_formats"] = "Formats d'entrée"; $lang["config_barcode_generate_if_empty"] = "Générer si vide"; $lang["config_barcode_height"] = "Hauteur (px)"; $lang["config_barcode_id"] = "Id/Nom Article"; @@ -28,9 +28,9 @@ $lang["config_barcode_third_row"] = "Row 4"; $lang["config_barcode_type"] = "Type de Code à barre"; $lang["config_barcode_width"] = "Largeur (px)"; $lang["config_bottom"] = "Pied de page"; -$lang["config_cash_decimals"] = ""; +$lang["config_cash_decimals"] = "Décimales de devise"; $lang["config_cash_decimals_tooltip"] = ""; -$lang["config_cash_rounding"] = ""; +$lang["config_cash_rounding"] = "Arrondissement espèces"; $lang["config_center"] = "Centre"; $lang["config_comma"] = "virgule"; $lang["config_company"] = "Nome de l'Entreprise"; @@ -54,13 +54,13 @@ $lang["config_custom6"] = "Champ Personnalisé 6"; $lang["config_custom7"] = "Champ Personnalisé 7"; $lang["config_custom8"] = "Champ Personnalisé 8"; $lang["config_custom9"] = "Champ Personnalisé 9"; -$lang["config_customer_reward"] = ""; -$lang["config_customer_reward_duplicate"] = ""; -$lang["config_customer_reward_enable"] = ""; -$lang["config_customer_reward_invalid_chars"] = ""; -$lang["config_customer_reward_required"] = ""; -$lang["config_customer_sales_tax_support"] = ""; -$lang["config_date_or_time_format"] = ""; +$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 clients"; +$lang["config_customer_reward_invalid_chars"] = "La récompense ne peut contenir '_'"; +$lang["config_customer_reward_required"] = "Le champ récompense est requis"; +$lang["config_customer_sales_tax_support"] = "Support des taxes de vente ajoutées aux clients"; +$lang["config_date_or_time_format"] = "Filtre de date et d'heure"; $lang["config_datetimeformat"] = "Format de la date et de l'heure"; $lang["config_decimal_point"] = " Decimal Point"; $lang["config_default_barcode_font_size_number"] = "La taille de la police de codes à barres par défaut doit être un nombre"; @@ -75,11 +75,11 @@ $lang["config_default_barcode_page_width_number"] = "La largeur de la page du co $lang["config_default_barcode_page_width_required"] = "La largeur de la page du code barre standard est un champ obligatoire"; $lang["config_default_barcode_width_number"] = "Le code-barres par défaut est obligatoire"; $lang["config_default_barcode_width_required"] = "La largeur par défaut du code à barres est un champ obligatoire"; -$lang["config_default_origin_tax_code"] = ""; +$lang["config_default_origin_tax_code"] = "Code de taxes original par défaut"; $lang["config_default_sales_discount"] = "Remboursement des ventes par défaut %"; $lang["config_default_sales_discount_number"] = "La réduction de vente par défaut doit être un nombre"; $lang["config_default_sales_discount_required"] = "La réduction de vente par défaut est un champ obligatoire"; -$lang["config_default_tax_name_number"] = ""; +$lang["config_default_tax_name_number"] = "Le nom de taxe par défaut doit être une chaîne."; $lang["config_default_tax_name_required"] = "Le nom d'impôt par défaut est un champ obligatoire"; $lang["config_default_tax_rate"] = "Taux d'Imposition par Défaut"; $lang["config_default_tax_rate_1"] = "Taux d'Imposition 1"; From 463cf9266db4aee9c34ba1f55d87dd2b9ffe8cf2 Mon Sep 17 00:00:00 2001 From: Chiraq Bookstore Date: Thu, 15 Feb 2018 06:16:50 +0000 Subject: [PATCH 14/37] Translated using Weblate (az_AZ (generated)) Currently translated at 100.0% (35 of 35 strings) Translation: opensourcepos/module Translate-URL: http://*/projects/ospos/module/az_AZ/ --- application/language/az-AZ/module_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/az-AZ/module_lang.php b/application/language/az-AZ/module_lang.php index a804b2257..955df9b18 100644 --- a/application/language/az-AZ/module_lang.php +++ b/application/language/az-AZ/module_lang.php @@ -1,7 +1,7 @@ Date: Thu, 15 Feb 2018 08:10:01 +0000 Subject: [PATCH 15/37] Translated using Weblate (az_AZ (generated)) Currently translated at 58.8% (30 of 51 strings) --- .../language/az-AZ/receivings_lang.php | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/application/language/az-AZ/receivings_lang.php b/application/language/az-AZ/receivings_lang.php index 4fef6e3ba..362eb7135 100644 --- a/application/language/az-AZ/receivings_lang.php +++ b/application/language/az-AZ/receivings_lang.php @@ -4,21 +4,21 @@ $lang["receivings_cancel_receiving"] = ""; $lang["receivings_cannot_be_deleted"] = ""; $lang["receivings_cancel_receiving"] = ""; $lang["receivings_cannot_be_deleted"] = ""; -$lang["receivings_comments"] = "siz əminsiniz ki bu alışı silmək istəyirsiz.hər şey silinəcək."; -$lang["receivings_complete_receiving"] = ""; -$lang["receivings_confirm_cancel_receiving"] = "siz əminsiniz ki alışı göstərmək istəyirsiniz.bu ləğv oluna bilməz."; -$lang["receivings_confirm_delete"] = "dəyəri"; -$lang["receivings_confirm_finish_receiving"] = ""; -$lang["receivings_cost"] = ""; -$lang["receivings_date"] = ""; -$lang["receivings_date_required"] = ""; -$lang["receivings_date_type"] = "endirim %"; -$lang["receivings_delete_entire_sale"] = "red. etmək"; -$lang["receivings_discount"] = ""; -$lang["receivings_edit"] = ""; -$lang["receivings_edit_sale"] = "malın redaktəsi səhvdir"; -$lang["receivings_employee"] = ""; -$lang["receivings_error_editing_item"] = "tapmaq və skan etmək malı"; +$lang["receivings_comments"] = "Rəylər"; +$lang["receivings_complete_receiving"] = "Son"; +$lang["receivings_confirm_cancel_receiving"] = "Siz əminsiniz mi ki qəbul olunanları təmizləmək istəyirsiniz? Bütün mallar təmizlənəcək"; +$lang["receivings_confirm_delete"] = "Siz qəbul olunani silməyə əminsinizmi? Bu əməlliyat yenidən bərba edilə bilməz"; +$lang["receivings_confirm_finish_receiving"] = "Siz bu qəbul olunanın tətbiqinə əminsinizmi? Bu əməliyyat yenidən bərpa edilə bilməz"; +$lang["receivings_cost"] = "Qiyməti"; +$lang["receivings_date"] = "Qəbul Günü"; +$lang["receivings_date_required"] = "Düzgün tarix əlavə olunmalıdir."; +$lang["receivings_date_type"] = "Tarix olan sahə boş qala bilməz"; +$lang["receivings_delete_entire_sale"] = "Butün Satışı Sil"; +$lang["receivings_discount"] = "Endirim %"; +$lang["receivings_edit"] = "Redaktə Et"; +$lang["receivings_edit_sale"] = "Qəbul Olunanı Redaktə Et"; +$lang["receivings_employee"] = "Əməkdaş"; +$lang["receivings_error_editing_item"] = "Malın redaktəsi uğursuz alındı"; $lang["receivings_error_requisition"] = "malı və ya kvitansiyanı tapmaq skan etmək"; $lang["receivings_find_or_scan_item"] = "alış id"; $lang["receivings_find_or_scan_item_or_receipt"] = "malın adı"; From a353e735493a5c0be26e053f2a43edc8d8af859f Mon Sep 17 00:00:00 2001 From: Chiraq Bookstore Date: Thu, 15 Feb 2018 07:08:14 +0000 Subject: [PATCH 16/37] Translated using Weblate (az_AZ (generated)) Currently translated at 100.0% (30 of 30 strings) Translation: opensourcepos/taxes Translate-URL: http://*/projects/ospos/taxes/az_AZ/ --- application/language/az-AZ/taxes_lang.php | 52 +++++++++++------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/application/language/az-AZ/taxes_lang.php b/application/language/az-AZ/taxes_lang.php index 54c3a1225..1a307a08f 100644 --- a/application/language/az-AZ/taxes_lang.php +++ b/application/language/az-AZ/taxes_lang.php @@ -1,31 +1,31 @@ Date: Sun, 11 Feb 2018 12:24:48 -0700 Subject: [PATCH 17/37] Update Detailed Reports. Add payment type to Specific Customer. --- application/controllers/Reports.php | 46 ++++++++++--- application/language/en-GB/reports_lang.php | 1 + application/language/en-US/reports_lang.php | 1 + application/models/reports/Detailed_sales.php | 1 + .../models/reports/Specific_customer.php | 1 + .../models/reports/Specific_discount.php | 1 + .../models/reports/Specific_employee.php | 1 + .../views/reports/specific_customer_input.php | 69 +++++++++++++++++++ 8 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 application/views/reports/specific_customer_input.php diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index 3e5cb5529..e5312e651 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -780,22 +780,41 @@ class Reports extends Secure_Controller public function specific_customer_input() { $data = array(); - $data['specific_input_name'] = $this->lang->line('reports_customer'); - + $data['specific_input_name'] = $this->lang->line('reports_customer'); $customers = array(); foreach($this->Customer->get_all()->result() as $customer) { - $customers[$customer->person_id] = $this->xss_clean($customer->first_name . ' ' . $customer->last_name); + if(isset($customer->company_name)) + { + $customers[$customer->person_id] = $this->xss_clean($customer->first_name . ' ' . $customer->last_name. ' ' . ' [ '.$customer->company_name.' ] '); + } + else + { + $customers[$customer->person_id] = $this->xss_clean($customer->first_name . ' ' . $customer->last_name); + } } $data['specific_input_data'] = $customers; $data['sale_type_options'] = $this->get_sale_type_options(); - $this->load->view('reports/specific_input', $data); + $data['payment_type'] = $this->get_payment_type(); + $this->load->view('reports/specific_customer_input', $data); } + + public function get_payment_type() + { + $payment_type = array( 'all' => $this->lang->line('common_none_selected_text'), + 'cash' => $this->lang->line('sales_cash'), + 'due' => $this->lang->line('sales_due'), + 'check' => $this->lang->line('sales_check'), + 'credit' => $this->lang->line('sales_credit'), + 'debit' => $this->lang->line('sales_debit'), + 'invoices' => $this->lang->line('sales_invoice')); + return $payment_type; + } - public function specific_customer($start_date, $end_date, $customer_id, $sale_type) + public function specific_customer($start_date, $end_date, $customer_id, $sale_type, $payment_type) { - $inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'customer_id' => $customer_id, 'sale_type' => $sale_type); + $inputs = array('start_date' => $start_date, 'end_date' => $end_date, 'customer_id' => $customer_id, 'sale_type' => $sale_type, 'payment_type' => $payment_type); $this->load->model('reports/Specific_customer'); $model = $this->Specific_customer; @@ -823,7 +842,7 @@ class Reports extends Secure_Controller } $summary_data[] = $this->xss_clean(array( - 'id' => anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target'=>'_blank')), + 'id' => $row['sale_id'], 'type_code' => $row['type_code'], 'sale_date' => $row['sale_date'], 'quantity' => to_quantity_decimals($row['items_purchased']), @@ -865,10 +884,20 @@ class Reports extends Secure_Controller } $customer_info = $this->Customer->get_info($customer_id); + if(!empty($customer_info->company_name)) + { + $customer_name ='[ '.$customer_info->company_name.' ]'; + } + else + { + $customer_name = $customer_info->company_name; + } + $data = array( 'title' => $this->xss_clean($customer_info->first_name . ' ' . $customer_info->last_name . ' ' . $this->lang->line('reports_report')), 'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)), 'headers' => $headers, + 'editable' => 'sales', 'summary_data' => $summary_data, 'details_data' => $details_data, 'details_data_rewards' => $details_data_rewards, @@ -924,7 +953,7 @@ class Reports extends Secure_Controller } $summary_data[] = $this->xss_clean(array( - 'id' => anchor('sales/receipt/'.$row['sale_id'], 'POS '.$row['sale_id'], array('target'=>'_blank')), + 'id' => $row['sale_id'], 'type_code' => $row['type_code'], 'sale_date' => $row['sale_date'], 'quantity' => to_quantity_decimals($row['items_purchased']), @@ -970,6 +999,7 @@ class Reports extends Secure_Controller 'title' => $this->xss_clean($employee_info->first_name . ' ' . $employee_info->last_name . ' ' . $this->lang->line('reports_report')), 'subtitle' => $this->_get_subtitle_report(array('start_date' => $start_date, 'end_date' => $end_date)), 'headers' => $headers, + 'editable' => 'sales', 'summary_data' => $summary_data, 'details_data' => $details_data, 'details_data_rewards' => $details_data_rewards, diff --git a/application/language/en-GB/reports_lang.php b/application/language/en-GB/reports_lang.php index aa8c52b07..b3bbe16fe 100644 --- a/application/language/en-GB/reports_lang.php +++ b/application/language/en-GB/reports_lang.php @@ -7,6 +7,7 @@ $lang["reports_categories_summary_report"] = "Categories Summary Report"; $lang["reports_category"] = "Category"; $lang["reports_code_canceled"] = "CNL"; $lang["reports_code_invoice"] = "INV"; +$lang["reports_code_pos"] = "POS"; $lang["reports_code_quote"] = "Q"; $lang["reports_code_return"] = "RET"; $lang["reports_code_type"] = "Type"; diff --git a/application/language/en-US/reports_lang.php b/application/language/en-US/reports_lang.php index 80a5ba773..7ecbbd89f 100644 --- a/application/language/en-US/reports_lang.php +++ b/application/language/en-US/reports_lang.php @@ -7,6 +7,7 @@ $lang["reports_categories_summary_report"] = "Categories Summary Report"; $lang["reports_category"] = "Category"; $lang["reports_code_canceled"] = "CNL"; $lang["reports_code_invoice"] = "INV"; +$lang["reports_code_pos"] = "POS"; $lang["reports_code_quote"] = "Q"; $lang["reports_code_return"] = "RET"; $lang["reports_code_type"] = "Type"; diff --git a/application/models/reports/Detailed_sales.php b/application/models/reports/Detailed_sales.php index 95f7dae12..47c619592 100644 --- a/application/models/reports/Detailed_sales.php +++ b/application/models/reports/Detailed_sales.php @@ -70,6 +70,7 @@ class Detailed_sales extends Report { $this->db->select('sale_id, MAX(CASE + WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_pos') . '\' WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_invoice') . '\' WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_work_order') . '\' WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_quote') . '\' diff --git a/application/models/reports/Specific_customer.php b/application/models/reports/Specific_customer.php index 7ec5ab0df..b27ffbe5d 100644 --- a/application/models/reports/Specific_customer.php +++ b/application/models/reports/Specific_customer.php @@ -48,6 +48,7 @@ class Specific_customer extends Report { $this->db->select('sale_id, MAX(CASE + WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_pos') . '\' WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_invoice') . '\' WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_work_order') . '\' WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_quote') . '\' diff --git a/application/models/reports/Specific_discount.php b/application/models/reports/Specific_discount.php index 797a9485f..922702238 100755 --- a/application/models/reports/Specific_discount.php +++ b/application/models/reports/Specific_discount.php @@ -49,6 +49,7 @@ class Specific_discount extends Report { $this->db->select('sale_id, MAX(CASE + WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_pos') . '\' WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_invoice') . '\' WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_work_order') . '\' WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_quote') . '\' diff --git a/application/models/reports/Specific_employee.php b/application/models/reports/Specific_employee.php index 4d8f0a3ce..91a651b7f 100644 --- a/application/models/reports/Specific_employee.php +++ b/application/models/reports/Specific_employee.php @@ -48,6 +48,7 @@ class Specific_employee extends Report { $this->db->select('sale_id, MAX(CASE + WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_pos') . '\' WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_invoice') . '\' WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_work_order') . '\' WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_quote') . '\' diff --git a/application/views/reports/specific_customer_input.php b/application/views/reports/specific_customer_input.php new file mode 100644 index 000000000..a55b65aa1 --- /dev/null +++ b/application/views/reports/specific_customer_input.php @@ -0,0 +1,69 @@ +load->view("partial/header"); ?> + + + + +
lang->line('reports_report_input'); ?>
+ +".$error.""; +} +?> + +'item_form', 'enctype'=>'multipart/form-data', 'class'=>'form-horizontal')); ?> +
+ lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?> +
+ 'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?> +
+
+ +
+ 'required control-label col-xs-2')); ?> +
+ +
+
+ +
+ lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?> +
+ +
+
+ +
+ lang->line('reports_payment_type'), 'reports_payment_type_label', array('class'=>'required control-label col-xs-2')); ?> +
+ +
+
+ + 'generate_report', + 'id'=>'generate_report', + 'content'=>$this->lang->line('common_submit'), + 'class'=>'btn btn-primary btn-sm') + ); + ?> + + +load->view("partial/footer"); ?> + + From 60d77e1f61050e12133ac52a713fc7dc42189ce1 Mon Sep 17 00:00:00 2001 From: odiea Date: Sun, 11 Feb 2018 13:28:58 -0700 Subject: [PATCH 18/37] Removed edit from Discount Report --- application/controllers/Reports.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index e5312e651..5f8eaf59b 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -1070,8 +1070,7 @@ class Reports extends Secure_Controller 'profit' => to_currency($row['profit']), 'payment_type' => $row['payment_type'], 'comment' => $row['comment'], - 'edit' => anchor('sales/edit/'. $row['sale_id'], '', - array('class'=>'modal-dlg print_hide', $button_key => $button_label, 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('sales_update'))) + )); foreach($report_data['details'][$key] as $drow) From 58e8469dde19fe15adafb68d01844a4842afb5aa Mon Sep 17 00:00:00 2001 From: odiea Date: Tue, 13 Feb 2018 13:35:57 -0700 Subject: [PATCH 19/37] Added filters to customer --- .../models/reports/Specific_customer.php | 67 +++++++++++++++++-- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/application/models/reports/Specific_customer.php b/application/models/reports/Specific_customer.php index b27ffbe5d..416c9dba1 100644 --- a/application/models/reports/Specific_customer.php +++ b/application/models/reports/Specific_customer.php @@ -48,7 +48,6 @@ class Specific_customer extends Report { $this->db->select('sale_id, MAX(CASE - WHEN sale_type = ' . SALE_TYPE_POS . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_pos') . '\' WHEN sale_type = ' . SALE_TYPE_INVOICE . ' && sale_status = ' . COMPLETED . ' THEN \'' . $this->lang->line('reports_code_invoice') . '\' WHEN sale_type = ' . SALE_TYPE_WORK_ORDER . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_work_order') . '\' WHEN sale_type = ' . SALE_TYPE_QUOTE . ' && sale_status = ' . SUSPENDED . ' THEN \'' . $this->lang->line('reports_code_quote') . '\' @@ -68,15 +67,46 @@ class Specific_customer extends Report MAX(payment_type) AS payment_type, MAX(comment) AS comment'); $this->db->from('sales_items_temp'); - $this->db->where('customer_id', $inputs['customer_id']); + $this->db->where('customer_id', $inputs['customer_id']); + + if($inputs['payment_type'] == 'cash') + { + $this->db->group_start(); + $this->db->like('payment_type', $this->lang->line('sales_cash')); + $this->db->group_end(); + } + if($inputs['payment_type'] == 'due') + { + $this->db->like('payment_type', $this->lang->line('sales_due')); + } + if($inputs['payment_type'] == 'check') + { + $this->db->like('payment_type', $this->lang->line('sales_check')); + } + + if($inputs['payment_type'] == 'credit') + { + $this->db->like('payment_type', $this->lang->line('sales_credit')); + } + if($inputs['payment_type'] == 'debit') + { + $this->db->like('payment_type', $this->lang->line('sales_debit')); + } + + if($inputs['payment_type'] == 'invoices') + { + $this->db->where('sale_type', SALE_TYPE_INVOICE); + } + + if($inputs['sale_type'] == 'complete') { $this->db->where('sale_status', COMPLETED); $this->db->group_start(); $this->db->where('sale_type', SALE_TYPE_POS); $this->db->or_where('sale_type', SALE_TYPE_INVOICE); - $this->db->or_where('sale_type', SALE_TYPE_RETURN); + $this->db->or_where('sale_type', SALE_TYPE_RETURN); $this->db->group_end(); } elseif($inputs['sale_type'] == 'sales') @@ -85,6 +115,7 @@ class Specific_customer extends Report $this->db->group_start(); $this->db->where('sale_type', SALE_TYPE_POS); $this->db->or_where('sale_type', SALE_TYPE_INVOICE); + $this->db->group_end(); } elseif($inputs['sale_type'] == 'quotes') @@ -135,7 +166,35 @@ class Specific_customer extends Report $this->db->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit'); $this->db->from('sales_items_temp'); $this->db->where('customer_id', $inputs['customer_id']); + if($inputs['payment_type'] == 'cash') + { + $this->db->group_start(); + $this->db->like('payment_type', $this->lang->line('sales_cash')); + $this->db->group_end(); + } + if($inputs['payment_type'] == 'due') + { + $this->db->like('payment_type', $this->lang->line('sales_due')); + } + if($inputs['payment_type'] == 'check') + { + $this->db->like('payment_type', $this->lang->line('sales_check')); + } + + if($inputs['payment_type'] == 'credit') + { + $this->db->like('payment_type', $this->lang->line('sales_credit')); + } + if($inputs['payment_type'] == 'debit') + { + $this->db->like('payment_type', $this->lang->line('sales_debit')); + } + if($inputs['payment_type'] == 'invoices') + { + $this->db->where('sale_type', SALE_TYPE_INVOICE); + } + if($inputs['sale_type'] == 'complete') { $this->db->where('sale_status', COMPLETED); @@ -171,7 +230,7 @@ class Specific_customer extends Report { $this->db->where('sale_status', COMPLETED); $this->db->where('sale_type', SALE_TYPE_RETURN); - } + } return $this->db->get()->row_array(); } From ef23596b6e659b0bceaf4ddeb7e57875444790c3 Mon Sep 17 00:00:00 2001 From: odiea Date: Wed, 14 Feb 2018 11:19:36 -0700 Subject: [PATCH 20/37] Update Reports.php --- application/controllers/Reports.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index 5f8eaf59b..1176019e8 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -890,7 +890,7 @@ class Reports extends Secure_Controller } else { - $customer_name = $customer_info->company_name; + $customer_name = $customer_info->company_name; } $data = array( From 022dfea51a93ad633ab115460ecefb021ffb0230 Mon Sep 17 00:00:00 2001 From: odiea Date: Wed, 14 Feb 2018 11:22:13 -0700 Subject: [PATCH 21/37] Update Specific_customer.php --- .../models/reports/Specific_customer.php | 56 +++---------------- 1 file changed, 8 insertions(+), 48 deletions(-) diff --git a/application/models/reports/Specific_customer.php b/application/models/reports/Specific_customer.php index 416c9dba1..57aff5ea8 100644 --- a/application/models/reports/Specific_customer.php +++ b/application/models/reports/Specific_customer.php @@ -69,35 +69,14 @@ class Specific_customer extends Report $this->db->from('sales_items_temp'); $this->db->where('customer_id', $inputs['customer_id']); - if($inputs['payment_type'] == 'cash') + if ($inputs['payment_type'] != 'all') { - $this->db->group_start(); - $this->db->like('payment_type', $this->lang->line('sales_cash')); - $this->db->group_end(); + $this->db->like('payment_type', $this->lang->line('sales_'.$inputs['payment_type'])); } - if($inputs['payment_type'] == 'due') - { - $this->db->like('payment_type', $this->lang->line('sales_due')); - } - - if($inputs['payment_type'] == 'check') - { - $this->db->like('payment_type', $this->lang->line('sales_check')); - } - - if($inputs['payment_type'] == 'credit') - { - $this->db->like('payment_type', $this->lang->line('sales_credit')); - } - if($inputs['payment_type'] == 'debit') - { - $this->db->like('payment_type', $this->lang->line('sales_debit')); - } - - if($inputs['payment_type'] == 'invoices') + elseif($inputs['payment_type'] == 'invoices') { $this->db->where('sale_type', SALE_TYPE_INVOICE); - } + } if($inputs['sale_type'] == 'complete') @@ -166,34 +145,15 @@ class Specific_customer extends Report $this->db->select('SUM(subtotal) AS subtotal, SUM(tax) AS tax, SUM(total) AS total, SUM(cost) AS cost, SUM(profit) AS profit'); $this->db->from('sales_items_temp'); $this->db->where('customer_id', $inputs['customer_id']); - if($inputs['payment_type'] == 'cash') - { - $this->db->group_start(); - $this->db->like('payment_type', $this->lang->line('sales_cash')); - $this->db->group_end(); - } - if($inputs['payment_type'] == 'due') - { - $this->db->like('payment_type', $this->lang->line('sales_due')); - } - - if($inputs['payment_type'] == 'check') - { - $this->db->like('payment_type', $this->lang->line('sales_check')); - } - if($inputs['payment_type'] == 'credit') + if ($inputs['payment_type'] != 'all') { - $this->db->like('payment_type', $this->lang->line('sales_credit')); + $this->db->like('payment_type', $this->lang->line('sales_'.$inputs['payment_type'])); } - if($inputs['payment_type'] == 'debit') - { - $this->db->like('payment_type', $this->lang->line('sales_debit')); - } - if($inputs['payment_type'] == 'invoices') + elseif($inputs['payment_type'] == 'invoices') { $this->db->where('sale_type', SALE_TYPE_INVOICE); - } + } if($inputs['sale_type'] == 'complete') { From 463dfcd1a461aa72453cec9f4337ec3bd502675a Mon Sep 17 00:00:00 2001 From: PICCORO Lenz McKAY Date: Fri, 19 Jan 2018 12:09:57 +0000 Subject: [PATCH 22/37] Translated using Weblate (Spanish) Currently translated at 100.0% (65 of 65 strings) --- application/language/es/common_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/es/common_lang.php b/application/language/es/common_lang.php index 4907aca84..7996c1e00 100644 --- a/application/language/es/common_lang.php +++ b/application/language/es/common_lang.php @@ -51,7 +51,7 @@ $lang["common_price"] = "Precio"; $lang["common_print"] = "Imprimir"; $lang["common_remove"] = "Eliminar"; $lang["common_required"] = "Requerido"; -$lang["common_restore"] = ""; +$lang["common_restore"] = "Restaurar"; $lang["common_return_policy"] = "Política de Devolución"; $lang["common_search"] = "Buscar"; $lang["common_search_options"] = "Opciones de búsqueda"; From 61e16d2d3311b723b8bef0070ce5da5af73b4ded Mon Sep 17 00:00:00 2001 From: PICCORO Lenz McKAY Date: Thu, 15 Feb 2018 22:33:24 +0000 Subject: [PATCH 23/37] Translated using Weblate (Spanish) Currently translated at 100.0% (65 of 65 strings) --- application/language/es/common_lang.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/language/es/common_lang.php b/application/language/es/common_lang.php index 7996c1e00..56a8a7801 100644 --- a/application/language/es/common_lang.php +++ b/application/language/es/common_lang.php @@ -14,34 +14,34 @@ $lang["common_det"] = "detalles"; $lang["common_download_import_template"] = "Descargar Plantilla de Importación de Excel (CSV)"; $lang["common_edit"] = "editar"; $lang["common_email"] = "Email"; -$lang["common_email_invalid_format"] = "El email no está en el formato requerido"; +$lang["common_email_invalid_format"] = "El correo-e no está en el formato requerido."; $lang["common_export_excel"] = "Reporte en Excel"; $lang["common_export_excel_no"] = "No"; $lang["common_export_excel_yes"] = "Si"; $lang["common_fields_required_message"] = "Los campos en rojo son requeridos"; $lang["common_first_name"] = "Nombre"; -$lang["common_first_name_required"] = "Nombre es un campo requerido"; +$lang["common_first_name_required"] = "Nombre es un campo requerido."; $lang["common_first_page"] = "Primera"; $lang["common_gender"] = "Género"; $lang["common_gender_female"] = "F"; $lang["common_gender_male"] = "M"; $lang["common_id"] = "Id"; $lang["common_import"] = "Importar"; -$lang["common_import_change_file"] = "Cambiar "; +$lang["common_import_change_file"] = "Cambiar"; $lang["common_import_excel"] = "Importar Excel"; $lang["common_import_full_path"] = "Se requiere la ruta completa del archivo"; $lang["common_import_remove_file"] = "Quitar"; $lang["common_import_select_file"] = "Selecciona archivo"; $lang["common_inv"] = "Inv"; $lang["common_last_name"] = "Apellidos"; -$lang["common_last_name_required"] = "Apellidos es un campo requerido"; +$lang["common_last_name_required"] = "Apellidos es un campo requerido."; $lang["common_last_page"] = "Ultima"; -$lang["common_learn_about_project"] = "para leer la información más reciente acerca del proyecto"; +$lang["common_learn_about_project"] = "para leer la información más reciente acerca del proyecto."; $lang["common_list_of"] = "Lista de"; $lang["common_logout"] = "Salir"; $lang["common_new"] = "Nuevo"; -$lang["common_no_persons_to_display"] = "No hay gente que mostrar"; -$lang["common_none_selected_text"] = "Nada Seleccionado"; +$lang["common_no_persons_to_display"] = "No hay nadie que mostrar."; +$lang["common_none_selected_text"] = "Nada Seleccionado."; $lang["common_or"] = "Ó"; $lang["common_phone_number"] = "Teléfono"; $lang["common_phone_number_required"] = "El numoero de telefono es requerido"; @@ -63,6 +63,6 @@ $lang["common_unknown"] = "Desconocido"; $lang["common_view_recent_sales"] = "Ver Ventas Recientes"; $lang["common_website"] = "sitio"; $lang["common_welcome"] = "Bienvenido(a)"; -$lang["common_welcome_message"] = "Bienvenido(a) a OSPOS. ¡Haz click en algún módulo debajo, para empezar!"; +$lang["common_welcome_message"] = "Bienvenido(a) a OSPOS. ¡Haz click en algún módulo, para empezar!"; $lang["common_you_are_using_ospos"] = "Estás usando Open Source Point Of Sale Versión"; $lang["common_zip"] = "Código Postal"; From 032276de879a65a5d6f2280ee404b275e52b53b5 Mon Sep 17 00:00:00 2001 From: PICCORO Lenz McKAY Date: Fri, 16 Feb 2018 01:06:57 +0000 Subject: [PATCH 24/37] Translated using Weblate (Spanish) Currently translated at 100.0% (43 of 43 strings) Translation: opensourcepos/expenses Translate-URL: http://*/projects/ospos/expenses/es/ --- application/language/es/expenses_lang.php | 86 +++++++++++------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/application/language/es/expenses_lang.php b/application/language/es/expenses_lang.php index 5f57bc7dc..ef80582a4 100644 --- a/application/language/es/expenses_lang.php +++ b/application/language/es/expenses_lang.php @@ -1,45 +1,45 @@ Date: Fri, 16 Feb 2018 00:49:38 +0000 Subject: [PATCH 25/37] Translated using Weblate (Spanish) Currently translated at 98.8% (254 of 257 strings) --- application/language/es/config_lang.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php index 53d38e751..728d425b2 100644 --- a/application/language/es/config_lang.php +++ b/application/language/es/config_lang.php @@ -2,7 +2,7 @@ $lang["config_address"] = "Dirección del Comercio"; $lang["config_address_required"] = "Dirección del Comercio es requerida."; -$lang["config_allow_duplicate_barcodes"] = ""; +$lang["config_allow_duplicate_barcodes"] = "Permitir código barras duplicados"; $lang["config_apostrophe"] = "apostrofe"; $lang["config_backup_button"] = "Respaldo"; $lang["config_backup_database"] = "Respaldo de Base de Datos"; @@ -26,7 +26,7 @@ $lang["config_barcode_page_width"] = "Mostrar ancho de página"; $lang["config_barcode_price"] = "Precio"; $lang["config_barcode_second_row"] = "Fila 1"; $lang["config_barcode_third_row"] = "Fila 2"; -$lang["config_barcode_tooltip"] = ""; +$lang["config_barcode_tooltip"] = "Cuidado: esta característica puede causar duplicados ser importados o creados, No lo use si no quiere códigos de barras duplicadas."; $lang["config_barcode_type"] = "Tipo de Código de Barra"; $lang["config_barcode_width"] = "Ancho (px)"; $lang["config_bottom"] = "Abajo"; @@ -88,8 +88,8 @@ $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_derive_sale_quantity"] = ""; -$lang["config_derive_sale_quantity_tooltip"] = ""; +$lang["config_derive_sale_quantity"] = "Permitir cantidad de venta derivada"; +$lang["config_derive_sale_quantity_tooltip"] = "Si se marca, se proporcionará un nuevo tipo para los artículos ordenados por cantidad extendida"; $lang["config_dinner_table"] = "Mesa"; $lang["config_dinner_table_duplicate"] = "Utilice un nombre de mesa único."; $lang["config_dinner_table_enable"] = "Activar Mesa de Restaurante"; @@ -143,7 +143,7 @@ $lang["config_jsprintsetup_required"] = "Advertencia!Esta funcionalidad desactiv $lang["config_language"] = "Idioma"; $lang["config_last_used_invoice_number"] = "Último numero de factura utilizado"; $lang["config_last_used_quote_number"] = "Último número de presupuesto utilizado"; -$lang["config_last_used_work_order_number"] = ""; +$lang["config_last_used_work_order_number"] = "Ultimo usado sin numero"; $lang["config_left"] = "Izquierda"; $lang["config_license"] = "Licencia"; $lang["config_license_configuration"] = "Anuncio de Licencia"; @@ -227,7 +227,7 @@ $lang["config_sales_invoice_format"] = "Formato de Facturas de Venta"; $lang["config_sales_quote_format"] = "Formato de presupuesto de las ventas"; $lang["config_saved_successfully"] = "Configuración guardada satisfactoriamente."; $lang["config_saved_unsuccessfully"] = "Configuración no guardada."; -$lang["config_show_office_group"] = ""; +$lang["config_show_office_group"] = "Mostrar icono oficina"; $lang["config_statistics"] = "Enviar estadísticas"; $lang["config_statistics_tooltip"] = "Envíe estadísticas para el desarrollo y mejora de funciones."; $lang["config_stock_location"] = "Ubicación de Inventario"; @@ -235,7 +235,7 @@ $lang["config_stock_location_duplicate"] = "El nombre de inventario debe ser ún $lang["config_stock_location_invalid_chars"] = "Nombre de la Ubicación de Inventario no debe contener '_'."; $lang["config_stock_location_required"] = "Número de Ubicación de Inventario es requerido."; $lang["config_suggestions_first_column"] = ""; -$lang["config_suggestions_layout"] = ""; +$lang["config_suggestions_layout"] = "Sugerencias de búsqueda"; $lang["config_suggestions_second_column"] = ""; $lang["config_suggestions_third_column"] = ""; $lang["config_table"] = "Mesa"; @@ -243,9 +243,9 @@ $lang["config_table_configuration"] = "Configuración de Mesa"; $lang["config_takings_printer"] = "Impresion de retenciones"; $lang["config_tax"] = "Impuesto"; $lang["config_tax_category"] = "Categoría impuesto"; -$lang["config_tax_category_duplicate"] = ""; -$lang["config_tax_category_invalid_chars"] = ""; -$lang["config_tax_category_required"] = ""; +$lang["config_tax_category_duplicate"] = "Categoría de impuesto ingresada ya existe."; +$lang["config_tax_category_invalid_chars"] = "Categoría de impuesto ingresada es invalida."; +$lang["config_tax_category_required"] = "Categoría de impuesto es requerida."; $lang["config_tax_category_used"] = "La categoría de impuestos no puede borrarse, esta en uso."; $lang["config_tax_configuration"] = "Configuracion Impuesto"; $lang["config_tax_decimals"] = "Decimales de impuestos"; @@ -255,5 +255,5 @@ $lang["config_thousands_separator"] = "Separador de miles"; $lang["config_timezone"] = "Zona Horaria"; $lang["config_top"] = "Arriba"; $lang["config_website"] = "Sitio Web"; -$lang["config_work_order_enable"] = ""; -$lang["config_work_order_format"] = ""; +$lang["config_work_order_enable"] = "Soporte Ordenes de Trabajo"; +$lang["config_work_order_format"] = "Formato Ordenes de trabajo"; From 54237a1fed41a329b0848acbf2a9809912b76ffa Mon Sep 17 00:00:00 2001 From: PICCORO Lenz McKAY Date: Fri, 16 Feb 2018 01:12:59 +0000 Subject: [PATCH 26/37] Translated using Weblate (Spanish) Currently translated at 91.4% (32 of 35 strings) Translation: opensourcepos/module Translate-URL: http://*/projects/ospos/module/es/ --- application/language/es/module_lang.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/language/es/module_lang.php b/application/language/es/module_lang.php index 5f26bc2d1..fe62cfd10 100644 --- a/application/language/es/module_lang.php +++ b/application/language/es/module_lang.php @@ -1,16 +1,16 @@ Date: Thu, 15 Feb 2018 22:39:33 +0000 Subject: [PATCH 27/37] Translated using Weblate (Spanish) Currently translated at 98.0% (50 of 51 strings) --- application/language/es/receivings_lang.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/application/language/es/receivings_lang.php b/application/language/es/receivings_lang.php index 8cf916f2b..965c9d2b3 100644 --- a/application/language/es/receivings_lang.php +++ b/application/language/es/receivings_lang.php @@ -1,23 +1,23 @@ Date: Fri, 16 Feb 2018 01:15:46 +0000 Subject: [PATCH 28/37] Translated using Weblate (Spanish) Currently translated at 91.8% (146 of 159 strings) --- application/language/es/sales_lang.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/language/es/sales_lang.php b/application/language/es/sales_lang.php index f060ab5e6..720d5b751 100644 --- a/application/language/es/sales_lang.php +++ b/application/language/es/sales_lang.php @@ -8,7 +8,7 @@ $lang["sales_amount_due"] = "Debe"; $lang["sales_amount_tendered"] = "Cantidad Recibida"; $lang["sales_cancel_sale"] = "Cancelar Venta"; $lang["sales_cash"] = "Efectivo"; -$lang["sales_cash_deposit"] = ""; +$lang["sales_cash_deposit"] = "Deposito Efectivo"; $lang["sales_cash_filter"] = "Efectivo"; $lang["sales_change_due"] = "Cambio"; $lang["sales_check"] = "Cheque"; @@ -19,9 +19,9 @@ $lang["sales_comments"] = "Comentarios"; $lang["sales_complete_sale"] = "Completar Venta"; $lang["sales_confirm_cancel_sale"] = "¿Seguro(a) de querer limpiar esta venta? Todos los artículos serán limpiados."; $lang["sales_confirm_delete"] = "¿Seguro(a) de querer borrar las ventas seleccionadas?"; -$lang["sales_confirm_restore"] = ""; +$lang["sales_confirm_restore"] = "Esta seguro de querer restaurar la(s) venta(s) seleccionada(s)?"; $lang["sales_credit"] = "Tarjeta de Crédito"; -$lang["sales_credit_deposit"] = ""; +$lang["sales_credit_deposit"] = "Deposito Credito"; $lang["sales_customer"] = "cliente"; $lang["sales_customer_address"] = "Direccion"; $lang["sales_customer_discount"] = "Descuento"; @@ -34,7 +34,7 @@ $lang["sales_date_range"] = "Rango de Fecha"; $lang["sales_date_required"] = "Una fecha correcta debe ser ingresada."; $lang["sales_date_type"] = "Campo de Fecha es requerido."; $lang["sales_debit"] = "Tarjeta de Débito"; -$lang["sales_delete"] = ""; +$lang["sales_delete"] = "Permitir borrar"; $lang["sales_delete_confirmation"] = "¿Seguro(a) de querer borrar esta venta? Esta acción no se puede deshacer."; $lang["sales_delete_entire_sale"] = "Borrar la venta completa"; $lang["sales_delete_successful"] = "Venta borrada correctamente."; From efd58f2281aba3ac2e4c7f1c3ef16f8dfdae40c0 Mon Sep 17 00:00:00 2001 From: PICCORO Lenz McKAY Date: Fri, 16 Feb 2018 01:20:54 +0000 Subject: [PATCH 29/37] Translated using Weblate (Spanish) Currently translated at 100.0% (159 of 159 strings) --- application/language/es/sales_lang.php | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/application/language/es/sales_lang.php b/application/language/es/sales_lang.php index 720d5b751..cc5c52d9b 100644 --- a/application/language/es/sales_lang.php +++ b/application/language/es/sales_lang.php @@ -40,7 +40,7 @@ $lang["sales_delete_entire_sale"] = "Borrar la venta completa"; $lang["sales_delete_successful"] = "Venta borrada correctamente."; $lang["sales_delete_unsuccessful"] = "Venta no borrada, fallida."; $lang["sales_description_abbrv"] = "Descrp."; -$lang["sales_discard"] = ""; +$lang["sales_discard"] = "Descartar"; $lang["sales_discard_quote"] = "Descartar"; $lang["sales_discount"] = "% Descuento"; $lang["sales_discount_included"] = "% Descuento"; @@ -62,7 +62,7 @@ $lang["sales_giftcard_number"] = "Número de Tarjeta de Regalo"; $lang["sales_group_by_category"] = "Grupo por Categoría"; $lang["sales_group_by_type"] = "Grupo por Tipo"; $lang["sales_id"] = "ID de Venta"; -$lang["sales_include_prices"] = ""; +$lang["sales_include_prices"] = "Incluir precios?"; $lang["sales_invoice"] = "Factura de venta"; $lang["sales_invoice_confirm"] = "Esta factura sera enviada a"; $lang["sales_invoice_enable"] = "Crear factura"; @@ -87,7 +87,7 @@ $lang["sales_no_filter"] = "Todos"; $lang["sales_no_items_in_cart"] = "No hay artículos en el carrito."; $lang["sales_no_sales_to_display"] = "No hay ventas que mostrar."; $lang["sales_none_selected"] = "No has seleccionado venta para borrar."; -$lang["sales_not_authorized"] = ""; +$lang["sales_not_authorized"] = "Esta accion no esta autorizada."; $lang["sales_one_or_multiple"] = "venta(s)"; $lang["sales_payment"] = "Tipo de Pago"; $lang["sales_payment_amount"] = "Cantidad"; @@ -99,10 +99,10 @@ $lang["sales_print_after_sale"] = "Imprimir recibo después de una venta"; $lang["sales_quantity"] = "Cantidad"; $lang["sales_quantity_less_than_reorder_level"] = "Advertencia. La cantidad deseada es insuficiente."; $lang["sales_quantity_less_than_zero"] = "Advertencia. La cantidad deseada es insuficiente. Puedes procesar la venta pero verifica el inventario."; -$lang["sales_quantity_of_items"] = ""; +$lang["sales_quantity_of_items"] = "Cantidad de %1 articulos"; $lang["sales_quote"] = "Cuota"; $lang["sales_quote_number"] = "Número de cuota"; -$lang["sales_quote_number_duplicate"] = ""; +$lang["sales_quote_number_duplicate"] = "Numero ofertado debe ser unico."; $lang["sales_quote_sent"] = "Cuota enviada a"; $lang["sales_quote_unsent"] = "La cuota no se pudo enviar"; $lang["sales_receipt"] = "Recibo de Venta"; @@ -123,21 +123,21 @@ $lang["sales_select_customer"] = "Seleccionar Cliente (Opcional)"; $lang["sales_send_invoice"] = "Enviar Factura"; $lang["sales_send_quote"] = "Enviar cuota"; $lang["sales_send_receipt"] = "Enviar Recibo"; -$lang["sales_send_work_order"] = ""; +$lang["sales_send_work_order"] = "Enviar Orden de Trabajo"; $lang["sales_serial"] = "Serie"; $lang["sales_show_invoice"] = "Factura"; $lang["sales_show_receipt"] = "Recibo"; $lang["sales_start_typing_customer_name"] = "Empieza a escribir el cliente..."; $lang["sales_start_typing_item_name"] = "Empieza a escribir o escanea el código de barras..."; -$lang["sales_stock"] = ""; +$lang["sales_stock"] = "Inventario"; $lang["sales_stock_location"] = "Inventario"; $lang["sales_sub_total"] = "Subtotal"; $lang["sales_successfully_deleted"] = "La Venta ha sido borrada satisfactoriamente"; -$lang["sales_successfully_restored"] = ""; +$lang["sales_successfully_restored"] = "La ha restaurado satisfactoriamente"; $lang["sales_successfully_suspended_sale"] = "La venta ha sido suspendida."; $lang["sales_successfully_updated"] = "La venta ha sido actualizada."; $lang["sales_suspend_sale"] = "Suspender Venta"; -$lang["sales_suspended_doc_id"] = ""; +$lang["sales_suspended_doc_id"] = "Documento"; $lang["sales_suspended_sale_id"] = "ID de Venta Suspendida"; $lang["sales_suspended_sales"] = "Ventas Suspendidas"; $lang["sales_table"] = "Mesa"; @@ -149,14 +149,14 @@ $lang["sales_total_tax_exclusive"] = "No incluye impuestos"; $lang["sales_transaction_failed"] = "La transacción de venta falló."; $lang["sales_unable_to_add_item"] = "No se puede agregar el artículo a la venta"; $lang["sales_unsuccessfully_deleted"] = "Ha fallado la eliminación de la Venta."; -$lang["sales_unsuccessfully_restored"] = ""; +$lang["sales_unsuccessfully_restored"] = "Restaurar Venta fallida."; $lang["sales_unsuccessfully_suspended_sale"] = "La venta ha sido suspendida satisfactoriamente."; $lang["sales_unsuccessfully_updated"] = "Ha fallado la actualización de la venta."; $lang["sales_unsuspend"] = "Retomar"; $lang["sales_unsuspend_and_delete"] = "Retomar y Borrar"; $lang["sales_update"] = "Editar"; -$lang["sales_work_order"] = ""; -$lang["sales_work_order_number"] = ""; -$lang["sales_work_order_number_duplicate"] = ""; -$lang["sales_work_order_sent"] = ""; -$lang["sales_work_order_unsent"] = ""; +$lang["sales_work_order"] = "Orden trabajo"; +$lang["sales_work_order_number"] = "Numero Orden Trabajo"; +$lang["sales_work_order_number_duplicate"] = "El numero de orden de trabajo debe ser unico."; +$lang["sales_work_order_sent"] = "ORden de trabajo enviada a"; +$lang["sales_work_order_unsent"] = "Orden de trabajo fallida al enviar a"; From abdcd31b9ef0474b8a48c582dc29a6c21f8e4d6e Mon Sep 17 00:00:00 2001 From: PICCORO Lenz McKAY Date: Fri, 16 Feb 2018 02:12:42 +0000 Subject: [PATCH 30/37] Translated using Weblate (Spanish) Currently translated at 100.0% (108 of 108 strings) --- application/language/es/reports_lang.php | 40 ++++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/application/language/es/reports_lang.php b/application/language/es/reports_lang.php index 3e048d268..de381c4ba 100644 --- a/application/language/es/reports_lang.php +++ b/application/language/es/reports_lang.php @@ -1,21 +1,21 @@ Date: Thu, 15 Feb 2018 22:39:33 +0000 Subject: [PATCH 31/37] Translated using Weblate (Spanish) Currently translated at 100.0% (51 of 51 strings) --- application/language/es/receivings_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/es/receivings_lang.php b/application/language/es/receivings_lang.php index 965c9d2b3..c64755aed 100644 --- a/application/language/es/receivings_lang.php +++ b/application/language/es/receivings_lang.php @@ -36,7 +36,7 @@ $lang["receivings_requisition"] = "Requisición"; $lang["receivings_return"] = "Devolver"; $lang["receivings_select_supplier"] = "Seleccionar Proveedor (Opcional)"; $lang["receivings_start_typing_supplier_name"] = "Empieza a escribir el nombre del proveedor..."; -$lang["receivings_stock"] = ""; +$lang["receivings_stock"] = "Inventario"; $lang["receivings_stock_destination"] = "Inventario de Destino"; $lang["receivings_stock_locaiton"] = "Ubicación de Inventario"; $lang["receivings_stock_source"] = "Inventario de Origen"; From 36fe5ded7e0bb646bdfd161093aa7fa299d118fe Mon Sep 17 00:00:00 2001 From: PICCORO Lenz McKAY Date: Fri, 16 Feb 2018 02:22:10 +0000 Subject: [PATCH 32/37] Translated using Weblate (Spanish) Currently translated at 100.0% (103 of 103 strings) --- application/language/es/items_lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/language/es/items_lang.php b/application/language/es/items_lang.php index cd573fff9..99f491a7c 100644 --- a/application/language/es/items_lang.php +++ b/application/language/es/items_lang.php @@ -3,7 +3,7 @@ $lang["items_add_minus"] = "Inventario a agregar/substraer."; $lang["items_allow_alt_desciption"] = "Permitir Descripción Alternativa"; $lang["items_allow_alt_description"] = "Permitir Descripción Alternativa"; -$lang["items_amount_entry"] = ""; +$lang["items_amount_entry"] = "Monto entrada"; $lang["items_bulk_edit"] = "Edición Múltiple"; $lang["items_buy_price_required"] = "Precio de Compra es requerido."; $lang["items_cannot_be_deleted"] = "No se pueden borrar los artículos seleccionados. Uno o más tiene(n) ventas."; @@ -18,7 +18,7 @@ $lang["items_change_image"] = "Cambiar Imagen"; $lang["items_confirm_bulk_edit"] = "¿Estás seguro(a) de querer editar los artículos seleccionados?"; $lang["items_confirm_bulk_edit_wipe_taxes"] = "Toda la información de impuesto del articulo sera cambiada."; $lang["items_confirm_delete"] = "¿Estás seguro(a) de querer borrar los artículos seleccionados?"; -$lang["items_confirm_restore"] = ""; +$lang["items_confirm_restore"] = "Esta seguro de querer restaurar lo(s) articulo(s) seleccionada(s)?"; $lang["items_cost_price"] = "Precio de Compra"; $lang["items_cost_price_number"] = "Precio de Compra debe ser número."; $lang["items_cost_price_required"] = "Precio de Compra es requerido."; @@ -94,7 +94,7 @@ $lang["items_supplier"] = "Proveedor"; $lang["items_tax_1"] = "Impuesto 1"; $lang["items_tax_2"] = "Impuesto 2"; $lang["items_tax_percent"] = "Porcentaje de Impuesto"; -$lang["items_tax_percent_number"] = ""; +$lang["items_tax_percent_number"] = "Impuesto porcentaje debe ser numerico"; $lang["items_tax_percent_required"] = "Porcentaje de Impuesto es requerido."; $lang["items_tax_percents"] = "Porcentaje de Impuesto(s)"; $lang["items_type"] = "Tipo de ítem"; From 469d3d500e4fd09104e17c6b097a3679ce5d4b46 Mon Sep 17 00:00:00 2001 From: PICCORO Lenz McKAY Date: Fri, 16 Feb 2018 02:23:01 +0000 Subject: [PATCH 33/37] Translated using Weblate (Spanish) Currently translated at 100.0% (257 of 257 strings) --- application/language/es/config_lang.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php index 728d425b2..0260865f6 100644 --- a/application/language/es/config_lang.php +++ b/application/language/es/config_lang.php @@ -234,10 +234,10 @@ $lang["config_stock_location"] = "Ubicación de Inventario"; $lang["config_stock_location_duplicate"] = "El nombre de inventario debe ser único."; $lang["config_stock_location_invalid_chars"] = "Nombre de la Ubicación de Inventario no debe contener '_'."; $lang["config_stock_location_required"] = "Número de Ubicación de Inventario es requerido."; -$lang["config_suggestions_first_column"] = ""; +$lang["config_suggestions_first_column"] = "Columna 1"; $lang["config_suggestions_layout"] = "Sugerencias de búsqueda"; -$lang["config_suggestions_second_column"] = ""; -$lang["config_suggestions_third_column"] = ""; +$lang["config_suggestions_second_column"] = "Columna 2"; +$lang["config_suggestions_third_column"] = "Columna 3"; $lang["config_table"] = "Mesa"; $lang["config_table_configuration"] = "Configuración de Mesa"; $lang["config_takings_printer"] = "Impresion de retenciones"; From 54150940ee90f7c8ba35e8f60563154c379b9362 Mon Sep 17 00:00:00 2001 From: PICCORO Lenz McKAY Date: Sat, 27 Jan 2018 03:37:45 +0000 Subject: [PATCH 34/37] Translated using Weblate (Spanish) Currently translated at 100.0% (44 of 44 strings) --- application/language/es/customers_lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/language/es/customers_lang.php b/application/language/es/customers_lang.php index 3512f03d1..0293d7cc4 100644 --- a/application/language/es/customers_lang.php +++ b/application/language/es/customers_lang.php @@ -9,7 +9,7 @@ $lang["customers_basic_information"] = "Información"; $lang["customers_cannot_be_deleted"] = "No se pudo borrar los clientes seleccionados. Uno o más de éstos tiene ventas."; $lang["customers_company_name"] = "Nombre del Comercio"; $lang["customers_confirm_delete"] = "¿Seguro(a) de que quieres borrar a los clientes seleccionados?"; -$lang["customers_confirm_restore"] = ""; +$lang["customers_confirm_restore"] = "Esta seguro de quere restaurar lo(s) empleado(s) seleccionado(s)?"; $lang["customers_customer"] = "Cliente"; $lang["customers_discount"] = "Descuento"; $lang["customers_email_duplicate"] = "La dirección de correo electrónico ya existe en la base de datos"; From cadae3eabccf2778c9e8788c853dbda56b842f9a Mon Sep 17 00:00:00 2001 From: PICCORO Lenz McKAY Date: Fri, 16 Feb 2018 04:24:19 +0000 Subject: [PATCH 35/37] Translated using Weblate (Spanish) Currently translated at 100.0% (18 of 18 strings) Translation: opensourcepos/expenses_categories Translate-URL: http://*/projects/ospos/expenses_categories/es/ --- .../language/es/expenses_categories_lang.php | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/application/language/es/expenses_categories_lang.php b/application/language/es/expenses_categories_lang.php index 54b71323c..b04f3de4e 100644 --- a/application/language/es/expenses_categories_lang.php +++ b/application/language/es/expenses_categories_lang.php @@ -1,20 +1,20 @@ Date: Fri, 16 Feb 2018 22:13:56 +0000 Subject: [PATCH 36/37] Fix indentation issue --- application/controllers/Reports.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index 1176019e8..546a84634 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -785,13 +785,13 @@ class Reports extends Secure_Controller foreach($this->Customer->get_all()->result() as $customer) { if(isset($customer->company_name)) - { - $customers[$customer->person_id] = $this->xss_clean($customer->first_name . ' ' . $customer->last_name. ' ' . ' [ '.$customer->company_name.' ] '); - } + { + $customers[$customer->person_id] = $this->xss_clean($customer->first_name . ' ' . $customer->last_name. ' ' . ' [ '.$customer->company_name.' ] '); + } else - { - $customers[$customer->person_id] = $this->xss_clean($customer->first_name . ' ' . $customer->last_name); - } + { + $customers[$customer->person_id] = $this->xss_clean($customer->first_name . ' ' . $customer->last_name); + } } $data['specific_input_data'] = $customers; $data['sale_type_options'] = $this->get_sale_type_options(); From d6000c79f7f2c26cbf5e3174fd677147e01b4279 Mon Sep 17 00:00:00 2001 From: FrancescoUK Date: Fri, 16 Feb 2018 22:45:31 +0000 Subject: [PATCH 37/37] Revert "Removed edit from Discount Report" (#1823) This reverts commit 60d77e1f61050e12133ac52a713fc7dc42189ce1. --- application/controllers/Reports.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/controllers/Reports.php b/application/controllers/Reports.php index 546a84634..777e71f4c 100644 --- a/application/controllers/Reports.php +++ b/application/controllers/Reports.php @@ -1070,7 +1070,8 @@ class Reports extends Secure_Controller 'profit' => to_currency($row['profit']), 'payment_type' => $row['payment_type'], 'comment' => $row['comment'], - + 'edit' => anchor('sales/edit/'. $row['sale_id'], '', + array('class'=>'modal-dlg print_hide', $button_key => $button_label, 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('sales_update'))) )); foreach($report_data['details'][$key] as $drow)