lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2013-12-29 00:57:29 +01:00
commit 338ee2dbbc
9 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/exe/doliwamp/doliwamp.iss
View File

@ -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) ; 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" Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
; Dolibarr ; 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: "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: "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" Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,product\materiel.net.php,product\import-product.php"

2
htdocs/admin/system/perf.php
View File

@ -89,7 +89,7 @@ $test1=function_exists('xcache_info');
if ($test1) if ($test1)
{ {
print img_picto('','tick.png').' '.$langs->trans("XCacheInstalled"); print img_picto('','tick.png').' '.$langs->trans("XCacheInstalled");
print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/xcache.php'.'">Xcache admin page</a>'; print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xcache.php'.'">Xcache admin page</a>';
} }
else else
{ {

5
htdocs/langs/en_US/admin.lang
View File

@ -1013,6 +1013,8 @@ AddRefInList=Display customer/supplier ref into list (select list or combobox) a
FieldEdition=Edition of field %s FieldEdition=Edition of field %s
FixTZ=TimeZone fix FixTZ=TimeZone fix
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) 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 ##### Module password generation
PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. 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. 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 ##### ##### Contracts #####
ContractsSetup=Contracts module setup ContractsSetup=Contracts module setup
ContractsNumberingModules=Contracts numbering modules ContractsNumberingModules=Contracts numbering modules
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
##### Members ##### ##### Members #####
MembersSetup=Members module setup MembersSetup=Members module setup
MemberMainOptions=Main options MemberMainOptions=Main options

6
htdocs/langs/en_US/companies.lang
View File

@ -362,10 +362,10 @@ ExportCardToFormat=Export card to format
ContactNotLinkedToCompany=Contact not linked to any third party ContactNotLinkedToCompany=Contact not linked to any third party
DolibarrLogin=Dolibarr login DolibarrLogin=Dolibarr login
NoDolibarrAccess=No Dolibarr access 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 ExportDataset_company_2=Contacts and properties
ImportDataset_company_1=Third parties (Companies/foundations) and properties ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
ImportDataset_company_2=Contacts (of thirdparties or not) and attributes ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
ImportDataset_company_3=Bank details ImportDataset_company_3=Bank details
PriceLevel=Price level PriceLevel=Price level
DeliveriesAddress=Delivery addresses DeliveriesAddress=Delivery addresses

5
htdocs/langs/fr_FR/admin.lang
View File

@ -1011,6 +1011,8 @@ AddRefInList=Afficher le code client/fournisseur dans les liste (déroulante ou
FieldEdition=Édition du champ %s FieldEdition=Édition du champ %s
FixTZ=Correction du Timezone FixTZ=Correction du Timezone
FillThisOnlyIfRequired=Exemple: +2 (ne remplir que si un décalage d'heure est constaté dans l'export) 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 ##### 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. 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. 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 ##### ##### Contracts #####
ContractsSetup=Configuration du module contrats ContractsSetup=Configuration du module contrats
ContractsNumberingModules=Modèles de numérotation des 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 ##### ##### Members #####
MembersSetup=Configuration du module Adhérents MembersSetup=Configuration du module Adhérents
MemberMainOptions=Options principales MemberMainOptions=Options principales

6
htdocs/langs/fr_FR/companies.lang
View File

@ -362,10 +362,10 @@ ExportCardToFormat=Exporter fiche au format
ContactNotLinkedToCompany=Contact non lié à un tiers ContactNotLinkedToCompany=Contact non lié à un tiers
DolibarrLogin=Identifiant utilisateur DolibarrLogin=Identifiant utilisateur
NoDolibarrAccess=Pas d'accès 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 ExportDataset_company_2=Contacts (de tiers) et attributs
ImportDataset_company_1=Tiers (sociétés/institutions) et attributs ImportDataset_company_1=Tiers (sociétés/institutions/particuliers) et attributs
ImportDataset_company_2=Contacts (de tiers ou libre) et attributs ImportDataset_company_2=Contacts/Adresses (de tiers ou libre) et attributs
ImportDataset_company_3=Coordonnées bancaires ImportDataset_company_3=Coordonnées bancaires
PriceLevel=Niveau de prix PriceLevel=Niveau de prix
DeliveriesAddress=Adresse(s) de livraison DeliveriesAddress=Adresse(s) de livraison

7
htdocs/theme/auguria/style.css.php
View File

@ -597,7 +597,7 @@ div.login a:hover {
.login_block_elem { .login_block_elem {
float: right; float: right;
vertical-align: top; vertical-align: top;
padding: 0px 0px 0px 4px !important; padding: 8px 0px 0px 4px !important;
} }
.alogin, .alogin:hover { .alogin, .alogin:hover {
@ -610,8 +610,7 @@ div.login a:hover {
} }
img.login, img.printer, img.entity { img.login, img.printer, img.entity {
padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px; padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 8px;
text-decoration: none; text-decoration: none;
color: white; color: white;
font-weight: bold; font-weight: bold;
@ -1044,7 +1043,7 @@ div.tabsAction {
a.tabTitle { a.tabTitle {
background: <? echo empty($dol_use_jmobile)?'#5088A9':'auto'; ?>; background: <? echo empty($dol_use_jmobile)?'#5088A9':'auto'; ?>;
color: white; color: #888;
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
font-weight: normal; font-weight: normal;
padding: 0px 6px; padding: 0px 6px;

4
htdocs/theme/bureau2crea/style.css.php
View File

@ -631,7 +631,7 @@ div.login a:hover {
.login_block_elem { .login_block_elem {
float: right; float: right;
vertical-align: top; vertical-align: top;
padding: 0px 0px 0px 4px !important; padding: 8px 0px 0px 4px !important;
} }
.alogin, .alogin:hover { .alogin, .alogin:hover {
@ -644,7 +644,7 @@ div.login a:hover {
} }
img.login, img.printer, img.entity { img.login, img.printer, img.entity {
padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px; padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 8px; margin: 0px 0px 0px 8px;
text-decoration: none; text-decoration: none;
color: white; color: white;

6
htdocs/theme/cameleo/style.css.php
View File

@ -701,7 +701,7 @@ div.login a:hover {
.login_block_elem { .login_block_elem {
float: right; float: right;
vertical-align: top; vertical-align: top;
padding: 0px 0px 0px 4px !important; padding: 8px 0px 0px 4px !important;
} }
.alogin, .alogin:hover { .alogin, .alogin:hover {
@ -714,8 +714,8 @@ div.login a:hover {
} }
img.login, img.printer, img.entity { img.login, img.printer, img.entity {
padding: <?php echo ($conf->dol_optimize_smallscreen?'0':'8')?>px 0px 0px 0px; padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 8px; margin: 0px 0px 0px 4px;
text-decoration: none; text-decoration: none;
color: white; color: white;
font-weight: bold; font-weight: bold;