@@ -45,7 +45,7 @@ |
||
| 45 | 45 | $valuetoshow = $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey); |
| 46 | 46 | $title = dol_string_nohtmltag($valuetoshow); |
| 47 | 47 | |
| 48 | - print '<td'.($cssclass ? ' class="'.$cssclass.'"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist' |
|
| 48 | + print '<td'.($cssclass ? ' class="'.$cssclass.'"' : ''); // TODO Add 'css' and 'cssview' and 'csslist' for extrafields and use here 'csslist' |
|
| 49 | 49 | print ' data-key="'.$extrafieldsobjectkey.'.'.$key.'"'; |
| 50 | 50 | print ($title ? ' title="'.dol_escape_htmltag($title).'"' : ''); |
| 51 | 51 | print '>'; |
@@ -682,7 +682,7 @@ |
||
| 682 | 682 | { |
| 683 | 683 | $base = new DateTime("$year-03-21", new DateTimeZone("UTC")); |
| 684 | 684 | $days = easter_days($year); // Return number of days between 21 march and easter day. |
| 685 | - $tmp = $base->add(new DateInterval("P{$days}D")); |
|
| 685 | + $tmp = $base->add(new DateInterval("p{$days}d")); |
|
| 686 | 686 | return $tmp->getTimestamp(); |
| 687 | 687 | } |
| 688 | 688 | |
@@ -291,11 +291,11 @@ discard block |
||
| 291 | 291 | $sTime .= dol_print_date($iSecond, 'hourduration', true); |
| 292 | 292 | } |
| 293 | 293 | } elseif ($format == 'allhourminsec') { |
| 294 | - return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60))); |
|
| 294 | + return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60))); |
|
| 295 | 295 | } elseif ($format == 'allhourmin') { |
| 296 | - return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600)/60))); |
|
| 296 | + return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))); |
|
| 297 | 297 | } elseif ($format == 'allhour') { |
| 298 | - return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))); |
|
| 298 | + return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))); |
|
| 299 | 299 | } |
| 300 | 300 | } elseif ($format == 'hour') { // only hour part |
| 301 | 301 | $sTime = dol_print_date($iSecond, '%H', true); |
@@ -906,7 +906,7 @@ discard block |
||
| 906 | 906 | $date_1sunsept = strtotime('next thursday', strtotime('next sunday', mktime(0, 0, 0, 9, 1, $annee))); |
| 907 | 907 | $jour_1sunsept = date("d", $date_1sunsept); |
| 908 | 908 | $mois_1sunsept = date("m", $date_1sunsept); |
| 909 | - if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) $ferie=true; |
|
| 909 | + if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) $ferie = true; |
|
| 910 | 910 | // Geneva fast in Switzerland |
| 911 | 911 | } |
| 912 | 912 | } |
@@ -331,13 +331,27 @@ discard block |
||
| 331 | 331 | { |
| 332 | 332 | $result = 0; |
| 333 | 333 | |
| 334 | - if ($duration_unit == 's') $result = $duration_value / 3600; |
|
| 335 | - if ($duration_unit == 'i') $result = $duration_value / 60; |
|
| 336 | - if ($duration_unit == 'h') $result = $duration_value; |
|
| 337 | - if ($duration_unit == 'd') $result = $duration_value * 24; |
|
| 338 | - if ($duration_unit == 'w') $result = $duration_value * 24 * 7; |
|
| 339 | - if ($duration_unit == 'm') $result = $duration_value * 730.484; |
|
| 340 | - if ($duration_unit == 'y') $result = $duration_value * 365 * 24; |
|
| 334 | + if ($duration_unit == 's') { |
|
| 335 | + $result = $duration_value / 3600; |
|
| 336 | + } |
|
| 337 | + if ($duration_unit == 'i') { |
|
| 338 | + $result = $duration_value / 60; |
|
| 339 | + } |
|
| 340 | + if ($duration_unit == 'h') { |
|
| 341 | + $result = $duration_value; |
|
| 342 | + } |
|
| 343 | + if ($duration_unit == 'd') { |
|
| 344 | + $result = $duration_value * 24; |
|
| 345 | + } |
|
| 346 | + if ($duration_unit == 'w') { |
|
| 347 | + $result = $duration_value * 24 * 7; |
|
| 348 | + } |
|
| 349 | + if ($duration_unit == 'm') { |
|
| 350 | + $result = $duration_value * 730.484; |
|
| 351 | + } |
|
| 352 | + if ($duration_unit == 'y') { |
|
| 353 | + $result = $duration_value * 365 * 24; |
|
| 354 | + } |
|
| 341 | 355 | |
| 342 | 356 | return $result; |
| 343 | 357 | } |
@@ -929,7 +943,9 @@ discard block |
||
| 929 | 943 | $date_1sunsept = strtotime('next thursday', strtotime('next sunday', mktime(0, 0, 0, 9, 1, $annee))); |
| 930 | 944 | $jour_1sunsept = date("d", $date_1sunsept); |
| 931 | 945 | $mois_1sunsept = date("m", $date_1sunsept); |
| 932 | - if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) $ferie=true; |
|
| 946 | + if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) { |
|
| 947 | + $ferie=true; |
|
| 948 | + } |
|
| 933 | 949 | // Geneva fast in Switzerland |
| 934 | 950 | } |
| 935 | 951 | } |
@@ -76,7 +76,7 @@ |
||
| 76 | 76 | } |
| 77 | 77 | $result = restrictedArea($user, 'expedition', $object->id, ''); |
| 78 | 78 | |
| 79 | -$permissiontoadd = $user->rights->expedition->creer; // Used by the include of actions_dellink.inc.php |
|
| 79 | +$permissiontoadd = $user->rights->expedition->creer; // Used by the include of actions_dellink.inc.php |
|
| 80 | 80 | |
| 81 | 81 | |
| 82 | 82 | /* |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | } |
| 79 | 79 | $result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges'); |
| 80 | 80 | |
| 81 | -$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php |
|
| 81 | +$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php |
|
| 82 | 82 | |
| 83 | 83 | |
| 84 | 84 | /* |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | } |
| 75 | 75 | $result = restrictedArea($user, 'deplacement', $id, ''); |
| 76 | 76 | |
| 77 | -$permissiontoadd = $user->rights->deplacement->creer; // Used by the include of actions_dellink.inc.php |
|
| 77 | +$permissiontoadd = $user->rights->deplacement->creer; // Used by the include of actions_dellink.inc.php |
|
| 78 | 78 | |
| 79 | 79 | |
| 80 | 80 | /* |
@@ -79,7 +79,7 @@ |
||
| 79 | 79 | } |
| 80 | 80 | $result = restrictedArea($user, 'tax', '', 'tva', 'charges'); |
| 81 | 81 | |
| 82 | -$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php |
|
| 82 | +$permissiontoadd = $user->rights->tax->charges->creer; // Used by the include of actions_dellink.inc.php |
|
| 83 | 83 | |
| 84 | 84 | |
| 85 | 85 | /* |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | $upload_dir = $conf->bank->dir_output.'/'.dol_sanitizeFileName($object->id); |
| 70 | 70 | $modulepart = 'banque'; |
| 71 | 71 | |
| 72 | -$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
| 72 | +$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
| 73 | 73 | |
| 74 | 74 | |
| 75 | 75 | |
@@ -120,7 +120,7 @@ |
||
| 120 | 120 | $found = true; |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | -$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
| 123 | +$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
| 124 | 124 | |
| 125 | 125 | |
| 126 | 126 | /* |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | |
| 75 | 75 | $result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', ''); |
| 76 | 76 | |
| 77 | -$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
| 77 | +$permissiontoadd = $user->rights->banque->modifier; // Used by the include of actions_dellink.inc.php |
|
| 78 | 78 | |
| 79 | 79 | |
| 80 | 80 | /* |