diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 200ca31c106..10ee42fab4a 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1118,6 +1118,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/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 227ce4442fb..d999442f84d 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -362,10 +362,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/admin.lang b/htdocs/langs/fr_FR/admin.lang index aa0eda67a10..604b12a1981 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1116,6 +1116,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/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index d4aa1c7eb35..8b8144da3f3 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -362,10 +362,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 diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 9f862fbca07..d2550ba599a 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -597,7 +597,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 { @@ -610,8 +610,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; @@ -1044,7 +1043,7 @@ div.tabsAction { a.tabTitle { background: ; - color: white; + color: #888; font-family: ; font-weight: normal; padding: 0px 6px; diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 608dbc3dae3..b23018f5c86 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -631,7 +631,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 { @@ -644,7 +644,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 51bb93c0207..cffd00d26b2 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -701,7 +701,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 { @@ -714,8 +714,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;