Completed
Branch develop (c512ef)
by
unknown
16:26
created
htdocs/salaries/card.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -298,9 +298,9 @@  discard block
 block discarded – undo
298 298
 			// Create a line of payments
299 299
 			$paiement = new PaymentSalary($db);
300 300
 			$paiement->fk_salary    = $object->id;
301
-			$paiement->chid         = $object->id;	// deprecated
301
+			$paiement->chid         = $object->id; // deprecated
302 302
 			$paiement->datep        = $datep;
303
-			$paiement->datev		= $datev;
303
+			$paiement->datev = $datev;
304 304
 			$paiement->amounts      = array($object->id=>$amount); // Tableau de montant
305 305
 			$paiement->fk_typepayment = $type_payment;
306 306
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
@@ -329,10 +329,10 @@  discard block
 block discarded – undo
329 329
 
330 330
 			if (GETPOST('saveandnew', 'alpha')) {
331 331
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
332
-				header("Location: card.php?action=create&fk_project=" . urlencode($projectid) . "&accountid=" . urlencode($accountid) . '&paymenttype=' . urlencode(GETPOST('paymenttype', 'az09')) . '&datepday=' . GETPOST("datepday", 'int') . '&datepmonth=' . GETPOST("datepmonth", 'int') . '&datepyear=' . GETPOST("datepyear", 'int'));
332
+				header("Location: card.php?action=create&fk_project=".urlencode($projectid)."&accountid=".urlencode($accountid).'&paymenttype='.urlencode(GETPOST('paymenttype', 'az09')).'&datepday='.GETPOST("datepday", 'int').'&datepmonth='.GETPOST("datepmonth", 'int').'&datepyear='.GETPOST("datepyear", 'int'));
333 333
 				exit;
334 334
 			} else {
335
-				header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id);
335
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$object->id);
336 336
 				exit;
337 337
 			}
338 338
 		} else {
@@ -618,7 +618,7 @@  discard block
 block discarded – undo
618 618
 
619 619
 	// Auto create payment
620 620
 	print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>';
621
-	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_paiement) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n";	// Date payment
621
+	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_paiement) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n"; // Date payment
622 622
 
623 623
 	// Bank
624 624
 	if (isModEnabled("banque")) {
@@ -824,10 +824,10 @@  discard block
 block discarded – undo
824 824
 			$userstatic = new User($db);
825 825
 			$result = $userstatic->fetch($object->fk_user);
826 826
 			if ($result > 0) {
827
-				$morehtmlref .= '<br>' .$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
827
+				$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
828 828
 			}
829 829
 		} else {
830
-			$morehtmlref .= '<br>' . $form->editfieldkey("Employee", 'fk_user', $object->label, $object, $permissiontoadd, 'string', '', 0, 1);
830
+			$morehtmlref .= '<br>'.$form->editfieldkey("Employee", 'fk_user', $object->label, $object, $permissiontoadd, 'string', '', 0, 1);
831 831
 
832 832
 			if (!empty($object->fk_user)) {
833 833
 				$userstatic = new User($db);
@@ -893,7 +893,7 @@  discard block
 block discarded – undo
893 893
 		print "</td></tr>";
894 894
 	} else {
895 895
 		print "<tr>";
896
-		print '<td class="titlefield">' . $langs->trans("DateStartPeriod") . '</td><td>';
896
+		print '<td class="titlefield">'.$langs->trans("DateStartPeriod").'</td><td>';
897 897
 		print dol_print_date($object->datesp, 'day');
898 898
 		print '</td></tr>';
899 899
 	}
@@ -904,7 +904,7 @@  discard block
 block discarded – undo
904 904
 		print "</td></tr>";
905 905
 	} else {
906 906
 		print "<tr>";
907
-		print '<td>' . $langs->trans("DateEndPeriod") . '</td><td>';
907
+		print '<td>'.$langs->trans("DateEndPeriod").'</td><td>';
908 908
 		print dol_print_date($object->dateep, 'day');
909 909
 		print '</td></tr>';
910 910
 	}
@@ -919,9 +919,9 @@  discard block
 block discarded – undo
919 919
 	print '</td></tr>';*/
920 920
 
921 921
 	if ($action == 'edit') {
922
-		print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>';
922
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>';
923 923
 	} else {
924
-		print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>';
924
+		print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
925 925
 	}
926 926
 
927 927
 	// Default mode of payment
@@ -1099,7 +1099,7 @@  discard block
 block discarded – undo
1099 1099
 			if (empty($user->socid)) {
1100 1100
 				$canSendMail = true;
1101 1101
 
1102
-				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail);
1102
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', $canSendMail);
1103 1103
 			}
1104 1104
 		}
1105 1105
 
@@ -1115,7 +1115,7 @@  discard block
 block discarded – undo
1115 1115
 
1116 1116
 		// Emit payment
1117 1117
 		if ($object->paye == 0 && ((price2num($object->amount) < 0 && $resteapayer < 0) || (price2num($object->amount) > 0 && $resteapayer > 0)) && $permissiontoadd) {
1118
-			print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='. $object->id, '');
1118
+			print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='.$object->id, '');
1119 1119
 		}
1120 1120
 
1121 1121
 		// Classify 'paid'
Please login to merge, or discard this patch.
htdocs/salaries/paiement_salary.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@
 block discarded – undo
107 107
 			// Create a line of payments
108 108
 			$paiement = new PaymentSalary($db);
109 109
 			$paiement->fk_salary    = $id;
110
-			$paiement->chid         = $id;	// deprecated
110
+			$paiement->chid         = $id; // deprecated
111 111
 			$paiement->datep        = $datepaye;
112 112
 			$paiement->amounts      = $amounts; // Tableau de montant
113 113
 			$paiement->fk_typepayment = GETPOST("paiementtype", 'alphanohtml');
Please login to merge, or discard this patch.
htdocs/intracommreport/card.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 $label = (string) GETPOST('label', 'alphanohtml');
51 51
 
52 52
 $exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB or DES
53
-$type_declaration = (string) GETPOST('type_declaration', 'alphanohtml');	// 'introduction' or 'expedition'
53
+$type_declaration = (string) GETPOST('type_declaration', 'alphanohtml'); // 'introduction' or 'expedition'
54 54
 
55 55
 $backtopage = GETPOST('backtopage', 'alpha');
56 56
 
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
 
125 125
 if ($action == 'add' && $permissiontoadd) {
126 126
 	$object->label = trim($label);
127
-	$object->exporttype = trim($exporttype);		// 'des' or 'deb'
128
-	$object->type_declaration =  $type_declaration;	// 'introduction' or 'expedition'
127
+	$object->exporttype = trim($exporttype); // 'des' or 'deb'
128
+	$object->type_declaration = $type_declaration; // 'introduction' or 'expedition'
129 129
 	//$object->subscription = (int) $subscription;
130 130
 
131 131
 	// Fill array 'array_options' with data from add form
Please login to merge, or discard this patch.
htdocs/intracommreport/class/intracommreport.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	public $picto = 'intracommreport';
57 57
 
58 58
 
59
-	public $label; 		// ref ???
59
+	public $label; // ref ???
60 60
 
61 61
 	public $period;
62 62
 
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 	 */
68 68
 	public $declaration_number;
69 69
 
70
-	public $exporttype;			// deb or des
71
-	public $type_declaration;	// 'introduction' or 'expedition'
70
+	public $exporttype; // deb or des
71
+	public $type_declaration; // 'introduction' or 'expedition'
72 72
 	public $numero_declaration;
73 73
 
74 74
 
Please login to merge, or discard this patch.