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-27 18:09:31 +01:00
commit 7d6779bd4a
7 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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
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

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

@ -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

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

@ -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

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

@ -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: <?php echo ($conf->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: <? echo empty($dol_use_jmobile)?'#5088A9':'auto'; ?>;
color: white;
color: #888;
font-family: <?php print $fontlist ?>;
font-weight: normal;
padding: 0px 6px;

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

@ -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: <?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;
color: white;

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

@ -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: <?php echo ($conf->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;