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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2016-11-12 22:52:48 +01:00
commit 7cf4703b73
11 changed files with 1438 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/composer/README
View File

@ -1,10 +1,19 @@
To test upgrade of a lib with composer: * To list packages
composer update --no-dev --no-autoloader --dry-run ccampbell/chromephp composer show -i
To upgrade a lib with composer: * To test upgrade of a lib with composer:
Remove entry in composer.lock
Edit composer.json to change version to "x.y.z"
composer -v update --root-reqs --no-dev --no-autoloader --dry-run ccampbell/chromephp
* To upgrade a lib with composer:
Remove entry in composer.lock
Edit composer.json to change version to "x.y.z"
composer -v update --root-reqs --no-dev --no-autoloader ccampbell/chromephp
composer update --no-dev --no-autoloader ccampbell/chromephp

2
composer.json
View File

@ -27,7 +27,7 @@
"php": ">=5.3.0", "php": ">=5.3.0",
"ext-curl": "*", "ext-curl": "*",
"ccampbell/chromephp": "4.1.0", "ccampbell/chromephp": "4.1.0",
"ckeditor/ckeditor": "dev-full/stable", "ckeditor/ckeditor": "4.5.9",
"mike42/escpos-php": "1.2.1", "mike42/escpos-php": "1.2.1",
"mobiledetect/mobiledetectlib": "2.8.17", "mobiledetect/mobiledetectlib": "2.8.17",
"phpoffice/phpexcel": "1.8.1", "phpoffice/phpexcel": "1.8.1",

1406
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
htdocs/core/class/html.form.class.php
View File

@ -4493,7 +4493,7 @@ class Form
if ($usecalendar == "eldy") if ($usecalendar == "eldy")
{ {
// Zone de saisie manuelle de la date // Zone de saisie manuelle de la date
$retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" class"minwidth100" maxlength="11" value="'.$formated_date.'"'; $retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';
$retstring.=($disabled?' disabled':''); $retstring.=($disabled?' disabled':'');
$retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript $retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
$retstring.='>'; $retstring.='>';

5
htdocs/core/class/html.formprojet.class.php
View File

@ -59,9 +59,10 @@ class FormProjets
* @param string $filterkey Key to filter * @param string $filterkey Key to filter
* @param int $nooutput No print output. Return it only. * @param int $nooutput No print output. Return it only.
* @param int $forceaddid Force to add project id in list, event if not qualified * @param int $forceaddid Force to add project id in list, event if not qualified
* @param string $morecss More css
* @return string Return html content * @return string Return html content
*/ */
function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '', $nooutput=0, $forceaddid=0) function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '', $nooutput=0, $forceaddid=0, $morecss='')
{ {
global $langs,$conf,$form; global $langs,$conf,$form;
@ -85,7 +86,7 @@ class FormProjets
// ) // )
)); ));
$out.='<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />'; $out.='<input type="text" class="minwidth200'.($morecss?' '.$morecss:'').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
} }
else else
{ {

13
htdocs/expensereport/card.php
View File

@ -1824,7 +1824,7 @@ else
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td style="text-align:center;">'.$langs->trans('Piece').'</td>'; print '<td style="text-align:center;">'.$langs->trans('Piece').'</td>';
print '<td style="text-align:center;">'.$langs->trans('Date').'</td>'; print '<td style="text-align:center;">'.$langs->trans('Date').'</td>';
if (! empty($conf->projet->enabled)) print '<td>'.$langs->trans('Project').'</td>'; if (! empty($conf->projet->enabled)) print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
print '<td style="text-align:center;">'.$langs->trans('Type').'</td>'; print '<td style="text-align:center;">'.$langs->trans('Type').'</td>';
print '<td style="text-align:left;">'.$langs->trans('Description').'</td>'; print '<td style="text-align:left;">'.$langs->trans('Description').'</td>';
print '<td style="text-align:right;">'.$langs->trans('VAT').'</td>'; print '<td style="text-align:right;">'.$langs->trans('VAT').'</td>';
@ -1972,10 +1972,11 @@ else
if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline' && $user->rights->expensereport->creer) if (($object->fk_statut==0 || $object->fk_statut==99) && $action != 'editline' && $user->rights->expensereport->creer)
{ {
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td></td>';
print '<td align="center">'.$langs->trans('Date').'</td>'; print '<td align="center">'.$langs->trans('Date').'</td>';
if (! empty($conf->projet->enabled)) print '<td>'.$langs->trans('Project').'</td>'; if (! empty($conf->projet->enabled)) print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
print '<td align="center">'.$langs->trans('Type').'</td>'; print '<td align="center">'.$langs->trans('Type').'</td>';
print '<td colspan="2">'.$langs->trans('Description').'</td>'; print '<td>'.$langs->trans('Description').'</td>';
print '<td align="right">'.$langs->trans('VAT').'</td>'; print '<td align="right">'.$langs->trans('VAT').'</td>';
print '<td align="right">'.$langs->trans('PriceUTTC').'</td>'; print '<td align="right">'.$langs->trans('PriceUTTC').'</td>';
print '<td align="right">'.$langs->trans('Qty').'</td>'; print '<td align="right">'.$langs->trans('Qty').'</td>';
@ -1985,6 +1986,8 @@ else
print '<tr '.$bc[true].'>'; print '<tr '.$bc[true].'>';
print '<td></td>';
// Select date // Select date
print '<td align="center">'; print '<td align="center">';
$form->select_date($date?$date:-1,'date'); $form->select_date($date?$date:-1,'date');
@ -2004,7 +2007,7 @@ else
print '</td>'; print '</td>';
// Add comments // Add comments
print '<td colspan="2">'; print '<td>';
print '<textarea class="flat_ndf centpercent" name="comments">'.$comments.'</textarea>'; print '<textarea class="flat_ndf centpercent" name="comments">'.$comments.'</textarea>';
print '</td>'; print '</td>';
@ -2219,7 +2222,7 @@ print '</div>';
//$conf->global->DOL_URL_ROOT_DOCUMENT_PHP=dol_buildpath('/expensereport/documentwrapper.php',1); //$conf->global->DOL_URL_ROOT_DOCUMENT_PHP=dol_buildpath('/expensereport/documentwrapper.php',1);
print '<div style="width:50%">'; print '<div class="fichehalfleft">';
/* /*
* Generate documents * Generate documents

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

@ -1632,7 +1632,7 @@ activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is miss
CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file. CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
LandingPage=Landing page LandingPage=Landing page
SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary. ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users or groups manually if necessary.
UserHasNoPermissions=This user has no permission defined UserHasNoPermissions=This user has no permission defined
TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days") TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
##### Resource #### ##### Resource ####

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

@ -656,6 +656,13 @@ div.myavailability {
/* Force values for small screen 570 */ /* Force values for small screen 570 */
@media only screen and (max-width: 570px) @media only screen and (max-width: 570px)
{ {
.tdoverflowonsmartphone {
max-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
div.titre { div.titre {
line-height: 2em; line-height: 2em;
} }

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

@ -660,6 +660,13 @@ div.myavailability {
/* Force values for small screen 570 */ /* Force values for small screen 570 */
@media only screen and (max-width: 570px) @media only screen and (max-width: 570px)
{ {
.tdoverflowonsmartphone {
max-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
div.titre { div.titre {
line-height: 2em; line-height: 2em;
} }

4
htdocs/user/perms.php
View File

@ -329,7 +329,7 @@ if ($result)
{ {
// On affiche ligne pour modifier droits // On affiche ligne pour modifier droits
print '<tr '. $bc[$var].'>'; print '<tr '. $bc[$var].'>';
print '<td class="maxwidthonsmartphone tdoverflow">'.img_object('',$picto).' '.$objMod->getName(); print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('',$picto).' '.$objMod->getName();
print '<a name="'.$objMod->getName().'"></a></td>'; print '<a name="'.$objMod->getName().'"></a></td>';
print '<td align="center" class="nowrap">'; print '<td align="center" class="nowrap">';
print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>"; print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$object->id.'&amp;action=addrights&amp;entity='.$entity.'&amp;module='.$obj->module.'">'.$langs->trans("All")."</a>";
@ -344,7 +344,7 @@ if ($result)
print '<tr '. $bc[$var].'>'; print '<tr '. $bc[$var].'>';
// Picto and label of permission // Picto and label of permission
print '<td class="maxwidthonsmartphone tdoverflow">'.img_object('',$picto).' '.$objMod->getName().'</td>'; print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">'.img_object('',$picto).' '.$objMod->getName().'</td>';
// Permission and tick // Permission and tick
if (! empty($object->admin) && ! empty($objMod->rights_admin_allowed)) // Permission own because admin if (! empty($object->admin) && ! empty($objMod->rights_admin_allowed)) // Permission own because admin

4
htdocs/websites/index.php
View File

@ -632,7 +632,7 @@ if (count($object->records) > 0)
if ($website && $action == 'preview') if ($website && $action == 'preview')
{ {
$disabled=''; $disabled='';
if (empty($user->rights->websites->create)) $disabled=' disabled="disabled"'; if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
print ' &nbsp; '; print ' &nbsp; ';
@ -735,7 +735,7 @@ if (count($object->records) > 0)
if ($action == 'preview') if ($action == 'preview')
{ {
$disabled=''; $disabled='';
if (empty($user->rights->websites->create)) $disabled=' disabled="disabled"'; if (empty($user->rights->websites->write)) $disabled=' disabled="disabled"';
if ($pageid > 0) if ($pageid > 0)
{ {