From 3bb4de3e86635b2a38862801f010b7a6accc1354 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Dec 2013 15:56:00 +0100 Subject: [PATCH 1/5] 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/5] 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/5] 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/5] 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/5] 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;