Completed
Branch develop (805764)
by
unknown
16:32
created
htdocs/adherents/type_translation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 
75 75
 	// update of object
76 76
 	if ($forcelangprod == $current_lang) {
77
-		$object->label		 = GETPOST("libelle", 'alphanohtml');
77
+		$object->label = GETPOST("libelle", 'alphanohtml');
78 78
 		$object->description = dol_htmlcleanlastbr(GETPOST("desc", 'restricthtml'));
79 79
 		//$object->other		 = dol_htmlcleanlastbr(GETPOST("other", 'restricthtml'));
80 80
 	} else {
Please login to merge, or discard this patch.
htdocs/core/lib/date.lib.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -682,7 +682,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -295,11 +295,11 @@  discard block
 block discarded – undo
295 295
 				$sTime .= dol_print_date($iSecond, 'hourduration', true);
296 296
 			}
297 297
 		} elseif ($format == 'allhourminsec') {
298
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
298
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
299 299
 		} elseif ($format == 'allhourmin') {
300
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600)/60)));
300
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
301 301
 		} elseif ($format == 'allhour') {
302
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600)));
302
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond / 3600)));
303 303
 		}
304 304
 	} elseif ($format == 'hour') {	// only hour part
305 305
 		$sTime = dol_print_date($iSecond, '%H', true);
@@ -803,7 +803,7 @@  discard block
 block discarded – undo
803 803
 		$sql = "SELECT code, entity, fk_country, dayrule, year, month, day, active";
804 804
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_hrm_public_holiday";
805 805
 		$sql .= " WHERE active = 1 and fk_country IN (0".($country_id > 0 ? ", ".$country_id : 0).")";
806
-		$sql .= " AND entity IN (0," .getEntity('holiday') .")";
806
+		$sql .= " AND entity IN (0,".getEntity('holiday').")";
807 807
 
808 808
 		$resql = $db->query($sql);
809 809
 		if ($resql) {
@@ -947,7 +947,7 @@  discard block
 block discarded – undo
947 947
 				$jour_1sunsept = date("d", $date_1sunsept);
948 948
 				$mois_1sunsept = date("m", $date_1sunsept);
949 949
 				if ($jour_1sunsept == $jour && $mois_1sunsept == $mois) {
950
-					$ferie=true;
950
+					$ferie = true;
951 951
 				}
952 952
 				// Geneva fast in Switzerland
953 953
 			}
Please login to merge, or discard this patch.
htdocs/expedition/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
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
 /*
Please login to merge, or discard this patch.
htdocs/compta/sociales/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
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
 /*
Please login to merge, or discard this patch.
htdocs/compta/deplacement/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
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
 /*
Please login to merge, or discard this patch.
htdocs/compta/tva/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
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
 /*
Please login to merge, or discard this patch.
htdocs/compta/bank/various_payment/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
htdocs/compta/bank/account_statement_document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@
 block discarded – undo
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
 /*
Please login to merge, or discard this patch.
htdocs/compta/bank/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
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
 /*
Please login to merge, or discard this patch.