diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss index f6d682ae9b2..60830ff7477 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" 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 { diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 200ca31c106..7d4bf60406c 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1013,6 +1013,8 @@ 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 +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. @@ -1118,6 +1120,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..6744e19261d 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1011,6 +1011,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é. +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. @@ -1116,6 +1118,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;