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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2023-03-31 13:31:40 +02:00
commit 8f68247bbc
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,11 @@ abstract class CommonObject
*/ */
public $element; public $element;
/**
* @var int The related element
*/
public $fk_element;
/** /**
* @var string Name to use for 'features' parameter to check module permissions user->rights->feature with restrictedArea(). * @var string Name to use for 'features' parameter to check module permissions user->rights->feature with restrictedArea().
* Undefined means same value than $element. Can be use to force a check on another element for example for class of line, we mention here the parent element. * Undefined means same value than $element. Can be use to force a check on another element for example for class of line, we mention here the parent element.

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

@ -5206,15 +5206,20 @@ class Form
$more .= '<div class="tagtr"><div class="tagtd' . (empty($input['tdclass']) ? '' : (' ' . $input['tdclass'])) . '">' . $input['label'] . '</div>'; $more .= '<div class="tagtr"><div class="tagtd' . (empty($input['tdclass']) ? '' : (' ' . $input['tdclass'])) . '">' . $input['label'] . '</div>';
$more .= '<div class="tagtd">'; $more .= '<div class="tagtd">';
$addnowlink = (empty($input['datenow']) ? 0 : 1); $addnowlink = (empty($input['datenow']) ? 0 : 1);
$more .= $this->selectDate($input['value'], $input['name'], ($input['type'] == 'datetime' ? 1 : 0), ($input['type'] == 'datetime' ? 1 : 0), 0, '', 1, $addnowlink); $h = $m = 0;
$more .= '</div></div>' . "\n"; if ($input['type'] == 'datetime') {
$formquestion[] = array('name' => $input['name'] . 'day'); $h = isset($input['hours']) ? $input['hours'] : 1;
$formquestion[] = array('name' => $input['name'] . 'month'); $m = isset($input['minutes']) ? $input['minutes'] : 1;
$formquestion[] = array('name' => $input['name'] . 'year'); }
$formquestion[] = array('name' => $input['name'] . 'hour'); $more .= $this->selectDate($input['value'], $input['name'], $h, $m, 0, '', 1, $addnowlink);
$formquestion[] = array('name' => $input['name'] . 'min'); $more .= '</div></div>'."\n";
} elseif ($input['type'] == 'other') { // can be 1 column or 2 depending if label is set or not $formquestion[] = array('name'=>$input['name'].'day');
$more .= '<div class="tagtr"><div class="tagtd' . (empty($input['tdclass']) ? '' : (' ' . $input['tdclass'])) . '">'; $formquestion[] = array('name'=>$input['name'].'month');
$formquestion[] = array('name'=>$input['name'].'year');
$formquestion[] = array('name'=>$input['name'].'hour');
$formquestion[] = array('name'=>$input['name'].'min');
} elseif ($input['type'] == 'other') { // can be 1 column or 2 depending if label is set or not
$more .= '<div class="tagtr"><div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">';
if (!empty($input['label'])) { if (!empty($input['label'])) {
$more .= $input['label'] . '</div><div class="tagtd">'; $more .= $input['label'] . '</div><div class="tagtd">';
} }