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

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-09 17:17:28 +01:00
commit 8b696970a7
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/langs/en_US/main.lang
View File

@ -1005,7 +1005,7 @@ ContactDefault_contrat=Contract
ContactDefault_facture=Invoice
ContactDefault_fichinter=Intervention
ContactDefault_invoice_supplier=Supplier Invoice
ContactDefault_order_supplier=Supplier Order
ContactDefault_order_supplier=Purchase Order
ContactDefault_project=Project
ContactDefault_project_task=Task
ContactDefault_propal=Proposal

2
htdocs/langs/en_US/modulebuilder.lang
View File

@ -83,7 +83,7 @@ ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=List of defined permissions
SeeExamples=See examples here
EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update). Using a negative value means field is not shown by default on list but can be selected for viewing). It can be an expression, for example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
IsAMeasureDesc=Can the value of field be cumulated to get a total into list? (Examples: 1 or 0)
SearchAllDesc=Is the field used to make a search from the quick search tool? (Examples: 1 or 0)
SpecDefDesc=Enter here all documentation you want to provide with your module that is not already defined by other tabs. You can use .md or better, the rich .asciidoc syntax.

4
htdocs/theme/eldy/global.inc.php
View File

@ -3986,6 +3986,10 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im
padding-left: 8px;
margin-right: 5px;
}
.websitebar input#previewpageurl {
line-height: 1em;
}
/* ============================================================================== */

3
htdocs/theme/md/style.css.php
View File

@ -4120,6 +4120,9 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im
padding-left: 8px;
margin-right: 5px;
}
.websitebar input#previewpageurl {
line-height: 1em;
}
/* ============================================================================== */