From 3bb4de3e86635b2a38862801f010b7a6accc1354 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 15:56:00 +0100 Subject: [PATCH 1/9] Better translation --- htdocs/langs/en_US/companies.lang | 6 +++--- htdocs/langs/fr_FR/companies.lang | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index cdf9c3e5770..ef28786809c 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -361,10 +361,10 @@ ExportCardToFormat=Export card to format ContactNotLinkedToCompany=Contact not linked to any third party DolibarrLogin=Dolibarr login NoDolibarrAccess=No Dolibarr access -ExportDataset_company_1=Third parties (Companies/foundations) and properties +ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties ExportDataset_company_2=Contacts and properties -ImportDataset_company_1=Third parties (Companies/foundations) and properties -ImportDataset_company_2=Contacts (of thirdparties or not) and attributes +ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes ImportDataset_company_3=Bank details PriceLevel=Price level DeliveriesAddress=Delivery addresses diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index a25784951d2..24f5127dc1d 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -361,10 +361,10 @@ ExportCardToFormat=Exporter fiche au format ContactNotLinkedToCompany=Contact non lié à un tiers DolibarrLogin=Identifiant utilisateur NoDolibarrAccess=Pas d'accès utilisateur -ExportDataset_company_1=Tiers (sociétés/institutions) et attributs +ExportDataset_company_1=Tiers (sociétés/institutions/particuliers) et attributs ExportDataset_company_2=Contacts (de tiers) et attributs -ImportDataset_company_1=Tiers (sociétés/institutions) et attributs -ImportDataset_company_2=Contacts (de tiers ou libre) et attributs +ImportDataset_company_1=Tiers (sociétés/institutions/particuliers) et attributs +ImportDataset_company_2=Contacts/Adresses (de tiers ou libre) et attributs ImportDataset_company_3=Coordonnées bancaires PriceLevel=Niveau de prix DeliveriesAddress=Adresse(s) de livraison From 94bf105b1308158dc9d8d175d948618a967b08e9 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Wed, 25 Dec 2013 15:02:21 +0100 Subject: [PATCH 2/9] Update llx_projet_task.sql new field "ref" present on update sql but not on the table --- htdocs/install/mysql/tables/llx_projet_task.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql index 0c91a86b1a8..1b73cc71781 100644 --- a/htdocs/install/mysql/tables/llx_projet_task.sql +++ b/htdocs/install/mysql/tables/llx_projet_task.sql @@ -20,6 +20,7 @@ create table llx_projet_task ( rowid integer AUTO_INCREMENT PRIMARY KEY, + ref varchar(50), fk_projet integer NOT NULL, fk_task_parent integer DEFAULT 0 NOT NULL, datec datetime, -- date creation From da2f35e1a26f987ef83c3aee061cd3644f6099c0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 17:43:52 +0100 Subject: [PATCH 3/9] Fix: Missing translation. Fix: Title of tab not visible --- htdocs/langs/en_US/admin.lang | 3 +++ htdocs/langs/fr_FR/admin.lang | 3 +++ htdocs/theme/auguria/style.css.php | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index ee1247b72d1..c78fb76281f 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1116,6 +1116,9 @@ WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none ##### Contracts ##### ContractsSetup=Contracts module setup ContractsNumberingModules=Contracts numbering modules +TemplatePDFContracts=Contracts documents models +FreeLegalTextOnContracts=Free text on contracts +WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) ##### Members ##### MembersSetup=Members module setup MemberMainOptions=Main options diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index e4f8da3799f..58805dffb1d 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1158,6 +1158,9 @@ WatermarkOnDraftInterventionCards=Filigrane sur les brouillons des fiches d'inte ##### Contracts ##### ContractsSetup=Configuration du module contrats ContractsNumberingModules=Modèles de numérotation des contrats +TemplatePDFContracts=Modèles de document des contrats +FreeLegalTextOnContracts=Mention complémentaire sur les contrats +WatermarkOnDraftContractCards=Filigrane sur les brouillons de contrats (aucun si vide) ##### Members ##### MembersSetup=Configuration du module Adhérents MemberMainOptions=Options principales diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 7942eb87bb9..34b90b7ea35 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -1040,7 +1040,7 @@ div.tabsAction { a.tabTitle { background: ; - color: white; + color: #888; font-family: ; font-weight: normal; padding: 0px 6px; From 538e6c5dc2c569046727a6754b5045d7e1630310 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 17:51:36 +0100 Subject: [PATCH 4/9] Fix: Alignement of element into block login --- htdocs/theme/auguria/style.css.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 34b90b7ea35..50034da4f6a 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -593,7 +593,7 @@ div.login a:hover { .login_block_elem { float: right; vertical-align: top; - padding: 0px 0px 0px 4px !important; + padding: 8px 0px 0px 4px !important; } .alogin, .alogin:hover { @@ -606,8 +606,7 @@ div.login a:hover { } img.login, img.printer, img.entity { - padding: dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px; - margin: 0px 0px 0px 8px; + padding: 0px 0px 0px 0px; text-decoration: none; color: white; font-weight: bold; From d07c767f25ca1882a478566269acbe891e0f2e3f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 17:55:24 +0100 Subject: [PATCH 5/9] Fix: Alignement of element into block login --- htdocs/theme/bureau2crea/style.css.php | 4 ++-- htdocs/theme/cameleo/style.css.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 672403fdb1f..4743e26ee8a 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -627,7 +627,7 @@ div.login a:hover { .login_block_elem { float: right; vertical-align: top; - padding: 0px 0px 0px 4px !important; + padding: 8px 0px 0px 4px !important; } .alogin, .alogin:hover { @@ -640,7 +640,7 @@ div.login a:hover { } img.login, img.printer, img.entity { - padding: dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px; + padding: 0px 0px 0px 0px; margin: 0px 0px 0px 8px; text-decoration: none; color: white; diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index ef10a847d9a..d739c71f93c 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -697,7 +697,7 @@ div.login a:hover { .login_block_elem { float: right; vertical-align: top; - padding: 0px 0px 0px 4px !important; + padding: 8px 0px 0px 4px !important; } .alogin, .alogin:hover { @@ -710,8 +710,8 @@ div.login a:hover { } img.login, img.printer, img.entity { - padding: dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px; - margin: 0px 0px 0px 8px; + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 4px; text-decoration: none; color: white; font-weight: bold; From 8207b7c2437380b75dc06a6441a3a99c49eb08dd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 20:27:17 +0100 Subject: [PATCH 6/9] Missing translation --- htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/fr_FR/admin.lang | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index c78fb76281f..7ad649c736a 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1011,6 +1011,7 @@ AddRefInList=Display customer/supplier ref into list (select list or combobox) a FieldEdition=Edition of field %s FixTZ=TimeZone fix FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) +MemcachedModuleAvailableButNotSetup=Memcached accelerator module enabled but setup not complete ##### Module password generation PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 58805dffb1d..f07f37580fb 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1053,6 +1053,7 @@ AddRefInList=Afficher le code client/fournisseur dans les liste (déroulante ou FieldEdition=Édition du champ %s FixTZ=Correction du Timezone FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export) +MemcachedModuleAvailableButNotSetup=Module d'accélération memcached activé mais non configuré. ##### Module password generation PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorithme interne de Dolibarr : 8 caractères, chiffres et caractères en minuscules mélangés. PasswordGenerationNone=Ne propose pas de mots de passe générés. Le mot de passe est à saisir manuellement. From 29ae579298f0ea1f3caff17b1244ec9658140f1f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 20:29:30 +0100 Subject: [PATCH 7/9] Fix: Bad link --- htdocs/admin/system/perf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php index de33508fba8..ce74d128a7a 100644 --- a/htdocs/admin/system/perf.php +++ b/htdocs/admin/system/perf.php @@ -89,7 +89,7 @@ $test1=function_exists('xcache_info'); if ($test1) { print img_picto('','tick.png').' '.$langs->trans("XCacheInstalled"); - print ' '.$langs->trans("MoreInformation").' Xcache admin page'; + print ' '.$langs->trans("MoreInformation").' Xcache admin page'; } else { From 8248f6382695079cefeec2d0a3a9221a45fd3e5b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 20:31:57 +0100 Subject: [PATCH 8/9] Fix: Missing translation --- htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/fr_FR/admin.lang | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 7ad649c736a..6d55c841051 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1012,6 +1012,7 @@ FieldEdition=Edition of field %s FixTZ=TimeZone fix FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) MemcachedModuleAvailableButNotSetup=Memcached accelerator module enabled but setup not complete +MemcachedAvailableAndSetup=Memcached accelerator module enabled and setup complete ##### Module password generation PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index f07f37580fb..e5fe0126f4a 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1053,7 +1053,8 @@ AddRefInList=Afficher le code client/fournisseur dans les liste (déroulante ou FieldEdition=Édition du champ %s FixTZ=Correction du Timezone FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export) -MemcachedModuleAvailableButNotSetup=Module d'accélération memcached activé mais non configuré. +MemcachedModuleAvailableButNotSetup=Module d'accélération Memcached activé mais non configuré. +MemcachedAvailableAndSetup=Module d'accélération Memcached activé et configuré. ##### Module password generation PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorithme interne de Dolibarr : 8 caractères, chiffres et caractères en minuscules mélangés. PasswordGenerationNone=Ne propose pas de mots de passe générés. Le mot de passe est à saisir manuellement. From 3e39cd279daef5bdf5e387f5b4248bb1b54b95be Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Dec 2013 00:42:53 +0100 Subject: [PATCH 9/9] Fix: avoid to include not desired directory --- build/exe/doliwamp/doliwamp.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index 98bfeee9109..61ece7a1a20 100644 --- a/build/exe/doliwamp/doliwamp.iss +++ b/build/exe/doliwamp/doliwamp.iss @@ -109,7 +109,7 @@ Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\m ; Mysql data files (does not overwrite if exists) Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db" ; Dolibarr -Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php" +Source: "htdocs\*.*"; DestDir: "{app}\www\dolibarr\htdocs"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,custom\*,custom2\*,documents\*,includes\ckeditor\_source\*,includes\savant\*,includes\phpmailer\*,jquery\plugins\template\*,nltechno*,PHPExcel\Shared\PDF\*,PHPExcel\Shared\PCLZip\*,tcpdf\fonts\dejavu-fonts-ttf-2.33\*,tcpdf\fonts\freefont-20100919\*,tcpdf\fonts\utils\*,*\conf.php,*\conf.php.mysql,*\conf.php.old,*\conf.php.postgres,*\conf.php.sav,*\install.forced.php" Source: "dev\*.*"; DestDir: "{app}\www\dolibarr\dev"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,dbmodel\*,fpdf\*,initdata\*,iso-normes\*,licence\*,phpcheckstyle\*,phpunit\*,samples\*,test\*,uml\*,xdebug\*" Source: "doc\*.*"; DestDir: "{app}\www\dolibarr\doc"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,wiki\*,plaquette\*,dev\*,images\dolibarr_screenshot2.png,images\dolibarr_screenshot3.png,images\dolibarr_screenshot4.png,images\dolibarr_screenshot5.png,images\dolibarr_screenshot6.png,images\dolibarr_screenshot7.png,images\dolibarr_screenshot8.png,images\dolibarr_screenshot9.png,images\dolibarr_screenshot10.png,images\dolibarr_screenshot11.png,images\dolibarr_screenshot12.png" Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"