From 953fe6b1f2e7d95d6e55dee68a0a20e372e834cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Fri, 28 Nov 2014 15:58:23 +0100 Subject: [PATCH 01/12] CRLF fix --- htdocs/commande/card.php | 2 +- htdocs/fourn/commande/card.php | 2 +- test/phpunit/FunctionsLibTest.php | 32 +++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 79a6797245a..e31de409403 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1998,7 +1998,7 @@ if ($action == 'create' && $user->rights->commande->creer) { $rowspan ++; // Bank Account - if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled)) + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_ORDER) && ! empty($conf->banque->enabled)) { print ''; print ''; // Bank Account - if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled)) + if (! empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && ! empty($conf->banque->enabled)) { print ''; print ''; print '
'; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 3c7269c3e6f..753f91fbdda 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1544,7 +1544,7 @@ elseif (! empty($object->id)) print '
'; print '
'; diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index af5f3393672..0ace96c6719 100755 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -824,32 +824,32 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase $this->assertEquals(dol_nl2br($string, 1, 1), "a
a"); } - /** - * testDolPrice2Num - * - * @return boolean - */ - public function testDolPrice2Num() + /** + * testDolPrice2Num + * + * @return boolean + */ + public function testDolPrice2Num() { - $this->assertEquals(1000, price2num('1 000.0')); - $this->assertEquals(1000, price2num('1 000','MT')); - $this->assertEquals(1000, price2num('1 000','MU')); + $this->assertEquals(1000, price2num('1 000.0')); + $this->assertEquals(1000, price2num('1 000','MT')); + $this->assertEquals(1000, price2num('1 000','MU')); $this->assertEquals(1000.123456, price2num('1 000.123456')); // Round down - $this->assertEquals(1000.12, price2num('1 000.123452','MT')); - $this->assertEquals(1000.12345, price2num('1 000.123452','MU'),"Test MU"); + $this->assertEquals(1000.12, price2num('1 000.123452','MT')); + $this->assertEquals(1000.12345, price2num('1 000.123452','MU'),"Test MU"); - // Round up - $this->assertEquals(1000.13, price2num('1 000.125456','MT')); - $this->assertEquals(1000.12546, price2num('1 000.125456','MU'),"Test MU"); + // Round up + $this->assertEquals(1000.13, price2num('1 000.125456','MT')); + $this->assertEquals(1000.12546, price2num('1 000.125456','MU'),"Test MU"); // Text can't be converted $this->assertEquals('12.4$',price2num('12.4$')); - $this->assertEquals('12r.4$',price2num('12r.4$')); + $this->assertEquals('12r.4$',price2num('12r.4$')); - return true; + return true; } } From 732f235c067ab31b28f7a21269973878e0affe93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Fri, 28 Nov 2014 15:59:29 +0100 Subject: [PATCH 02/12] Transifex: removed forgotten oscommerce language files --- .tx/config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.tx/config b/.tx/config index d6e339462e3..765ac262de5 100644 --- a/.tx/config +++ b/.tx/config @@ -218,12 +218,6 @@ source_file = htdocs/langs/en_US/orders.lang source_lang = en_US type = MOZILLAPROPERTIES -[dolibarr.oscommerce] -file_filter = htdocs/langs//oscommerce.lang -source_file = htdocs/langs/en_US/oscommerce.lang -source_lang = en_US -type = MOZILLAPROPERTIES - [dolibarr.other] file_filter = htdocs/langs//other.lang source_file = htdocs/langs/en_US/other.lang From 92b54fd49663d6657bb05121a66c65e1bf72ddf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Fri, 28 Nov 2014 16:03:45 +0100 Subject: [PATCH 03/12] Removed deprecated oscommerce language files Note to transifex sync personnel: you may have to manually remove the file from Transifex to prevent it from coming back! --- htdocs/langs/ar_SA/oscommerce.lang | 8 -------- htdocs/langs/bg_BG/oscommerce.lang | 8 -------- htdocs/langs/bs_BA/oscommerce.lang | 8 -------- htdocs/langs/ca_ES/oscommerce.lang | 8 -------- htdocs/langs/cs_CZ/oscommerce.lang | 8 -------- htdocs/langs/da_DK/oscommerce.lang | 8 -------- htdocs/langs/de_AT/oscommerce.lang | 1 - htdocs/langs/de_DE/oscommerce.lang | 8 -------- htdocs/langs/el_GR/oscommerce.lang | 8 -------- htdocs/langs/en_US/oscommerce.lang | 8 -------- htdocs/langs/es_ES/oscommerce.lang | 8 -------- htdocs/langs/et_EE/oscommerce.lang | 8 -------- htdocs/langs/eu_ES/oscommerce.lang | 8 -------- htdocs/langs/fa_IR/oscommerce.lang | 8 -------- htdocs/langs/fi_FI/oscommerce.lang | 8 -------- htdocs/langs/fr_FR/oscommerce.lang | 8 -------- htdocs/langs/he_IL/oscommerce.lang | 8 -------- htdocs/langs/hr_HR/oscommerce.lang | 8 -------- htdocs/langs/hu_HU/oscommerce.lang | 8 -------- htdocs/langs/id_ID/oscommerce.lang | 8 -------- htdocs/langs/is_IS/oscommerce.lang | 8 -------- htdocs/langs/it_IT/oscommerce.lang | 8 -------- htdocs/langs/ja_JP/oscommerce.lang | 8 -------- htdocs/langs/ko_KR/oscommerce.lang | 8 -------- htdocs/langs/lt_LT/oscommerce.lang | 8 -------- htdocs/langs/lv_LV/oscommerce.lang | 8 -------- htdocs/langs/mk_MK/oscommerce.lang | 8 -------- htdocs/langs/nb_NO/oscommerce.lang | 8 -------- htdocs/langs/nl_BE/oscommerce.lang | 4 ---- htdocs/langs/nl_NL/oscommerce.lang | 8 -------- htdocs/langs/pl_PL/oscommerce.lang | 8 -------- htdocs/langs/pt_BR/oscommerce.lang | 8 -------- htdocs/langs/pt_PT/oscommerce.lang | 8 -------- htdocs/langs/ro_RO/oscommerce.lang | 8 -------- htdocs/langs/ru_RU/oscommerce.lang | 8 -------- htdocs/langs/sk_SK/oscommerce.lang | 8 -------- htdocs/langs/sl_SI/oscommerce.lang | 8 -------- htdocs/langs/sq_AL/oscommerce.lang | 8 -------- htdocs/langs/sv_SE/oscommerce.lang | 8 -------- htdocs/langs/th_TH/oscommerce.lang | 8 -------- htdocs/langs/tr_TR/oscommerce.lang | 8 -------- htdocs/langs/uk_UA/oscommerce.lang | 8 -------- htdocs/langs/uz_UZ/oscommerce.lang | 8 -------- htdocs/langs/vi_VN/oscommerce.lang | 8 -------- htdocs/langs/zh_CN/oscommerce.lang | 8 -------- htdocs/langs/zh_TW/oscommerce.lang | 8 -------- 46 files changed, 357 deletions(-) delete mode 100644 htdocs/langs/ar_SA/oscommerce.lang delete mode 100644 htdocs/langs/bg_BG/oscommerce.lang delete mode 100644 htdocs/langs/bs_BA/oscommerce.lang delete mode 100644 htdocs/langs/ca_ES/oscommerce.lang delete mode 100644 htdocs/langs/cs_CZ/oscommerce.lang delete mode 100644 htdocs/langs/da_DK/oscommerce.lang delete mode 100644 htdocs/langs/de_AT/oscommerce.lang delete mode 100644 htdocs/langs/de_DE/oscommerce.lang delete mode 100644 htdocs/langs/el_GR/oscommerce.lang delete mode 100644 htdocs/langs/en_US/oscommerce.lang delete mode 100644 htdocs/langs/es_ES/oscommerce.lang delete mode 100644 htdocs/langs/et_EE/oscommerce.lang delete mode 100644 htdocs/langs/eu_ES/oscommerce.lang delete mode 100644 htdocs/langs/fa_IR/oscommerce.lang delete mode 100644 htdocs/langs/fi_FI/oscommerce.lang delete mode 100644 htdocs/langs/fr_FR/oscommerce.lang delete mode 100644 htdocs/langs/he_IL/oscommerce.lang delete mode 100644 htdocs/langs/hr_HR/oscommerce.lang delete mode 100644 htdocs/langs/hu_HU/oscommerce.lang delete mode 100644 htdocs/langs/id_ID/oscommerce.lang delete mode 100644 htdocs/langs/is_IS/oscommerce.lang delete mode 100644 htdocs/langs/it_IT/oscommerce.lang delete mode 100644 htdocs/langs/ja_JP/oscommerce.lang delete mode 100644 htdocs/langs/ko_KR/oscommerce.lang delete mode 100644 htdocs/langs/lt_LT/oscommerce.lang delete mode 100644 htdocs/langs/lv_LV/oscommerce.lang delete mode 100644 htdocs/langs/mk_MK/oscommerce.lang delete mode 100644 htdocs/langs/nb_NO/oscommerce.lang delete mode 100644 htdocs/langs/nl_BE/oscommerce.lang delete mode 100644 htdocs/langs/nl_NL/oscommerce.lang delete mode 100644 htdocs/langs/pl_PL/oscommerce.lang delete mode 100644 htdocs/langs/pt_BR/oscommerce.lang delete mode 100644 htdocs/langs/pt_PT/oscommerce.lang delete mode 100644 htdocs/langs/ro_RO/oscommerce.lang delete mode 100644 htdocs/langs/ru_RU/oscommerce.lang delete mode 100644 htdocs/langs/sk_SK/oscommerce.lang delete mode 100644 htdocs/langs/sl_SI/oscommerce.lang delete mode 100644 htdocs/langs/sq_AL/oscommerce.lang delete mode 100644 htdocs/langs/sv_SE/oscommerce.lang delete mode 100644 htdocs/langs/th_TH/oscommerce.lang delete mode 100644 htdocs/langs/tr_TR/oscommerce.lang delete mode 100644 htdocs/langs/uk_UA/oscommerce.lang delete mode 100644 htdocs/langs/uz_UZ/oscommerce.lang delete mode 100644 htdocs/langs/vi_VN/oscommerce.lang delete mode 100644 htdocs/langs/zh_CN/oscommerce.lang delete mode 100644 htdocs/langs/zh_TW/oscommerce.lang diff --git a/htdocs/langs/ar_SA/oscommerce.lang b/htdocs/langs/ar_SA/oscommerce.lang deleted file mode 100644 index a6668b2519f..00000000000 --- a/htdocs/langs/ar_SA/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=نظام التشغيل والتجارة -OSCommerceSetup=نظام تشغيل وحدة التجارة الإعداد -OSCommerceSetupSaved=التجارة إعداد نظام التشغيل الموفرة -OSCommerceServer=نظام تشغيل الخادم المضيف التجارة / الملكية الفكرية -OSCommerceDatabaseName=اسم قاعدة بيانات نظام التشغيل والتجارة -OSCommercePrefix=نظام التشغيل التجاري بادئة الجداول -OSCommerceUser=قاعدة بيانات التجارة ادخل نظام التشغيل diff --git a/htdocs/langs/bg_BG/oscommerce.lang b/htdocs/langs/bg_BG/oscommerce.lang deleted file mode 100644 index f586190d21b..00000000000 --- a/htdocs/langs/bg_BG/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce модул за настройка -OSCommerceSetupSaved=OS Commerce настройка спаси -OSCommerceServer=OS Commerce хост сървъра / IP -OSCommerceDatabaseName=OS Commerce името на базата данни -OSCommercePrefix=OS Commerce таблици префикс -OSCommerceUser=OS Commerce база данни за вход diff --git a/htdocs/langs/bs_BA/oscommerce.lang b/htdocs/langs/bs_BA/oscommerce.lang deleted file mode 100644 index e7532487d48..00000000000 --- a/htdocs/langs/bs_BA/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce podešavanje modula -OSCommerceSetupSaved=OS Commerce postavke snimljene -OSCommerceServer=OS Commerce server host / IP -OSCommerceDatabaseName=OS Commerce ime baze podataka -OSCommercePrefix=OS Commerce prefiks tabela -OSCommerceUser=OS Commerce login baze podataka diff --git a/htdocs/langs/ca_ES/oscommerce.lang b/htdocs/langs/ca_ES/oscommerce.lang deleted file mode 100644 index 528d57c53d2..00000000000 --- a/htdocs/langs/ca_ES/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Configuració del mòdul OS Commerce -OSCommerceSetupSaved=Configuració OS Commerce desada -OSCommerceServer=Nom/IP servidor de la base de dades OS commerce -OSCommerceDatabaseName=Nom de la base de dades OS Commerce -OSCommercePrefix=Prefix taules OS Commerce -OSCommerceUser=Usuari de la base de dades OS Commerce diff --git a/htdocs/langs/cs_CZ/oscommerce.lang b/htdocs/langs/cs_CZ/oscommerce.lang deleted file mode 100644 index 76db4065e75..00000000000 --- a/htdocs/langs/cs_CZ/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul nastavení -OSCommerceSetupSaved=OS Commerce nastavení uloží -OSCommerceServer=OS Commerce Server host / ip -OSCommerceDatabaseName=OS Commerce název databáze -OSCommercePrefix=OS Commerce tabulky prefix -OSCommerceUser=OS Commerce databáze login diff --git a/htdocs/langs/da_DK/oscommerce.lang b/htdocs/langs/da_DK/oscommerce.lang deleted file mode 100644 index 7b83c7528c2..00000000000 --- a/htdocs/langs/da_DK/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul opsætning -OSCommerceSetupSaved=OS Commerce opsætning gemmes -OSCommerceServer=OS Commerce Server host / ip -OSCommerceDatabaseName=OS Commerce databasenavn -OSCommercePrefix=OS Commerce tabeller præfiks -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/de_AT/oscommerce.lang b/htdocs/langs/de_AT/oscommerce.lang deleted file mode 100644 index dfe6479ee16..00000000000 --- a/htdocs/langs/de_AT/oscommerce.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce diff --git a/htdocs/langs/de_DE/oscommerce.lang b/htdocs/langs/de_DE/oscommerce.lang deleted file mode 100644 index 34dd883614a..00000000000 --- a/htdocs/langs/de_DE/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OSCommerce -OSCommerceSetup=OSCommerce-Modul Einstellungen -OSCommerceSetupSaved=OSCommerce-Einstellungen gespeichert -OSCommerceServer=OSCommerce Server Host/IP -OSCommerceDatabaseName=OSCommerce Datenbankname -OSCommercePrefix=OSCommerce Tabellen-Präfix -OSCommerceUser=OSCommerce Datenbank Login diff --git a/htdocs/langs/el_GR/oscommerce.lang b/htdocs/langs/el_GR/oscommerce.lang deleted file mode 100644 index 53308cb42c9..00000000000 --- a/htdocs/langs/el_GR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce εγκατάσταση μονάδας -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/en_US/oscommerce.lang b/htdocs/langs/en_US/oscommerce.lang deleted file mode 100644 index 3ff9108ead4..00000000000 --- a/htdocs/langs/en_US/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/es_ES/oscommerce.lang b/htdocs/langs/es_ES/oscommerce.lang deleted file mode 100644 index 5c2065a0cac..00000000000 --- a/htdocs/langs/es_ES/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Configuración del módulo OS Commerce -OSCommerceSetupSaved=Configuración OS Commerce guardada -OSCommerceServer=Nombre/IP servidor de la base de datos OS commerce -OSCommerceDatabaseName=Nombre de la base de datos OS Commerce -OSCommercePrefix=Prefijo tablas OS Commerce -OSCommerceUser=Usuario de la base de datos OS Commerce diff --git a/htdocs/langs/et_EE/oscommerce.lang b/htdocs/langs/et_EE/oscommerce.lang deleted file mode 100644 index 4804395c119..00000000000 --- a/htdocs/langs/et_EE/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OSCommerce -OSCommerceSetup=OSCommerce mooduli seadistamine -OSCommerceSetupSaved=OSCommercei seadistus salvestatud -OSCommerceServer=OSCommerce serveri host/IP -OSCommerceDatabaseName=OSCommercei andmebaasi nimi -OSCommercePrefix=OSCommercei tabelite prefiks -OSCommerceUser=OSCommercei andmebaasi kasutajanimi diff --git a/htdocs/langs/eu_ES/oscommerce.lang b/htdocs/langs/eu_ES/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/eu_ES/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/fa_IR/oscommerce.lang b/htdocs/langs/fa_IR/oscommerce.lang deleted file mode 100644 index a6668b2519f..00000000000 --- a/htdocs/langs/fa_IR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=نظام التشغيل والتجارة -OSCommerceSetup=نظام تشغيل وحدة التجارة الإعداد -OSCommerceSetupSaved=التجارة إعداد نظام التشغيل الموفرة -OSCommerceServer=نظام تشغيل الخادم المضيف التجارة / الملكية الفكرية -OSCommerceDatabaseName=اسم قاعدة بيانات نظام التشغيل والتجارة -OSCommercePrefix=نظام التشغيل التجاري بادئة الجداول -OSCommerceUser=قاعدة بيانات التجارة ادخل نظام التشغيل diff --git a/htdocs/langs/fi_FI/oscommerce.lang b/htdocs/langs/fi_FI/oscommerce.lang deleted file mode 100644 index 6bc36861b5a..00000000000 --- a/htdocs/langs/fi_FI/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce moduulin asetukset -OSCommerceSetupSaved=OS Commerce asetukset tallennetaan -OSCommerceServer=OS Commerce Server isännän / ip -OSCommerceDatabaseName=OS Commerce tietokannan nimi -OSCommercePrefix=OS Commerce taulukot etuliite -OSCommerceUser=OS Commerce tietokanta sisäänkirjoittautumissivuksesi diff --git a/htdocs/langs/fr_FR/oscommerce.lang b/htdocs/langs/fr_FR/oscommerce.lang deleted file mode 100644 index 635a43cdddf..00000000000 --- a/htdocs/langs/fr_FR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Configuration du module OS Commerce -OSCommerceSetupSaved=Configuration OS Commerce sauvegardée -OSCommerceServer=Nom d'hôte / adresse IP serveur base de données OS Commerce -OSCommerceDatabaseName=Nom base de données OS Commerce -OSCommercePrefix=Préfixe tables base de données OS Commerce -OSCommerceUser=Identifiant d'accès base de données OS Commerce diff --git a/htdocs/langs/he_IL/oscommerce.lang b/htdocs/langs/he_IL/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/he_IL/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/hr_HR/oscommerce.lang b/htdocs/langs/hr_HR/oscommerce.lang deleted file mode 100644 index 99710730443..00000000000 --- a/htdocs/langs/hr_HR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce postaljanje modula -OSCommerceSetupSaved=OS Commerce postavljanje spremljeno -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce ime baze podataka -OSCommercePrefix=OS Commerce prefix tablice -OSCommerceUser=OS Commerce prijava u bazu podataka diff --git a/htdocs/langs/hu_HU/oscommerce.lang b/htdocs/langs/hu_HU/oscommerce.lang deleted file mode 100644 index 3cb5760422c..00000000000 --- a/htdocs/langs/hu_HU/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul beállítása -OSCommerceSetupSaved=OS Commerce beállítás mentése -OSCommerceServer=OS Commerce Server host / ip -OSCommerceDatabaseName=OS Commerce adatbázis neve -OSCommercePrefix=OS Commerce táblázatok előtag -OSCommerceUser=OS Commerce adatbázis bejelentkezés diff --git a/htdocs/langs/id_ID/oscommerce.lang b/htdocs/langs/id_ID/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/id_ID/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/is_IS/oscommerce.lang b/htdocs/langs/is_IS/oscommerce.lang deleted file mode 100644 index f88df6b090c..00000000000 --- a/htdocs/langs/is_IS/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce mát skipulag -OSCommerceSetupSaved=OS Commerce skipulag vistuð -OSCommerceServer=OS Commerce miðlara gestgjafi / ip -OSCommerceDatabaseName=OS Commerce gagnasafn nafn -OSCommercePrefix=OS Commerce matskeið forskeyti -OSCommerceUser=OS Commerce gagnasafn Innskráning diff --git a/htdocs/langs/it_IT/oscommerce.lang b/htdocs/langs/it_IT/oscommerce.lang deleted file mode 100644 index 7d95f16abd9..00000000000 --- a/htdocs/langs/it_IT/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Impostazioni modulo OS Commerce -OSCommerceSetupSaved=Impostazioni OS Commerce salvate -OSCommerceServer=Host/IP del server OS Commerce -OSCommerceDatabaseName=Nome database OS Commerce -OSCommercePrefix=Prefisso tabelle database OS Commerce -OSCommerceUser=Nome utente per il database di OS Commerce diff --git a/htdocs/langs/ja_JP/oscommerce.lang b/htdocs/langs/ja_JP/oscommerce.lang deleted file mode 100644 index ea408d55f39..00000000000 --- a/htdocs/langs/ja_JP/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OSコマース -OSCommerceSetup=OSコマースモジュールのセットアップ -OSCommerceSetupSaved=保存されたOSコマースのセットアップ -OSCommerceServer=OS Commerce Serverのホスト名/ IPアドレス -OSCommerceDatabaseName=OS Commerceデータベース名 -OSCommercePrefix=OSコマースのテーブルの接頭辞 -OSCommerceUser=OS Commerceデータベースへのログイン diff --git a/htdocs/langs/ko_KR/oscommerce.lang b/htdocs/langs/ko_KR/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/ko_KR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/lt_LT/oscommerce.lang b/htdocs/langs/lt_LT/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/lt_LT/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/lv_LV/oscommerce.lang b/htdocs/langs/lv_LV/oscommerce.lang deleted file mode 100644 index 3841b934eb6..00000000000 --- a/htdocs/langs/lv_LV/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce moduļa konfigurēšana -OSCommerceSetupSaved=OS Commerce uzstādīšanas konfigurācija saglabāta -OSCommerceServer=OS Commerce servera nosaukums / ip adrese -OSCommerceDatabaseName=OS Commerce datubāzes nosaukums -OSCommercePrefix=OS Commerce tabulas prefikss -OSCommerceUser=OS Commerce datu bāzes pieteikšanās vārds diff --git a/htdocs/langs/mk_MK/oscommerce.lang b/htdocs/langs/mk_MK/oscommerce.lang deleted file mode 100644 index 42a4a4551b6..00000000000 --- a/htdocs/langs/mk_MK/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -# OSCommerce=OS Commerce -# OSCommerceSetup=OS Commerce module setup -# OSCommerceSetupSaved=OS Commerce setup saved -# OSCommerceServer=OS Commerce server host/ip -# OSCommerceDatabaseName=OS Commerce database name -# OSCommercePrefix=OS Commerce tables prefix -# OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/nb_NO/oscommerce.lang b/htdocs/langs/nb_NO/oscommerce.lang deleted file mode 100644 index 49b04568b79..00000000000 --- a/htdocs/langs/nb_NO/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce moduloppsett -OSCommerceSetupSaved=OS Commerce innstillinger lagret -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce databasenavn -OSCommercePrefix=OS Commerce tabellprefix -OSCommerceUser=OS Commerce databaseinnlogging diff --git a/htdocs/langs/nl_BE/oscommerce.lang b/htdocs/langs/nl_BE/oscommerce.lang deleted file mode 100644 index 10e961b84a2..00000000000 --- a/htdocs/langs/nl_BE/oscommerce.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerceSetup=OSCommerce module setup -OSCommerceSetupSaved=OSCommerce setup opgeslagen -OSCommerceServer=OSCommerce server host / ip diff --git a/htdocs/langs/nl_NL/oscommerce.lang b/htdocs/langs/nl_NL/oscommerce.lang deleted file mode 100644 index 1f74f362df8..00000000000 --- a/htdocs/langs/nl_NL/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OSCommerce module instellen -OSCommerceSetupSaved=OSCommerce instellingen opgeslagen -OSCommerceServer=OSCommerce server host / IP -OSCommerceDatabaseName=OSCommerce databasenaam -OSCommercePrefix=OSCommerce tabellen voorvoegsel -OSCommerceUser=OSCommerce database login diff --git a/htdocs/langs/pl_PL/oscommerce.lang b/htdocs/langs/pl_PL/oscommerce.lang deleted file mode 100644 index 6cf59eb65c6..00000000000 --- a/htdocs/langs/pl_PL/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce konfiguracji modułu -OSCommerceSetupSaved=OS Commerce konfiguracji zapisywane -OSCommerceServer=OS Commerce Server host / ip -OSCommerceDatabaseName=OS Handlowa nazwa bazy danych -OSCommercePrefix=OS Commerce prefiks tabel -OSCommerceUser=OS Commerce bazy danych logowania diff --git a/htdocs/langs/pt_BR/oscommerce.lang b/htdocs/langs/pt_BR/oscommerce.lang deleted file mode 100644 index 3df1b087212..00000000000 --- a/htdocs/langs/pt_BR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Configuração do módulo OS Commerce -OSCommerceSetupSaved=Configuração OS Commerce guardada -OSCommerceServer=Nome/IP servidor da base de dados OS commerce -OSCommerceDatabaseName=Nome da base de dados OS Commerce -OSCommercePrefix=Prefixo Tabelas OS Commerce -OSCommerceUser=Usuário da base de dados OS Commerce diff --git a/htdocs/langs/pt_PT/oscommerce.lang b/htdocs/langs/pt_PT/oscommerce.lang deleted file mode 100644 index de6d4d6c866..00000000000 --- a/htdocs/langs/pt_PT/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Configuração do módulo OS Commerce -OSCommerceSetupSaved=Configuração OS Commerce guardada -OSCommerceServer=Nome/IP servidor da base de dados OS commerce -OSCommerceDatabaseName=Nome da base de dados OS Commerce -OSCommercePrefix=Prefixo Tabelas OS Commerce -OSCommerceUser=Utilizador da base de dados OS Commerce diff --git a/htdocs/langs/ro_RO/oscommerce.lang b/htdocs/langs/ro_RO/oscommerce.lang deleted file mode 100644 index ee9094a377d..00000000000 --- a/htdocs/langs/ro_RO/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul de configurare -OSCommerceSetupSaved=OS Commerce setup salvate -OSCommerceServer=Sistem de operare server gazdă Comert / IP -OSCommerceDatabaseName=OS Commerce denumirea de baze de date -OSCommercePrefix=OS Commerce tabele prefix -OSCommerceUser=OS Commerce baza de date de login diff --git a/htdocs/langs/ru_RU/oscommerce.lang b/htdocs/langs/ru_RU/oscommerce.lang deleted file mode 100644 index 8388024980c..00000000000 --- a/htdocs/langs/ru_RU/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=Настройка модуля OS Commerce -OSCommerceSetupSaved=Настройка OS Commerce сохранена -OSCommerceServer=Хост/IP сервера OS Commerce -OSCommerceDatabaseName=Имя базы данных OS Commerce -OSCommercePrefix=Префикс таблиц OS Commerce -OSCommerceUser=Имя пользователя базы данных OS Commerce diff --git a/htdocs/langs/sk_SK/oscommerce.lang b/htdocs/langs/sk_SK/oscommerce.lang deleted file mode 100644 index 4c5f8668978..00000000000 --- a/htdocs/langs/sk_SK/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul nastavenia -OSCommerceSetupSaved=OS Commerce nastavenie uloží -OSCommerceServer=OS Commerce Server host / ip -OSCommerceDatabaseName=OS Commerce názov databázy -OSCommercePrefix=OS Commerce tabuľky prefix -OSCommerceUser=OS Commerce databázy login diff --git a/htdocs/langs/sl_SI/oscommerce.lang b/htdocs/langs/sl_SI/oscommerce.lang deleted file mode 100644 index 27324e176a4..00000000000 --- a/htdocs/langs/sl_SI/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=Nakupovalni voziček -OSCommerceSetup=Nastavitev modula Nakupovalni voziček -OSCommerceSetupSaved=Shranjene nastavitve za Nakupovalni voziček -OSCommerceServer=Gostiteljski strežnik/IP za Nakupovalni voziček -OSCommerceDatabaseName=Ime baze podatkov za Nakupovalni voziček -OSCommercePrefix=Predpone tabel za Nakupovalni voziček -OSCommerceUser=Uporabniško ime za bazo podatkov za Nakupovalni voziček diff --git a/htdocs/langs/sq_AL/oscommerce.lang b/htdocs/langs/sq_AL/oscommerce.lang deleted file mode 100644 index 3ff9108ead4..00000000000 --- a/htdocs/langs/sq_AL/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/sv_SE/oscommerce.lang b/htdocs/langs/sv_SE/oscommerce.lang deleted file mode 100644 index 1e2ef91e7f2..00000000000 --- a/htdocs/langs/sv_SE/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce modul setup -OSCommerceSetupSaved=OS Commerce setup sparas -OSCommerceServer=OS Commerce Server värd / ip -OSCommerceDatabaseName=OS Commerce databasnamn -OSCommercePrefix=OS Commerce tabeller prefix -OSCommerceUser=OS Commerce databas login diff --git a/htdocs/langs/th_TH/oscommerce.lang b/htdocs/langs/th_TH/oscommerce.lang deleted file mode 100644 index 3ff9108ead4..00000000000 --- a/htdocs/langs/th_TH/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/tr_TR/oscommerce.lang b/htdocs/langs/tr_TR/oscommerce.lang deleted file mode 100644 index a4a6a26a390..00000000000 --- a/htdocs/langs/tr_TR/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Ticaret modülü kurulumu -OSCommerceSetupSaved=OS Ticaret kurulumu kaydedildi -OSCommerceServer=OS Ticaret Sunucusu host/ip -OSCommerceDatabaseName=OS Ticaret veritabanı adı -OSCommercePrefix=OS Ticaret tablo öneki -OSCommerceUser=OS Ticaret veritabanı kullanıcı girişi diff --git a/htdocs/langs/uk_UA/oscommerce.lang b/htdocs/langs/uk_UA/oscommerce.lang deleted file mode 100644 index 3ff9108ead4..00000000000 --- a/htdocs/langs/uk_UA/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/uz_UZ/oscommerce.lang b/htdocs/langs/uz_UZ/oscommerce.lang deleted file mode 100644 index 3ff9108ead4..00000000000 --- a/htdocs/langs/uz_UZ/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=OS Commerce -OSCommerceSetup=OS Commerce module setup -OSCommerceSetupSaved=OS Commerce setup saved -OSCommerceServer=OS Commerce server host/ip -OSCommerceDatabaseName=OS Commerce database name -OSCommercePrefix=OS Commerce tables prefix -OSCommerceUser=OS Commerce database login diff --git a/htdocs/langs/vi_VN/oscommerce.lang b/htdocs/langs/vi_VN/oscommerce.lang deleted file mode 100644 index 648f546555f..00000000000 --- a/htdocs/langs/vi_VN/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=Hệ điều hành thương mại -OSCommerceSetup=Thiết lập mô-đun hệ điều hành thương mại -OSCommerceSetupSaved=Thiết lập hệ điều hành thương mại lưu -OSCommerceServer=Hệ điều hành máy chủ lưu trữ thương mại / ip -OSCommerceDatabaseName=Tên cơ sở dữ liệu hệ điều hành thương mại -OSCommercePrefix=Hệ điều hành thương mại bảng tiền tố -OSCommerceUser=Đăng nhập cơ sở dữ liệu hệ điều hành thương mại diff --git a/htdocs/langs/zh_CN/oscommerce.lang b/htdocs/langs/zh_CN/oscommerce.lang deleted file mode 100644 index 58838b82038..00000000000 --- a/htdocs/langs/zh_CN/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=商务部操作系统 -OSCommerceSetup=商务部模块安装操作系统 -OSCommerceSetupSaved=商务部操作系统设置保存 -OSCommerceServer=商业服务器操作系统的主机/ IP -OSCommerceDatabaseName=操作系统商业数据库的名称 -OSCommercePrefix=操作系统商务部表前缀 -OSCommerceUser=操作系统商业数据库登录 diff --git a/htdocs/langs/zh_TW/oscommerce.lang b/htdocs/langs/zh_TW/oscommerce.lang deleted file mode 100644 index 9d6d95cddc6..00000000000 --- a/htdocs/langs/zh_TW/oscommerce.lang +++ /dev/null @@ -1,8 +0,0 @@ -# Dolibarr language file - Source file is en_US - oscommerce -OSCommerce=商務部操作系統 -OSCommerceSetup=商務部模塊安裝操作系統 -OSCommerceSetupSaved=商務部操作系統設置保存 -OSCommerceServer=商業服務器操作系統的主機/ IP -OSCommerceDatabaseName=操作系統商業數據庫的名稱 -OSCommercePrefix=操作系統商務部表前綴 -OSCommerceUser=操作系統商業數據庫登錄 From 0bd295dca70bc5b6e840214cf13acf34d2379eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Fri, 28 Nov 2014 16:05:25 +0100 Subject: [PATCH 04/12] Transifex: added missing language files to the configuration --- .tx/config | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.tx/config b/.tx/config index 765ac262de5..e4d1fc65732 100644 --- a/.tx/config +++ b/.tx/config @@ -236,6 +236,18 @@ source_file = htdocs/langs/en_US/paypal.lang source_lang = en_US type = MOZILLAPROPERTIES +[dolibarr.printipp] +file_filter = htdocs/langs//printipp.lang +source_file = htdocs/langs/en_US/printipp.lang +source_lang = en_US +type = MOZILLAPROPERTIES + +[dolibarr.productbatch] +file_filter = htdocs/langs//productbatch.lang +source_file = htdocs/langs/en_US/productbatch.lang +source_lang = en_US +type = MOZILLAPROPERTIES + [dolibarr.products] file_filter = htdocs/langs//products.lang source_file = htdocs/langs/en_US/products.lang @@ -313,4 +325,3 @@ file_filter = htdocs/langs//workflow.lang source_file = htdocs/langs/en_US/workflow.lang source_lang = en_US type = MOZILLAPROPERTIES - From 10456f90d963995dee4f6590b25902c72ff5747d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Fri, 28 Nov 2014 16:06:45 +0100 Subject: [PATCH 05/12] Language files should not be executable --- htdocs/langs/en_US/resource.lang | 0 htdocs/langs/fr_FR/resource.lang | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 htdocs/langs/en_US/resource.lang mode change 100755 => 100644 htdocs/langs/fr_FR/resource.lang diff --git a/htdocs/langs/en_US/resource.lang b/htdocs/langs/en_US/resource.lang old mode 100755 new mode 100644 diff --git a/htdocs/langs/fr_FR/resource.lang b/htdocs/langs/fr_FR/resource.lang old mode 100755 new mode 100644 From 58621e7e13093dae4a451a8fda79aeea358bbeff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 30 Nov 2014 15:56:57 +0100 Subject: [PATCH 06/12] Update boxes.php --- htdocs/admin/boxes.php | 203 +++++++++++++++++++++-------------------- 1 file changed, 106 insertions(+), 97 deletions(-) diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index c12e913e9c1..7c9c8aa2ef1 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -51,88 +51,90 @@ if ($action == 'addconst') dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity); } -if ($action == 'add') -{ +if ($action == 'add') { $error=0; - $db->begin(); + if (isset($_POST['boxid']) && is_array($_POST['boxid'])) { + foreach($_POST['boxid'] as $boxid) { + if ($boxid['active']=='on') { + $pos = $boxid['pos']; - // Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos") - $distinctfkuser=array(); - if (! $error) - { - $sql = "SELECT fk_user"; - $sql.= " FROM ".MAIN_DB_PREFIX."user_param"; - $sql.= " WHERE param = 'MAIN_BOXES_".$db->escape(GETPOST("pos","alpha"))."' AND value = '1'"; - $sql.= " AND entity = ".$conf->entity; + // Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos") + $distinctfkuser=array(); + if (! $error) + { + $sql = "SELECT fk_user"; + $sql.= " FROM ".MAIN_DB_PREFIX."user_param"; + $sql.= " WHERE param = 'MAIN_BOXES_".$db->escape($pos)."' AND value = '1'"; + $sql.= " AND entity = ".$conf->entity; + dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i=0; + while ($i < $num) + { + $obj=$db->fetch_object($resql); + $distinctfkuser[$obj->fk_user]=$obj->fk_user; + $i++; + } + } + else + { + setEventMessage($db->lasterror(), 'errors'); + $error++; + } + } - dol_syslog("boxes.php search fk_user to activate box for", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i=0; - while ($i < $num) - { - $obj=$db->fetch_object($resql); - $distinctfkuser[$obj->fk_user]=$obj->fk_user; - $i++; - } - } - else - { - setEventMessage($db->lasterror(), 'errors'); - $error++; - } - } + $distinctfkuser['0']='0'; // Add entry for fk_user = 0. We must use string as key and val - $distinctfkuser['0']='0'; // Add entry for fk_user = 0. We must use string as key and val + foreach($distinctfkuser as $fk_user) + { + if (! $error && $fk_user != '') + { + $nbboxonleft=$nbboxonright=0; + $sql = "SELECT box_order FROM ".MAIN_DB_PREFIX."boxes WHERE position = ".$pos." AND fk_user = ".$fk_user." AND entity = ".$conf->entity; + dol_syslog("boxes.php activate box", LOG_DEBUG); + $resql = $db->query($sql); + if ($resql) + { + while($obj = $db->fetch_object($resql)) + { + $boxorder=$obj->box_order; + if (preg_match('/A/',$boxorder)) $nbboxonleft++; + if (preg_match('/B/',$boxorder)) $nbboxonright++; + } + } + else dol_print_error($db); - foreach($distinctfkuser as $fk_user) - { - if (! $error && $fk_user != '') - { - $nbboxonleft=$nbboxonright=0; - $sql = "SELECT box_order FROM ".MAIN_DB_PREFIX."boxes WHERE position = ".GETPOST("pos","alpha")." AND fk_user = ".$fk_user." AND entity = ".$conf->entity; - dol_syslog("boxes.php activate box", LOG_DEBUG); - $resql = $db->query($sql); - if ($resql) - { - while($obj = $db->fetch_object($resql)) - { - $boxorder=$obj->box_order; - if (preg_match('/A/',$boxorder)) $nbboxonleft++; - if (preg_match('/B/',$boxorder)) $nbboxonright++; - } - } - else dol_print_error($db); + $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes ("; + $sql.= "box_id, position, box_order, fk_user, entity"; + $sql.= ") values ("; + $sql.= $boxid['value'].", ".$pos.", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity; + $sql.= ")"; - $sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes ("; - $sql.= "box_id, position, box_order, fk_user, entity"; - $sql.= ") values ("; - $sql.= GETPOST("boxid","int").", ".GETPOST("pos","alpha").", '".(($nbboxonleft > $nbboxonright) ? 'B01' : 'A01')."', ".$fk_user.", ".$conf->entity; - $sql.= ")"; - - dol_syslog("boxes.php activate box", LOG_DEBUG); - $resql = $db->query($sql); - if (! $resql) - { - setEventMessage($db->lasterror(), 'errors'); - $error++; - } - } - } - - if (! $error) - { - header("Location: boxes.php"); - $db->commit(); - exit; - } - else - { - $db->rollback(); - } + dol_syslog("boxes.php activate box", LOG_DEBUG); + $resql = $db->query($sql); + if (! $resql) + { + setEventMessage($db->lasterror(), 'errors'); + $error++; + } + } + } + } + } + } + if (! $error) + { + $db->commit(); + $action=''; + } + else + { + $db->rollback(); + } } if ($action == 'delete') @@ -317,14 +319,18 @@ if ($resql) $boxtoadd=InfoBox::listBoxes($db,'available',-1,null,$actives); print "
\n"; +print "\n\n".''."\n"; print_titre($langs->trans("BoxesAvailable")); -print ''; +print ''."\n"; +print ''."\n"; +print ''."\n"; +print '
'."\n"; print ''; print ''; print ''; print ''; -print ''; +print ''; print "\n"; $var=true; foreach($boxtoadd as $box) @@ -341,12 +347,10 @@ foreach($boxtoadd as $box) } print "\n".''."\n"; - print ''; - print ''; - print ''; + print ''."\n"; print ''; + print ''."\n"; print ''; - print ''; + print ''."\n"; + print ''."\n"; // Pour chaque position possible, on affiche un lien d'activation si boite non deja active pour cette position - print ''; - print ''; - print ''; + print ''."\n"; } -print '
'.$langs->trans("Box").''.$langs->trans("Note").'/'.$langs->trans("Parameters").''.$langs->trans("SourceFile").''.$langs->trans("ActivateOn").''.$langs->trans("ActivateOn").'
'.img_object("",$logo).' '.$langs->transnoentitiesnoconv($box->boxlabel); if (! empty($box->class) && preg_match('/graph_/',$box->class)) print ' ('.$langs->trans("Graph").')'; - print ''; if ($box->note == '(WarningUsingThisBoxSlowDown)') { @@ -354,22 +358,25 @@ foreach($boxtoadd as $box) print $langs->trans("WarningUsingThisBoxSlowDown"); } else print ($box->note?$box->note:' '); - print '' . $box->sourcefile . '' . $box->sourcefile . ''; - print $form->selectarray("pos",$pos_name,0,0,0,0,'',1); - print ''; - print ''; - print ' '; + print ''; + print $form->selectarray("boxid[".$box->box_id."][pos]",$pos_name,0,0,0,0,'',1)."\n"; + print ''."\n"; + print ''."\n"; print '
'; +print '
'."\n"; +print '
'; +print ''; +print '
'."\n"; +print ''; +print "\n".''."\n"; // Activated boxes @@ -421,8 +428,8 @@ foreach($boxactivated as $key => $box) $hasprevious=($key != 0); print '		'.($key+1).''; - print ($hasnext?''.img_down().' ':''); - print ($hasprevious?''.img_up().'':''); + print ($hasnext?''.img_down().' ':''); + print ($hasprevious?''.img_up().'':''); print ''; print ''.img_delete().''; @@ -436,13 +443,14 @@ print '

'; // Other parameters +print "\n\n".''."\n"; print_titre($langs->trans("Other")); -print ''; - -$var=false; print ''; print ''; print ''; +print '
'; + +$var=false; print ''; print ''; print ''; @@ -459,9 +467,10 @@ print ''."\n"; print ''; -print ''; print '
'.$langs->trans("Parameter").''.$langs->trans("Value").''; print ''; print '
'; +print ''; +print "\n".''."\n"; llxFooter(); From 2ddc3cb3f077cef3ad5382ba55fe852f577e1d49 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Dec 2014 12:43:14 +0100 Subject: [PATCH 07/12] Fix: Using a select with checkbox will not be compatible when we will add feature to put box on other pages. --- htdocs/admin/boxes.php | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php index 7c9c8aa2ef1..e0a4bc85f0e 100644 --- a/htdocs/admin/boxes.php +++ b/htdocs/admin/boxes.php @@ -46,17 +46,20 @@ $boxes = array(); */ if ($action == 'addconst') - { dolibarr_set_const($db, "MAIN_BOXES_MAXLINES",$_POST["MAIN_BOXES_MAXLINES"],'',0,'',$conf->entity); } -if ($action == 'add') { +if ($action == 'add') +{ $error=0; $db->begin(); - if (isset($_POST['boxid']) && is_array($_POST['boxid'])) { - foreach($_POST['boxid'] as $boxid) { - if ($boxid['active']=='on') { + if (isset($_POST['boxid']) && is_array($_POST['boxid'])) + { + foreach($_POST['boxid'] as $boxid) + { + if (is_numeric($boxid['pos']) && $boxid['pos'] >= 0) // 0=Home, 1=... + { $pos = $boxid['pos']; // Initialize distinct fkuser with all already existing values of fk_user (user that use a personalized view of boxes for page "pos") @@ -330,7 +333,7 @@ print ''; print ''.$langs->trans("Box").''; print ''.$langs->trans("Note").'/'.$langs->trans("Parameters").''; print ''.$langs->trans("SourceFile").''; -print ''.$langs->trans("ActivateOn").''; +print ''.$langs->trans("ActivateOn").''; print "\n"; $var=true; foreach($boxtoadd as $box) @@ -363,17 +366,17 @@ foreach($boxtoadd as $box) // Pour chaque position possible, on affiche un lien d'activation si boite non deja active pour cette position print ''; - print $form->selectarray("boxid[".$box->box_id."][pos]",$pos_name,0,0,0,0,'',1)."\n"; + print $form->selectarray("boxid[".$box->box_id."][pos]", $pos_name, 0, 1, 0, 0, '', 1)."\n"; print ''."\n"; - print ''."\n"; + //print ''."\n"; print ''; print ''."\n"; } print ''."\n"; -print '
'; -print ''; +print '
'; +print ''; print '
'."\n"; print ''; print "\n".''."\n"; From 79314b7ff8c23b24a9ea5607975f6ff173f2b900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 30 Nov 2014 13:28:09 +0100 Subject: [PATCH 08/12] Fix missing space --- htdocs/admin/const.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index 48e637fb8a3..a64e3856dbc 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -260,7 +260,7 @@ if ($result) // Note print ''; - print ''; + print ''; print ''; // Entity limit to superadmin From c844e35fa1536b1bed55d3d56848b842d9a9580c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Dec 2014 01:26:19 +0100 Subject: [PATCH 09/12] Fix: Option CASHDESK_SHOW_KEYPAD was not working --- htdocs/cashdesk/include/keypad.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/cashdesk/include/keypad.php b/htdocs/cashdesk/include/keypad.php index 798c30c92fb..7560180396a 100644 --- a/htdocs/cashdesk/include/keypad.php +++ b/htdocs/cashdesk/include/keypad.php @@ -16,7 +16,7 @@ */ /** - * Return a string to outptu a keypad + * Return a string to output a keypad * * @param string $keypadname Key pad name * @param string $formname Form name @@ -24,6 +24,8 @@ */ function genkeypad($keypadname, $formname) { + global $conf; + if (empty($conf->global->CASHDESK_SHOW_KEYPAD)) return ''; // défine the font size of button From 3de0702f2bfd531481970543687e23c42773c95c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Dec 2014 01:29:01 +0100 Subject: [PATCH 10/12] Fixed: All sql requests are now logged --- htdocs/accountancy/customer/index.php | 35 ++++++++++++--------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php index cb40b7b361b..663e763a9d3 100644 --- a/htdocs/accountancy/customer/index.php +++ b/htdocs/accountancy/customer/index.php @@ -2,7 +2,7 @@ /* Copyright (C) 2013 Olivier Geffroy * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2013-2014 Alexandre Spangaro - * Copyright (C) 2014 Juanjo Menent + * Copyright (C) 2014 Juanjo Menent * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ */ require '../../main.inc.php'; - + // Class require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php'; @@ -43,7 +43,7 @@ if ($user->societe_id > 0) accessforbidden(); if (! $user->rights->accounting->ventilation->read) accessforbidden(); - + // Filter $year = $_GET["year"]; if ($year == 0) { @@ -57,10 +57,10 @@ if ($year == 0) { // Validate History $action = GETPOST('action'); if ($action == 'validatehistory') { - + $error = 0; $db->begin(); - + if ($db->type == 'pgsql') { $sql1 = "UPDATE " . MAIN_DB_PREFIX . "facturedet as fd"; $sql1 .= " SET fd.fk_code_ventilation = accnt.rowid"; @@ -75,8 +75,7 @@ if ($action == 'validatehistory') { $sql1 .= " AND accnt.active = 1 AND p.accountancy_code_sell=accnt.account_number"; $sql1 .= " AND fd.fk_code_ventilation = 0"; } - - dol_syslog("/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG); + $resql1 = $db->query($sql1); if (! $resql1) { $error ++; @@ -106,7 +105,6 @@ $sql .= " , " . MAIN_DB_PREFIX . "facture as f"; $sql .= " WHERE fd.fk_code_ventilation = 0"; $sql .= " AND f.rowid = fd.fk_facture AND f.fk_statut = 1;"; -dol_syslog("/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG); $result = $db->query($sql); if ($result) { $row = $db->fetch_row($result); @@ -162,15 +160,14 @@ if (! empty($conf->multicompany->enabled)) { $sql .= " GROUP BY fd.fk_code_ventilation"; -dol_syslog("/accountancy/customer/index.php sql=" . $sql, LOG_DEBUG); $resql = $db->query($sql); if ($resql) { $i = 0; $num = $db->num_rows($resql); - + while ( $i < $num ) { $row = $db->fetch_row($resql); - + print '' . length_accountg($row[0]) . ''; print '' . $row[1] . ''; print '' . price($row[2]) . ''; @@ -235,15 +232,14 @@ if (! empty($conf->multicompany->enabled)) { $sql .= " AND f.entity = '" . $conf->entity . "'"; } -dol_syslog('accountancy/customer/index.php:: $sql=' . $sql); $resql = $db->query($sql); if ($resql) { $i = 0; $num = $db->num_rows($resql); - + while ( $i < $num ) { $row = $db->fetch_row($resql); - + print '' . $row[0] . ''; print '' . price($row[1]) . ''; print '' . price($row[2]) . ''; @@ -284,7 +280,7 @@ if (! empty($conf->margin->enabled)) { print '' . $langs->trans("NovemberMin") . ''; print '' . $langs->trans("DecemberMin") . ''; print '' . $langs->trans("Total") . ''; - + $sql = "SELECT '" . $langs->trans("Vide") . "' AS 'Marge',"; $sql .= " ROUND(SUM(IF(MONTH(f.datef)=1,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Janvier',"; $sql .= " ROUND(SUM(IF(MONTH(f.datef)=2,(fd.total_ht-(fd.qty * fd.buy_price_ht)),0)),2) AS 'Fevrier',"; @@ -303,20 +299,19 @@ if (! empty($conf->margin->enabled)) { $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = fd.fk_facture"; $sql .= " WHERE f.datef >= '" . $db->idate(dol_get_first_day($y, 1, false)) . "'"; $sql .= " AND f.datef <= '" . $db->idate(dol_get_last_day($y, 12, false)) . "'"; - + if (! empty($conf->multicompany->enabled)) { $sql .= " AND f.entity = '" . $conf->entity . "'"; } - - dol_syslog('accountancy/customer/index.php:: $sql=' . $sql); + $resql = $db->query($sql); if ($resql) { $i = 0; $num = $db->num_rows($resql); - + while ( $i < $num ) { $row = $db->fetch_row($resql); - + print '' . $row[0] . ''; print '' . price($row[1]) . ''; print '' . price($row[2]) . ''; From b5d74372de4b10223b85d23837147b6357207efa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Dec 2014 01:36:53 +0100 Subject: [PATCH 11/12] Bad var --- htdocs/admin/mailman.php | 3 ++- htdocs/admin/spip.php | 3 ++- htdocs/barcode/printsheet.php | 4 ++-- htdocs/core/class/commonobject.class.php | 4 ++-- htdocs/product/class/product.class.php | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php index f4d2010ca74..3e4a2c14a98 100644 --- a/htdocs/admin/mailman.php +++ b/htdocs/admin/mailman.php @@ -158,7 +158,8 @@ $head = mailmanspip_admin_prepare_head(); dol_fiche_head($head, 'mailman', $langs->trans("Setup"), 0, 'user'); -$var=!$var; +$var=true; + if (! empty($conf->global->ADHERENT_USE_MAILMAN)) { //$lien=img_picto($langs->trans("Active"),'tick').' '; diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php index af46c074bb9..9c81338562e 100644 --- a/htdocs/admin/spip.php +++ b/htdocs/admin/spip.php @@ -117,10 +117,11 @@ $head = mailmanspip_admin_prepare_head(); dol_fiche_head($head, 'spip', $langs->trans("Setup"), 0, 'user'); +$var=true; + /* * Spip */ -$var=!$var; if (! empty($conf->global->ADHERENT_USE_SPIP)) { //$lien=img_picto($langs->trans("Active"),'tick').' '; diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php index d862cb5da8f..0ce692674b1 100644 --- a/htdocs/barcode/printsheet.php +++ b/htdocs/barcode/printsheet.php @@ -121,8 +121,8 @@ if ($action == 'builddoc') if (! $error) { $code=$forbarcode; - $generator=$stdobject->barcode_type_coder; - $encoding=strtoupper($stdobject->barcode_type_code); + $generator=$stdobject->barcode_type_coder; // coder (loaded by fetch_barcode). Engine. + $encoding=strtoupper($stdobject->barcode_type_code); // code (loaded by fetch_barcode). Example 'ean', 'isbn', ... $barcodeimage=$conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png'; $diroutput=$conf->barcode->dir_temp; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1b0438bdea1..1a9195e069d 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -633,7 +633,7 @@ abstract class CommonObject /** * Load data for barcode into properties ->barcode_type* - * Properties ->barcode_type that is id of barcode type is used to find other properties, but + * Properties ->barcode_type that is id of barcode. Type is used to find other properties, but * if it is not defined, ->element must be defined to know default barcode type. * * @return int <0 if KO, 0 if can't guess type of barcode (ISBN, EAN13...), >0 if OK (all barcode properties loaded) @@ -3029,7 +3029,7 @@ abstract class CommonObject });'; if (!empty($hidemargininfos)) print ''; } - + print ''; print ''; print ''; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index e2898943509..390f250f5d9 100644 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -124,9 +124,9 @@ class Product extends CommonObject //! barcode var $barcode; // value var $barcode_type; // id - var $barcode_type_code; // code (loaded by fetch_barcode). Example ean, isbn... + var $barcode_type_code; // code (loaded by fetch_barcode). Example 'ean', 'isbn', ... var $barcode_type_label; // label (loaded by fetch_barcode) - var $barcode_type_coder; // coder (loaded by fetch_barcode) + var $barcode_type_coder; // coder (loaded by fetch_barcode). Engine. var $stats_propale=array(); var $stats_commande=array(); From 0bc9ae25f0a9f7845d76ffc4d3aa0b93d4bbe124 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 4 Dec 2014 01:42:23 +0100 Subject: [PATCH 12/12] Fix: Var not defined --- htdocs/bookmarks/card.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php index 5e47dfceae4..6bb6367171a 100644 --- a/htdocs/bookmarks/card.php +++ b/htdocs/bookmarks/card.php @@ -44,6 +44,8 @@ $userid=GETPOST("userid","int"); $position=GETPOST("position","int"); $backtopage=GETPOST('backtopage','alpha'); +$bookmark=new Bookmark($db); + /* * Actions @@ -60,7 +62,6 @@ if ($action == 'add' || $action == 'addproduct' || $action == 'update') exit; } - $bookmark=new Bookmark($db); if ($action == 'update') $bookmark->fetch($_POST["id"]); $bookmark->fk_user=$userid; $bookmark->title=$title; @@ -120,6 +121,17 @@ llxHeader(); $form=new Form($db); +$head = array(); +$h=1; + +$head[$h][0] = $_SERVER["PHP_SELF"].($bookmark->id?'id='.$bookmark->id:''); +$head[$h][1] = $langs->trans("Card"); +$head[$h][2] = 'card'; +$h++; + +$hselected='card'; + + if ($action == 'create') { /* @@ -172,7 +184,6 @@ if ($id > 0 && ! preg_match('/^add/i',$action)) /* * Fact bookmark mode or visually edition */ - $bookmark=new Bookmark($db); $bookmark->fetch($id);
'.$langs->trans('Margins').'