# WARNING: head commit changed in the meantime
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
This commit is contained in:
commit
27ef6840d5
@ -422,9 +422,12 @@ if ($action != 'edit' && $action != 'create') // If not bank account yet, $acco
|
|||||||
|
|
||||||
$holiday->id = $objp->rowid;
|
$holiday->id = $objp->rowid;
|
||||||
$holiday->ref = $objp->rowid;
|
$holiday->ref = $objp->rowid;
|
||||||
|
|
||||||
$holiday->fk_type = $objp->fk_type;
|
$holiday->fk_type = $objp->fk_type;
|
||||||
$holiday->statut = $objp->status;
|
$holiday->statut = $objp->status;
|
||||||
$nbopenedday = num_open_day($db->jdate($objp->date_debut), $db->jdate($objp->date_fin), 0, 1, $objp->halfday);
|
$holiday->status = $objp->status;
|
||||||
|
|
||||||
|
$nbopenedday = num_open_day($db->jdate($objp->date_debut, 'gmt'), $db->jdate($objp->date_fin, 'gmt'), 0, 1, $objp->halfday);
|
||||||
|
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td class="nowrap">';
|
print '<td class="nowrap">';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user