Merge branch 'develop' into patch-1
This commit is contained in:
commit
34d9b41e40
2 changed files with 5 additions and 5 deletions
|
|
@ -133,17 +133,17 @@ class CashControl extends CommonObject
|
|||
public $day_close;
|
||||
|
||||
/**
|
||||
* @var int Hour close
|
||||
* @var ?int Hour close
|
||||
*/
|
||||
public $hour_close;
|
||||
|
||||
/**
|
||||
* @var int Minute close
|
||||
* @var ?int Minute close
|
||||
*/
|
||||
public $min_close;
|
||||
|
||||
/**
|
||||
* @var int Second close
|
||||
* @var ?int Second close
|
||||
*/
|
||||
public $sec_close;
|
||||
|
||||
|
|
|
|||
|
|
@ -1595,7 +1595,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
|
|||
$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
|
||||
|
||||
// If project has usage "Bill time", we force visibility of field "billed"
|
||||
if (!empty($projectstatic) && $projectstatic->usage_bill_time) {
|
||||
if ($projectstatic->usage_bill_time) {
|
||||
$arrayfields['valuebilled']['checked'] = 1;
|
||||
}
|
||||
|
||||
|
|
@ -1934,7 +1934,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
|
|||
$selectedfields .= (is_array($arrayofmassactions) && count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
|
||||
|
||||
// If project has usage "Bill time", we force visibility of field "billed"
|
||||
if (!empty($projectstatic) && $projectstatic->usage_bill_time) {
|
||||
if ($projectstatic->usage_bill_time) {
|
||||
$arrayfields['valuebilled']['checked'] = 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue