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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2019-11-26 09:36:47 +01:00
commit d081c9cf8a
12 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/admin/expensereport_rules.php
View File

@ -2,7 +2,7 @@
/* Copyright (C) 2012 Mikael Carlavan <contact@mika-carl.fr>
* Copyright (C) 2017 ATM Consulting <contact@atm-consulting.fr>
* Copyright (C) 2017 Pierre-Henry Favre <phf@atm-consulting.fr>
* Copyright (C) 2018 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2018-2019 Frédéric France <frederic.france@netlogic.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -44,8 +44,8 @@ $action = GETPOST('action', 'alpha');
$id = GETPOST('id', 'int');
$apply_to = GETPOST('apply_to');
$fk_user = GETPOST('fk_user');
$fk_usergroup = GETPOST('fk_usergroup');
$fk_user = GETPOST('fk_user', 'int');
$fk_usergroup = GETPOST('fk_usergroup', 'int');
$fk_c_type_fees = GETPOST('fk_c_type_fees');
$code_expense_rules_type = GETPOST('code_expense_rules_type');
@ -97,11 +97,11 @@ if ($action == 'save')
$object->setValues($_POST);
if($apply_to=='U'){
$object->fk_user=$fk_user;
$object->fk_user = (int) $fk_user;
$object->fk_usergroup=0;
$object->is_for_all=0;
}elseif($apply_to=='G'){
$object->fk_usergroup=$fk_usergroup;
$object->fk_usergroup = (int) $fk_usergroup;
$object->fk_user=0;
$object->is_for_all=0;
}elseif($apply_to=='A'){

2
htdocs/categories/photos.php
View File

@ -167,7 +167,7 @@ if ($object->id)
print "</table>\n";
print '</div>';
print dol_fiche_end();
dol_fiche_end();

2
htdocs/comm/propal/list.php
View File

@ -628,7 +628,7 @@ if ($resql)
if (!empty($arrayfields['ava.rowid']['checked']))
{
print '<td class="liste_titre maxwidthonsmartphone" align="center">';
print $form->selectAvailabilityDelay($search_availability, 'search_availability', '', 1);
$form->selectAvailabilityDelay($search_availability, 'search_availability', '', 1);
print ajax_combobox('search_availability');
print '</td>';
}

2
htdocs/commande/document.php
View File

@ -174,7 +174,7 @@ if ($id > 0 || !empty($ref))
print "</div>\n";
print dol_fiche_end();
dol_fiche_end();
$modulepart = 'commande';
$permission = $user->rights->commande->creer;

2
htdocs/compta/bank/graph.php
View File

@ -107,7 +107,7 @@ else
{
dol_print_error($db);
}
if (empty($min)) $min = dol_now - 3600 * 24;
if (empty($min)) $min = dol_now() - 3600 * 24;
$log="graph.php: min=".$min." max=".$max;
dol_syslog($log);

2
htdocs/contact/agenda.php
View File

@ -231,7 +231,7 @@ else
print '</div>';
print dol_fiche_end();
dol_fiche_end();
// Actions buttons

2
htdocs/core/class/commonobject.class.php
View File

@ -7029,7 +7029,7 @@ abstract class CommonObject
if ($nbbyrow > 0)
{
if ($nbphoto == 1) $return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2; border-spacing: 2px; border-collapse: separate;">';
if ($nbphoto == 1) $return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2px; border-spacing: 2px; border-collapse: separate;">';
if ($nbphoto % $nbbyrow == 1) $return .= '<tr class="center valignmiddle" style="border: 1px">';
$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">';

1
htdocs/core/class/html.formcron.class.php
View File

@ -64,6 +64,7 @@ class FormCron extends Form
global $langs;
$langs->load('cron@cron');
$out = '';
if (!empty($readonly)) {
if ($selected=='command') {
$out= $langs->trans('CronType_command');

3
htdocs/emailcollector/class/emailcollector.class.php
View File

@ -1136,7 +1136,8 @@ class EmailCollector extends CommonObject
$elements = imap_mime_header_decode($overview[0]->subject);
$newstring = '';
if (! empty($elements)) {
for ($i = 0; $i < count($elements); $i++) {
$num = count($elements);
for ($i = 0; $i < $num; $i++) {
$newstring .= ($newstring ? ' ' : '').$elements[$i]->text;
}
$overview[0]->subject = $newstring;

2
htdocs/expedition/document.php
View File

@ -168,7 +168,7 @@ if ($id > 0 || !empty($ref)) {
print "</div>\n";
print dol_fiche_end();
dol_fiche_end();
$modulepart = 'expedition';
$permission = $user->rights->expedition->creer;

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

@ -2127,7 +2127,7 @@ form#login {
border-radius: 4px;
border:solid 1px rgba(80,80,80,.4);
border-top:solid 1px f8f8f8;
border-top:solid 1px #f8f8f8;
}
.login_table input#username, .login_table input#password, .login_table input#securitycode{
border: none;

4
htdocs/variants/combinations.php
View File

@ -394,7 +394,7 @@ if (! empty($id) || ! empty($ref))
}
}
$listofvariantselected .= '</div>';
//print dol_fiche_end();
//dol_fiche_end();
} else {
$title = $langs->trans('EditProductCombination');
}
@ -602,7 +602,7 @@ if (! empty($id) || ! empty($ref))
print '</table>';
}
print dol_fiche_end();
dol_fiche_end();
?>
<div style="text-align: center">