Completed
Branch develop (cec3a6)
by
unknown
19:26
created
htdocs/admin/contract.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
 $action = GETPOST('action', 'aZ09');
40 40
 $value = GETPOST('value', 'alpha');
41
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
41
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
42 42
 
43 43
 $label = GETPOST('label', 'alpha');
44 44
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
57 57
 
58
-$error=0;
58
+$error = 0;
59 59
 
60 60
 if ($action == 'updateMask') {
61 61
 	$maskconst = GETPOST('maskconstcontract', 'aZ09');
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 		setEventMessages($langs->trans('Error'), null, 'errors');
174 174
 	} else {
175 175
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
176
-		header("Location: " . $_SERVER["PHP_SELF"]);
176
+		header("Location: ".$_SERVER["PHP_SELF"]);
177 177
 		exit();
178 178
 	}
179 179
 } elseif (preg_match('/del_(.*)/', $action, $reg)) {
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 		setEventMessages($langs->trans('Error'), null, 'errors');
189 189
 	} else {
190 190
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
191
-		header("Location: " . $_SERVER["PHP_SELF"]);
191
+		header("Location: ".$_SERVER["PHP_SELF"]);
192 192
 		exit();
193 193
 	}
194 194
 }
Please login to merge, or discard this patch.
htdocs/hrm/position_note.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@
 block discarded – undo
28 28
 
29 29
 // Load Dolibarr environment
30 30
 require '../main.inc.php';
31
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
32
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
33
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
31
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
32
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
33
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
34 34
 
35 35
 // Load translation files required by the page
36 36
 $langs->loadLangs(array('hrm', 'companies'));
Please login to merge, or discard this patch.
htdocs/adherents/subscription/list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -256,7 +256,7 @@
 block discarded – undo
256 256
 
257 257
 $param = '';
258 258
 if (!empty($mode)) {
259
-	$param .='&mode='.urlencode($mode);
259
+	$param .= '&mode='.urlencode($mode);
260 260
 }
261 261
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
262 262
 	$param .= '&contextpage='.urlencode($contextpage);
Please login to merge, or discard this patch.
htdocs/compta/tva/index.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -245,12 +245,12 @@  discard block
 block discarded – undo
245 245
 
246 246
 	print '<table class="noborder centpercent">';
247 247
 	print '<tr class="liste_titre">';
248
-	print '<td width="30%">' . $langs->trans("Year") . '</td>';
249
-	print '<td class="right">' . $langs->trans("VATToPay") . '</td>';
250
-	print '<td class="right">' . $langs->trans("VATToCollect") . '</td>';
251
-	print '<td class="right">' . $langs->trans("Balance") . '</td>';
252
-	print '<td>&nbsp;</td>' . "\n";
253
-	print '</tr>' . "\n";
248
+	print '<td width="30%">'.$langs->trans("Year").'</td>';
249
+	print '<td class="right">'.$langs->trans("VATToPay").'</td>';
250
+	print '<td class="right">'.$langs->trans("VATToCollect").'</td>';
251
+	print '<td class="right">'.$langs->trans("Balance").'</td>';
252
+	print '<td>&nbsp;</td>'."\n";
253
+	print '</tr>'."\n";
254 254
 
255 255
 	$tmp = dol_getdate($date_start);
256 256
 	$y = $tmp['year'];
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
 
395 395
 
396 396
 		print '<tr class="oddeven">';
397
-		print '<td class="nowrap"><a href="' . DOL_URL_ROOT . '/compta/tva/quadri_detail.php?leftmenu=tax_vat&month=' . $m . '&year=' . $y . '">' . dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y") . '</a></td>';
397
+		print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
398 398
 
399 399
 		$x_coll_sum = 0;
400 400
 		foreach (array_keys($x_coll) as $rate) {
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 				$x_coll_sum += $temp_vat;
435 435
 			}
436 436
 		}
437
-		print '<td class="nowrap right"><span class="amount">' . price(price2num($x_coll_sum, 'MT')) . '</span></td>';
437
+		print '<td class="nowrap right"><span class="amount">'.price(price2num($x_coll_sum, 'MT')).'</span></td>';
438 438
 
439 439
 		$x_paye_sum = 0;
440 440
 		foreach (array_keys($x_paye) as $rate) {
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
 				$x_paye_sum += $temp_vat;
475 475
 			}
476 476
 		}
477
-		print '<td class="nowrap right"><span class="amount">' . price(price2num($x_paye_sum, 'MT')) . '</span></td>';
477
+		print '<td class="nowrap right"><span class="amount">'.price(price2num($x_paye_sum, 'MT')).'</span></td>';
478 478
 
479 479
 		$subtotalcoll = $subtotalcoll + $x_coll_sum;
480 480
 		$subtotalpaid = $subtotalpaid + $x_paye_sum;
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
483 483
 		$total = $total + $diff;
484 484
 		$subtotal = price2num($subtotal + $diff, 'MT');
485 485
 
486
-		print '<td class="nowrap right"><span class="amount">' . price(price2num($diff, 'MT')) . '</span></td>' . "\n";
486
+		print '<td class="nowrap right"><span class="amount">'.price(price2num($diff, 'MT')).'</span></td>'."\n";
487 487
 		print "<td>&nbsp;</td>\n";
488 488
 		print "</tr>\n";
489 489
 
@@ -492,10 +492,10 @@  discard block
 block discarded – undo
492 492
 		$m++;
493 493
 		if ($i > 2) {
494 494
 			print '<tr class="liste_total">';
495
-			print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q=' . round($m / 3) . '&year=' . $y . '">' . $langs->trans("SubTotal") . '</a>:</td>';
496
-			print '<td class="nowrap right">' . price(price2num($subtotalcoll, 'MT')) . '</td>';
497
-			print '<td class="nowrap right">' . price(price2num($subtotalpaid, 'MT')) . '</td>';
498
-			print '<td class="nowrap right">' . price(price2num($subtotal, 'MT')) . '</td>';
495
+			print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
496
+			print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
497
+			print '<td class="nowrap right">'.price(price2num($subtotalpaid, 'MT')).'</td>';
498
+			print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
499 499
 			print '<td>&nbsp;</td></tr>';
500 500
 			$i = 0;
501 501
 			$subtotalcoll = 0;
@@ -503,7 +503,7 @@  discard block
 block discarded – undo
503 503
 			$subtotal = 0;
504 504
 		}
505 505
 	}
506
-	print '<tr class="liste_total"><td class="right" colspan="3">' . $langs->trans("TotalToPay") . ':</td><td class="nowrap right">' . price(price2num($total, 'MT')) . '</td>';
506
+	print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
507 507
 	print "<td>&nbsp;</td>\n";
508 508
 	print '</tr>';
509 509
 
@@ -521,18 +521,18 @@  discard block
 block discarded – undo
521 521
 	$sql = '';
522 522
 
523 523
 	$sql .= "SELECT SUM(amount) as mm, date_format(tva.datev,'%Y-%m') as dm, 'claimed' as mode";
524
-	$sql .= " FROM " . MAIN_DB_PREFIX . "tva as tva";
525
-	$sql .= " WHERE tva.entity = " . $conf->entity;
526
-	$sql .= " AND (tva.datev >= '" . $db->idate($date_start) . "' AND tva.datev <= '" . $db->idate($date_end) . "')";
524
+	$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva";
525
+	$sql .= " WHERE tva.entity = ".$conf->entity;
526
+	$sql .= " AND (tva.datev >= '".$db->idate($date_start)."' AND tva.datev <= '".$db->idate($date_end)."')";
527 527
 	$sql .= " GROUP BY dm";
528 528
 
529 529
 	$sql .= " UNION ";
530 530
 
531 531
 	$sql .= "SELECT SUM(ptva.amount) as mm, date_format(tva.datev,'%Y-%m') as dm, 'paid' as mode";
532
-	$sql .= " FROM " . MAIN_DB_PREFIX . "tva as tva";
533
-	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "payment_vat as ptva ON (tva.rowid = ptva.fk_tva)";
534
-	$sql .= " WHERE tva.entity = " . $conf->entity;
535
-	$sql .= " AND (tva.datev >= '" . $db->idate($date_start) . "' AND tva.datev <= '" . $db->idate($date_end) . "')";
532
+	$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva";
533
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_vat as ptva ON (tva.rowid = ptva.fk_tva)";
534
+	$sql .= " WHERE tva.entity = ".$conf->entity;
535
+	$sql .= " AND (tva.datev >= '".$db->idate($date_start)."' AND tva.datev <= '".$db->idate($date_end)."')";
536 536
 	$sql .= " GROUP BY dm";
537 537
 
538 538
 	$sql .= " ORDER BY dm ASC, mode ASC";
Please login to merge, or discard this patch.
htdocs/core/modules/mailings/contacts1.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 	 */
121 121
 	public function formFilter()
122 122
 	{
123
-		global $conf,$langs;
123
+		global $conf, $langs;
124 124
 
125 125
 		// Load translation files required by the page
126 126
 		$langs->loadLangs(array("commercial", "companies", "suppliers", "categories"));
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		$sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
132 132
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
133 133
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
134
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
134
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
135 135
 		$sql .= " AND sp.statut = 1";
136 136
 		$sql .= " AND (sp.poste IS NOT NULL AND sp.poste <> '')";
137 137
 		$sql .= " GROUP BY sp.poste";
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
167 167
 		$sql .= " ".MAIN_DB_PREFIX."categorie_contact as cs";
168 168
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
169
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
169
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
170 170
 		$sql .= " AND sp.statut = 1";
171 171
 		$sql .= " AND cs.fk_categorie = c.rowid";
172 172
 		$sql .= " AND cs.fk_socpeople = sp.rowid";
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
240 240
 		$sql .= " ".MAIN_DB_PREFIX."categorie_societe as cs";
241 241
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
242
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
242
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
243 243
 		$sql .= " AND sp.statut = 1";
244 244
 		$sql .= " AND cs.fk_categorie = c.rowid";
245 245
 		$sql .= " AND cs.fk_soc = sp.fk_soc";
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
277 277
 		$sql .= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
278 278
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
279
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
279
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
280 280
 		$sql .= " AND sp.statut = 1";
281 281
 		$sql .= " AND cs.fk_categorie = c.rowid";
282 282
 		$sql .= " AND cs.fk_soc = sp.fk_soc";
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
434 434
 
435 435
 		// Filter on job position
436 436
 		$key = $filter_jobposition;
437
-		if (!empty($key) && $key != 'all'  && $key != '-1') {
437
+		if (!empty($key) && $key != 'all' && $key != '-1') {
438 438
 			$sql .= " AND sp.poste = '".$this->db->escape($key)."'";
439 439
 		}
440 440
 
Please login to merge, or discard this patch.
htdocs/recruitment/recruitmentcandidature_card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -426,7 +426,7 @@
 block discarded – undo
426 426
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
427 427
 
428 428
 	$morehtmlref = '<div class="refidno">';
429
-	$morehtmlref.= $object->getFullName('', 1);
429
+	$morehtmlref .= $object->getFullName('', 1);
430 430
 	/*
431 431
 	 // Ref customer
432 432
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
Please login to merge, or discard this patch.
htdocs/recruitment/recruitmentcandidature_agenda.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
144 144
 
145 145
 	$morehtmlref = '<div class="refidno">';
146
-	$morehtmlref.= $object->getFullName('', 1);
146
+	$morehtmlref .= $object->getFullName('', 1);
147 147
 	/*
148 148
 	// Ref customer
149 149
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
Please login to merge, or discard this patch.
htdocs/recruitment/recruitmentcandidature_note.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@
 block discarded – undo
96 96
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
97 97
 
98 98
 	$morehtmlref = '<div class="refidno">';
99
-	$morehtmlref.= $object->getFullName('', 1);
99
+	$morehtmlref .= $object->getFullName('', 1);
100 100
 	/*
101 101
 	 // Ref customer
102 102
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
Please login to merge, or discard this patch.
htdocs/recruitment/recruitmentcandidature_document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -426,7 +426,7 @@
 block discarded – undo
426 426
 	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentcandidature_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
427 427
 
428 428
 	$morehtmlref = '<div class="refidno">';
429
-	$morehtmlref.= $object->getFullName('', 1);
429
+	$morehtmlref .= $object->getFullName('', 1);
430 430
 	/*
431 431
 	 // Ref customer
432 432
 	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
Please login to merge, or discard this patch.