Completed
Branch develop (68d67a)
by
unknown
16:20
created
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 				if ($idbankfordirectdebit > 0) {
245 245
 					$tmpbankfordirectdebit = new Account($this->db);
246 246
 					$tmpbankfordirectdebit->fetch($idbankfordirectdebit);
247
-					$ics = $tmpbankfordirectdebit->ics;	// ICS for direct debit
247
+					$ics = $tmpbankfordirectdebit->ics; // ICS for direct debit
248 248
 				}
249 249
 				if (empty($ics) && !empty($conf->global->PRELEVEMENT_ICS)) {
250 250
 					$ics = $conf->global->PRELEVEMENT_ICS;
@@ -313,9 +313,9 @@  discard block
 block discarded – undo
313 313
 
314 314
 				$address = '______________________________________________';
315 315
 				if ($thirdparty->id > 0) {
316
-					$tmpaddresswithoutcountry = $thirdparty->getFullAddress();	// we test on address without country
316
+					$tmpaddresswithoutcountry = $thirdparty->getFullAddress(); // we test on address without country
317 317
 					if ($tmpaddresswithoutcountry) {
318
-						$address = $thirdparty->getFullAddress(1);	// full address
318
+						$address = $thirdparty->getFullAddress(1); // full address
319 319
 					}
320 320
 				}
321 321
 				$posY = $pdf->GetY();
Please login to merge, or discard this patch.
htdocs/core/modules/product/doc/pdf_standard.modules.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -294,20 +294,20 @@
 block discarded – undo
294 294
 					$nexY = $pdf->GetY();
295 295
 				}
296 296
 				if ($object->length) {
297
-					$texttoshow = $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . ': ' . ($object->length != '' ? $object->length : '?') . ' x ' . ($object->width != '' ? $object->width : '?') . ' x ' . ($object->height != '' ? $object->height : '?');
298
-					$texttoshow .= ' ' . measuringUnitString(0, "size", $object->length_units);
297
+					$texttoshow = $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?');
298
+					$texttoshow .= ' '.measuringUnitString(0, "size", $object->length_units);
299 299
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
300 300
 					$nexY = $pdf->GetY();
301 301
 				}
302 302
 				if ($object->surface) {
303
-					$texttoshow = $langs->trans("Surface") . ': ' . dol_htmlentitiesbr($object->surface);
304
-					$texttoshow .= ' ' . measuringUnitString(0, "surface", $object->surface_units);
303
+					$texttoshow = $langs->trans("Surface").': '.dol_htmlentitiesbr($object->surface);
304
+					$texttoshow .= ' '.measuringUnitString(0, "surface", $object->surface_units);
305 305
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
306 306
 					$nexY = $pdf->GetY();
307 307
 				}
308 308
 				if ($object->volume) {
309
-					$texttoshow = $langs->trans("Volume") . ': ' . dol_htmlentitiesbr($object->volume);
310
-					$texttoshow .= ' ' . measuringUnitString(0, "volume", $object->volume_units);
309
+					$texttoshow = $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume);
310
+					$texttoshow .= ' '.measuringUnitString(0, "volume", $object->volume_units);
311 311
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
312 312
 					$nexY = $pdf->GetY();
313 313
 				}
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -714,7 +714,9 @@
 block discarded – undo
714 714
 		global $conf, $langs, $hookmanager;
715 715
 
716 716
 		$ltrdirection = 'L';
717
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
717
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
718
+			$ltrdirection = 'R';
719
+		}
718 720
 
719 721
 		// Load traductions files required by page
720 722
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills", "orders"));
Please login to merge, or discard this patch.
htdocs/core/modules/propale/doc/pdf_azur.modules.php 2 patches
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -459,8 +459,12 @@  discard block
 block discarded – undo
459 459
 
460 460
 
461 461
 					$creator_info = $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
462
-					if ($tmpuser->email) $creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
463
-					if ($tmpuser->office_phone) $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
462
+					if ($tmpuser->email) {
463
+						$creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
464
+					}
465
+					if ($tmpuser->office_phone) {
466
+						$creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
467
+					}
464 468
 
465 469
 					$notetoshow = dol_concatdesc($notetoshow, $creator_info);
466 470
 				}
@@ -1439,7 +1443,9 @@  discard block
 block discarded – undo
1439 1443
 		global $conf, $langs;
1440 1444
 
1441 1445
 		$ltrdirection = 'L';
1442
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
1446
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
1447
+			$ltrdirection = 'R';
1448
+		}
1443 1449
 
1444 1450
 		// Load traductions files required by page
1445 1451
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -908,7 +908,7 @@  discard block
 block discarded – undo
908 908
 			$pdf->SetXY($this->marge_gauche, $posy);
909 909
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
910 910
 			$pdf->MultiCell(80, 4, $titre, 0, 'L');
911
-			$pdf->SetFont('', '', $default_font_size -$diffsizetitle);
911
+			$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
912 912
 			$pdf->SetXY($posxval, $posy);
913 913
 			$dlp = dol_print_date($object->delivery_date, $displaydate, false, $outputlangs, true);
914 914
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
@@ -1663,7 +1663,7 @@  discard block
 block discarded – undo
1663 1663
 
1664 1664
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
1665 1665
 
1666
-			$mode =  'target';
1666
+			$mode = 'target';
1667 1667
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
1668 1668
 
1669 1669
 			// Show recipient
Please login to merge, or discard this patch.
htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 	$h = 0;
38 38
 	$head = array();
39 39
 
40
-	$withProjectUrl='';
41
-	if ($with_project>0) {
40
+	$withProjectUrl = '';
41
+	if ($with_project > 0) {
42 42
 		$withProjectUrl = "&withproject=1";
43 43
 	}
44 44
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	$head[$h][2] = 'conferenceorbooth';
132 132
 	// Enable caching of conf or booth count attendees
133 133
 	$nbAttendees = 0;
134
-	$nbConferenceOrBooth= 0;
134
+	$nbConferenceOrBooth = 0;
135 135
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
136 136
 	$cachekey = 'count_conferenceorbooth_project_'.$object->id;
137 137
 	$dataretrieved = dol_getcache($cachekey);
@@ -139,14 +139,14 @@  discard block
 block discarded – undo
139 139
 		$nbAttendees = $dataretrieved;
140 140
 	} else {
141 141
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
142
-		$conforbooth=new ConferenceOrBooth($db);
142
+		$conforbooth = new ConferenceOrBooth($db);
143 143
 		$result = $conforbooth->fetchAll('', '', 0, 0, array('t.fk_project'=>$object->id));
144
-		if (!is_array($result) && $result<0) {
144
+		if (!is_array($result) && $result < 0) {
145 145
 			setEventMessages($conforbooth->error, $conforbooth->errors, 'errors');
146 146
 		} else {
147 147
 			$nbConferenceOrBooth = count($result);
148 148
 		}
149
-		dol_setcache($cachekey, $nbConferenceOrBooth, 120);	// If setting cache fails, this is not a problem, so we do not test result.
149
+		dol_setcache($cachekey, $nbConferenceOrBooth, 120); // If setting cache fails, this is not a problem, so we do not test result.
150 150
 	}
151 151
 	if ($nbConferenceOrBooth > 0) {
152 152
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbConferenceOrBooth.'</span>';
@@ -165,14 +165,14 @@  discard block
 block discarded – undo
165 165
 		$nbAttendees = $dataretrieved;
166 166
 	} else {
167 167
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
168
-		$attendees=new ConferenceOrBoothAttendee($db);
168
+		$attendees = new ConferenceOrBoothAttendee($db);
169 169
 		$result = $attendees->fetchAll('', '', 0, 0, array('t.fk_project'=>$object->id));
170
-		if (!is_array($result) && $result<0) {
170
+		if (!is_array($result) && $result < 0) {
171 171
 			setEventMessages($attendees->error, $attendees->errors, 'errors');
172 172
 		} else {
173 173
 			$nbAttendees = count($result);
174 174
 		}
175
-		dol_setcache($cachekey, $nbAttendees, 120);	// If setting cache fails, this is not a problem, so we do not test result.
175
+		dol_setcache($cachekey, $nbAttendees, 120); // If setting cache fails, this is not a problem, so we do not test result.
176 176
 	}
177 177
 	if ($nbAttendees > 0) {
178 178
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbAttendees.'</span>';
Please login to merge, or discard this patch.
htdocs/workstation/class/workstation.class.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -856,7 +856,9 @@
 block discarded – undo
856 856
 
857 857
 		$statusType = 'status'.$status;
858 858
 		//if ($status == self::STATUS_DISABLED) $statusType = 'status6';
859
-		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
859
+		if ($status == self::STATUS_ENABLED) {
860
+			$statusType = 'status4';
861
+		}
860 862
 
861 863
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
862 864
 	}
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	/**
98 98
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
99 99
 	 */
100
-	public $fields=array(
100
+	public $fields = array(
101 101
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
102 102
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'default'=>'', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
103 103
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'showoncombobox'=>'2',),
@@ -110,14 +110,14 @@  discard block
 block discarded – undo
110 110
 		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
111 111
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>512, 'notnull'=>-1, 'visible'=>-2,),
112 112
 		'nb_operators_required' => array('type'=>'integer', 'label'=>'NbOperatorsRequired', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
113
-		'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMOperatorEstimatedHelp','label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right'),
113
+		'thm_operator_estimated' => array('type'=>'double', 'help'=>'THMOperatorEstimatedHelp', 'label'=>'THMOperatorEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right'),
114 114
 		'thm_machine_estimated' => array('type'=>'double', 'help'=>'THMMachineEstimatedHelp', 'label'=>'THMMachineEstimated', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'css'=>'right'),
115 115
 		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'default'=>1, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Disabled', '1'=>'Enabled'),),
116 116
 	);
117 117
 	public $rowid;
118 118
 	public $ref;
119 119
 	public $label;
120
-	public $type;	// HUMAN, MACHINE, ...
120
+	public $type; // HUMAN, MACHINE, ...
121 121
 
122 122
 	public $date_creation;
123 123
 	public $tms;
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 		// Usergroups
457 457
 		$groups = GETPOST('groups', 'array:int');
458 458
 		WorkstationUserGroup::deleteAllGroupsOfWorkstation($this->id);
459
-		$this->usergroups=array();
459
+		$this->usergroups = array();
460 460
 
461 461
 		foreach ($groups as $id_group) {
462 462
 			$ws_usergroup = new WorkstationUserGroup($this->db);
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 		// Resources
470 470
 		$resources = GETPOST('resources', 'array:int');
471 471
 		WorkstationResource::deleteAllResourcesOfWorkstation($this->id);
472
-		$this->resources=array();
472
+		$this->resources = array();
473 473
 		if (!empty($resources)) {
474 474
 			foreach ($resources as $id_resource) {
475 475
 				$ws_resource = new WorkstationResource($this->db);
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
 				$label = $langs->trans("ShowWorkstation");
637 637
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
638 638
 			}
639
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
639
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
640 640
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
641 641
 		} else {
642 642
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
Please login to merge, or discard this patch.
htdocs/core/modules/takepos/mod_takepos_ref_simple.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 */
77 77
 	public function getExample()
78 78
 	{
79
-		return $this->prefix.'0-0501-0001';		// TC0-0501-0001
79
+		return $this->prefix.'0-0501-0001'; // TC0-0501-0001
80 80
 	}
81 81
 
82 82
 	/**
@@ -92,10 +92,10 @@  discard block
 block discarded – undo
92 92
 		$pryymm = '';
93 93
 		$max = '';
94 94
 
95
-		$pos_source = 0;	// POS source = Terminal ID
95
+		$pos_source = 0; // POS source = Terminal ID
96 96
 
97 97
 		// First, we get the max value
98
-		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;	// So posindice is position after TCX-YYMM-
98
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM-
99 99
 
100 100
 		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
101 101
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
@@ -135,10 +135,10 @@  discard block
 block discarded – undo
135 135
 	{
136 136
 		global $db;
137 137
 
138
-		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;	// POS source = Terminal ID
138
+		$pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID
139 139
 
140 140
 		// First, we get the max value
141
-		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1;	// So posindice is position after TCX-YYMM-
141
+		$posindice = strlen($this->prefix.$pos_source.'-____-') + 1; // So posindice is position after TCX-YYMM-
142 142
 		$sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
143 143
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
144 144
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix.$pos_source."-____-%")."'";
Please login to merge, or discard this patch.
htdocs/societe/ajax/company.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 	$match = preg_grep('/('.preg_quote($htmlname, '/').'[0-9]+)/', array_keys($_GET));
106 106
 	sort($match);
107 107
 
108
-	$id = (!empty($match[0]) ? $match[0] : '');		// Take first key found into GET array with matching $htmlname123
108
+	$id = (!empty($match[0]) ? $match[0] : ''); // Take first key found into GET array with matching $htmlname123
109 109
 
110 110
 	// When used from jQuery, the search term is added as GET param "term".
111 111
 	$searchkey = (($id && GETPOST($id, 'alpha')) ? GETPOST($id, 'alpha') : (($htmlname && GETPOST($htmlname, 'alpha')) ?GETPOST($htmlname, 'alpha') : ''));
Please login to merge, or discard this patch.
htdocs/projet/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 }
53 53
 
54 54
 // Get parameters
55
-$limit 		= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
55
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
56 56
 $sortfield	= GETPOST('sortfield', 'aZ09comma');
57 57
 $sortorder	= GETPOST('sortorder', 'aZ09comma');
58 58
 $page		= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
Please login to merge, or discard this patch.
htdocs/hrm/class/skillrank.class.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 
28 28
 // Put here all includes required by your class file
29 29
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
30
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skillrank.lib.php';
30
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skillrank.lib.php';
31 31
 
32 32
 /**
33 33
  * Class for SkillRank
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	/**
105 105
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
106 106
 	 */
107
-	public $fields=array(
107
+	public $fields = array(
108 108
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
109 109
 		'fk_skill' => array('type'=>'integer:Skill:hrm/class/skill.class.php:1', 'label'=>'Skill', 'enabled'=>'1', 'position'=>3, 'notnull'=>1, 'visible'=>1, 'index'=>1,),
110 110
 		'rankorder' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>'1', 'position'=>4, 'notnull'=>1, 'visible'=>1, 'default' => 0),
@@ -371,13 +371,13 @@  discard block
 block discarded – undo
371 371
 		global $user;
372 372
 
373 373
 		$this->fk_skill 		= $currentSkill->fk_skill;
374
-		$this->rankorder 			= $currentSkill->rankorder;
374
+		$this->rankorder = $currentSkill->rankorder;
375 375
 		$this->fk_object		= $fk_user;
376 376
 		$this->date_creation 	= dol_now();
377 377
 		$this->fk_user_creat 	= $user->id;
378 378
 		$this->fk_user_modif 	= $user->id;
379
-		$this->objecttype	 	= self::SKILLRANK_TYPE_USER;
380
-		$result =  $this->create($user);
379
+		$this->objecttype = self::SKILLRANK_TYPE_USER;
380
+		$result = $this->create($user);
381 381
 
382 382
 		return $result;
383 383
 	}
Please login to merge, or discard this patch.