Completed
Branch develop (6e18d1)
by
unknown
20:21
created
htdocs/fourn/class/fournisseur.commande.dispatch.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -221,7 +221,7 @@
 block discarded – undo
221 221
 
222 222
 			if (!$notrigger) {
223 223
 				// Call triggers
224
-				$result=$this->call_trigger('LINERECEPTION_CREATE', $user);
224
+				$result = $this->call_trigger('LINERECEPTION_CREATE', $user);
225 225
 				if ($result < 0) {
226 226
 					$error++;
227 227
 				}
Please login to merge, or discard this patch.
htdocs/core/actions_dellink.inc.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,9 @@
 block discarded – undo
51 51
 			$object->fetch($id);
52 52
 			$object->fetch_thirdparty();
53 53
 			$result = $object->add_object_linked($addlink, $objecttmp->id);
54
-			if (isset($_POST['reftolinkto'])) unset($_POST['reftolinkto']);
54
+			if (isset($_POST['reftolinkto'])) {
55
+				unset($_POST['reftolinkto']);
56
+			}
55 57
 		} elseif ($ret < 0) {
56 58
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
57 59
 		} else {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
 if ($action == 'addlinkbyref' && !empty($permissiondellink) && !$cancellink && $id > 0 && !empty($addlinkref) && !empty($conf->global->MAIN_LINK_BY_REF_IN_LINKTO)) {
44 44
 	$element_prop = getElementProperties($addlink);
45 45
 	if (is_array($element_prop)) {
46
-		dol_include_once('/' . $element_prop['classpath'] . '/' . $element_prop['classfile'] . '.class.php');
46
+		dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');
47 47
 
48 48
 		$objecttmp = new $element_prop['classname']($db);
49 49
 		$ret = $objecttmp->fetch(0, $addlinkref);
Please login to merge, or discard this patch.
htdocs/eventorganization/tpl/linkedobjectblock.tpl.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,22 +34,22 @@
 block discarded – undo
34 34
 $total = 0;
35 35
 foreach ($linkedObjectBlock as $key => $objectlink) {
36 36
 	echo '<tr class="oddeven">';
37
-	echo '<td>' . $langs->trans(get_class($objectlink)) . '</td>';
37
+	echo '<td>'.$langs->trans(get_class($objectlink)).'</td>';
38 38
 	echo '<td>'.$objectlink->getNomUrl(1).'</td>';
39 39
 	echo '<td class="center">';
40
-	if (get_class($objectlink)=='ConferenceOrBooth') {
40
+	if (get_class($objectlink) == 'ConferenceOrBooth') {
41 41
 		print  dol_trunc($objectlink->label, 20);
42 42
 	}
43 43
 	print '</td>';
44 44
 	echo '<td class="center">';
45
-	if (get_class($objectlink)=='ConferenceOrBoothAttendee') {
45
+	if (get_class($objectlink) == 'ConferenceOrBoothAttendee') {
46 46
 		print dol_print_date($objectlink->date_subscription);
47 47
 	} else {
48 48
 		print dol_print_date($objectlink->datep);
49 49
 	}
50 50
 	print '</td>';
51 51
 	echo '<td class="right">';
52
-	if (get_class($objectlink)=='ConferenceOrBoothAttendee') {
52
+	if (get_class($objectlink) == 'ConferenceOrBoothAttendee') {
53 53
 		print price($objectlink->amount);
54 54
 	}
55 55
 	print '</td>';
Please login to merge, or discard this patch.
htdocs/imports/emptyexample.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -102,8 +102,8 @@
 block discarded – undo
102 102
 
103 103
 
104 104
 // List of targets fields
105
-$headerlinefields = array();	// Array of fields (label to show)
106
-$contentlinevalues = array();	// Array of example values
105
+$headerlinefields = array(); // Array of fields (label to show)
106
+$contentlinevalues = array(); // Array of example values
107 107
 $i = 0;
108 108
 foreach ($fieldstarget as $code => $label) {
109 109
 	$withoutstar = preg_replace('/\*/', '', $fieldstarget[$code]);
Please login to merge, or discard this patch.
htdocs/blockedlog/admin/blockedlog.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@
 block discarded – undo
80 80
 $block_static->loadTrackedEvents();
81 81
 
82 82
 $title = $langs->trans("BlockedLogSetup");
83
-$help_url="EN:Module_Unalterable_Archives_-_Logs|FR:Module_Archives_-_Logs_Inaltérable";
83
+$help_url = "EN:Module_Unalterable_Archives_-_Logs|FR:Module_Archives_-_Logs_Inaltérable";
84 84
 
85 85
 llxHeader('', $title, $help_url);
86 86
 
Please login to merge, or discard this patch.
htdocs/core/modules/modBlockedLog.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@
 block discarded – undo
170 170
 		$sql = array();
171 171
 
172 172
 		// If already used, we add an entry to show we enable module
173
-		require_once DOL_DOCUMENT_ROOT . '/blockedlog/class/blockedlog.class.php';
173
+		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
174 174
 
175 175
 		$object = new stdClass();
176 176
 		$object->id = 1;
Please login to merge, or discard this patch.
htdocs/compta/bank/card.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,9 @@
 block discarded – undo
75 75
 
76 76
 $parameters = array();
77 77
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
78
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
78
+if ($reshook < 0) {
79
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
80
+}
79 81
 
80 82
 if (empty($reshook)) {
81 83
 	$backurlforlist = DOL_URL_ROOT.'/compta/bank/list.php';
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
222 222
 
223 223
 			if (empty($noback)) {
224
-				header("Location: " . $urltogo);
224
+				header("Location: ".$urltogo);
225 225
 				exit;
226 226
 			}
227 227
 		} else {
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 
338 338
 		if ($result > 0) {
339 339
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
340
-			header("Location: " . DOL_URL_ROOT . "/compta/bank/list.php");
340
+			header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
341 341
 			exit;
342 342
 		} else {
343 343
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
 
583 583
 		if (isModEnabled('paymentbybanktransfer')) {
584 584
 			print '<tr><td>'.$form->textwithpicto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation"), $langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp")).'</td>';
585
-			print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'. (empty(GETPOST('pti_in_ctti')) ? '' : ' checked ') . '>';
585
+			print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'.(empty(GETPOST('pti_in_ctti')) ? '' : ' checked ').'>';
586 586
 			print '</td></tr>';
587 587
 		}
588 588
 		print '</table>';
@@ -1125,14 +1125,14 @@  discard block
 block discarded – undo
1125 1125
 			$tooltip = $langs->trans("Example").':<br>CH93 0076 2011 6238 5295 7<br>LT12 1000 0111 0100 1000<br>FR14 2004 1010 0505 0001 3M02 606<br>LU28 0019 4006 4475 0000<br>DE89 3704 0044 0532 0130 00';
1126 1126
 			print $form->textwithpicto($langs->trans($ibankey), $tooltip);
1127 1127
 			print '</td>';
1128
-			print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban',  'alphanohtml') : $object->iban).'"></td></tr>';
1128
+			print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban', 'alphanohtml') : $object->iban).'"></td></tr>';
1129 1129
 
1130 1130
 			// BIC
1131 1131
 			print '<tr><td>';
1132 1132
 			$tooltip = $langs->trans("Example").': LIABLT2XXXX';
1133 1133
 			print $form->textwithpicto($langs->trans($bickey), $tooltip);
1134 1134
 			print '</td>';
1135
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic',  'alphanohtml') : $object->bic).'"></td></tr>';
1135
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic', 'alphanohtml') : $object->bic).'"></td></tr>';
1136 1136
 
1137 1137
 			// Show fields of bank account
1138 1138
 			foreach ($object->getFieldsToShow() as $val) {
@@ -1170,7 +1170,7 @@  discard block
 block discarded – undo
1170 1170
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.(GETPOSTISSET('ics_transfer') ? GETPOST('ics_transfer', 'alphanohtml') : $object->ics_transfer).'"></td></tr>';
1171 1171
 
1172 1172
 				print '<tr><td>'.$form->textwithpicto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation"), $langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp")).'</td>';
1173
-				print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'. ($object->pti_in_ctti ? ' checked ' : '') . '>';
1173
+				print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'.($object->pti_in_ctti ? ' checked ' : '').'>';
1174 1174
 				print '</td></tr>';
1175 1175
 			}
1176 1176
 
Please login to merge, or discard this patch.
htdocs/core/modules/modMrp.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -268,9 +268,9 @@  discard block
 block discarded – undo
268 268
 		// Exports profiles provided by this module
269 269
 		$r = 1;
270 270
 
271
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
272
-		$this->export_label[$r]='MOs';	// Translation key (used only if key ExportDataset_xxx_z not found)
273
-		$this->export_icon[$r]='mrp';
271
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
272
+		$this->export_label[$r] = 'MOs'; // Translation key (used only if key ExportDataset_xxx_z not found)
273
+		$this->export_icon[$r] = 'mrp';
274 274
 		$this->export_fields_array[$r] = array(
275 275
 			'm.rowid'=>"Id",
276 276
 			'm.ref'=>"Ref",
@@ -350,9 +350,9 @@  discard block
 block discarded – undo
350 350
 		 $r++; */
351 351
 		/* END MODULEBUILDER IMPORT MO */
352 352
 		$r++;
353
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
354
-		$this->import_label[$r]='MOs';	// Translation key (used only if key ExportDataset_xxx_z not found)
355
-		$this->import_icon[$r]='mrp';
353
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
354
+		$this->import_label[$r] = 'MOs'; // Translation key (used only if key ExportDataset_xxx_z not found)
355
+		$this->import_icon[$r] = 'mrp';
356 356
 		$this->import_entities_array[$r] = array(); // We define here only fields that use a different icon from the one defined in import_icon
357 357
 		$this->import_tables_array[$r] = array('m'=>MAIN_DB_PREFIX.'mrp_mo', 'extra'=>MAIN_DB_PREFIX.'mrp_mo_extrafields');
358 358
 		$this->import_tables_creator_array[$r] = array('m'=>'fk_user_creat'); // Fields to store import user id
Please login to merge, or discard this patch.
htdocs/core/modules/mrp/doc/pdf_vinci.modules.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 		$this->db = $db;
137 137
 		$this->name = "vinci";
138 138
 		$this->description = $langs->trans('DocumentModelStandardPDF');
139
-		$this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
139
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
140 140
 
141 141
 		// Page size for A4 format
142 142
 		$this->type = 'pdf';
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
 					if ($this->getColumnStatus('desc')) {
565 565
 						$pdf->startTransaction(); //description
566 566
 						$des = $prod -> description;
567
-						$descr = $des;//implode("<br>", $des);
567
+						$descr = $des; //implode("<br>", $des);
568 568
 
569 569
 						$this->printStdColumnContent($pdf, $curY, 'desc', $descr);
570 570
 
@@ -1199,7 +1199,7 @@  discard block
 block discarded – undo
1199 1199
 		$pdf->SetFont('', 'B', $default_font_size + 3);
1200 1200
 		$pdf->SetXY($posx, $posy);
1201 1201
 		$pdf->SetTextColor(0, 0, 60);
1202
-		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("QtyToProduce").": " .$object->qty, '', 'R');
1202
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("QtyToProduce").": ".$object->qty, '', 'R');
1203 1203
 
1204 1204
 
1205 1205
 		$pdf->SetTextColor(0, 0, 60);
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1120,7 +1120,9 @@
 block discarded – undo
1120 1120
 		global $langs, $conf, $mysoc;
1121 1121
 
1122 1122
 		$ltrdirection = 'L';
1123
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
1123
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
1124
+			$ltrdirection = 'R';
1125
+		}
1124 1126
 
1125 1127
 		// Load translation files required by the page
1126 1128
 		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings"));
Please login to merge, or discard this patch.