Completed
Branch develop (7c20dc)
by
unknown
22:47
created
htdocs/product/traduction.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -134,15 +134,15 @@  discard block
 block discarded – undo
134 134
 
135 135
 		foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet
136 136
 			if ($key == $current_lang) {
137
-				$object->label = GETPOST("libelle-" . $key);
138
-				$object->description = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
139
-				$object->other = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
137
+				$object->label = GETPOST("libelle-".$key);
138
+				$object->description = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
139
+				$object->other = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
140 140
 
141 141
 				$object->update($object->id, $user);
142 142
 			} else {
143
-				$object->multilangs[$key]["label"] = GETPOST("libelle-" . $key);
144
-				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
145
-				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
143
+				$object->multilangs[$key]["label"] = GETPOST("libelle-".$key);
144
+				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
145
+				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
146 146
 			}
147 147
 		}
148 148
 
@@ -235,9 +235,9 @@  discard block
 block discarded – undo
235 235
 if (empty($reshook)) {
236 236
 	if ($action == '') {
237 237
 		if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
238
-			print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=add&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Add") . '</a>';
238
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Add").'</a>';
239 239
 			if ($cnt_trans > 0) {
240
-				print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=edit&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Modify") . '</a>';
240
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
241 241
 			}
242 242
 		}
243 243
 	}
Please login to merge, or discard this patch.
htdocs/product/dynamic_price/class/price_parser.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
 		));
156 156
 
157 157
 		// Retrieve all extrafields if not already not know (should not happen)
158
-		if (! is_object($extrafields)) {
158
+		if (!is_object($extrafields)) {
159 159
 			$extrafields = new ExtraFields($this->db);
160 160
 			$extrafields->fetch_name_optionals_label($product->table_element);
161 161
 		}
Please login to merge, or discard this patch.
htdocs/product/stats/facture_fournisseur.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -246,7 +246,7 @@
 block discarded – undo
246 246
 						$supplierinvoicestatic->id = $objp->facid;
247 247
 						$supplierinvoicestatic->ref = $objp->ref;
248 248
 						$supplierinvoicestatic->ref_supplier = $objp->ref_supplier;
249
-						$supplierinvoicestatic->libelle = $objp->label;	// deprecated
249
+						$supplierinvoicestatic->libelle = $objp->label; // deprecated
250 250
 						$supplierinvoicestatic->label = $objp->label;
251 251
 						$supplierinvoicestatic->total_ht = $objp->total_ht;
252 252
 						$supplierinvoicestatic->total_ttc = $objp->total_ttc;
Please login to merge, or discard this patch.
htdocs/core/modules/facture/modules_facture.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 		$address = SwissQrBill\DataGroup\Element\CombinedAddress::create(
121 121
 			$this->emetteur->name,
122 122
 			$this->emetteur->address,
123
-			$this->emetteur->zip . " " . $this->emetteur->town,
123
+			$this->emetteur->zip." ".$this->emetteur->town,
124 124
 			$this->emetteur->country_code
125 125
 		);
126 126
 		if (!$address->isValid()) {
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
 			$address = SwissQrBill\DataGroup\Element\CombinedAddress::create(
176 176
 				$object->thirdparty->name,
177 177
 				$object->thirdparty->address,
178
-				$object->thirdparty->zip . " " . $object->thirdparty->town,
178
+				$object->thirdparty->zip." ".$object->thirdparty->town,
179 179
 				$object->thirdparty->country_code
180 180
 			);
181 181
 			if (!$address->isValid()) {
Please login to merge, or discard this patch.
htdocs/core/modules/export/export_excel2007.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -363,7 +363,7 @@
 block discarded – undo
363 363
 				if ($typefield == 'Text' || $typefield == 'TextAuto') {
364 364
 					// If $newvalue start with an equal sign we don't want it to be interpreted as a formula, so we add a '. Such transformation should be
365 365
 					// done by SetCellValueByColumnAndRow but it is not, so we do it ourself.
366
-					$newvalue = (dol_substr($newvalue, 0, 1) === '=' ? '\'' : '') . $newvalue;
366
+					$newvalue = (dol_substr($newvalue, 0, 1) === '=' ? '\'' : '').$newvalue;
367 367
 					$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $newvalue);
368 368
 					$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
369 369
 					$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
Please login to merge, or discard this patch.
htdocs/core/class/fiscalyear.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@
 block discarded – undo
244 244
 
245 245
 			$this->id = $obj->rowid;
246 246
 			$this->ref = $obj->rowid;
247
-			$this->date_start	= $this->db->jdate($obj->date_start);
247
+			$this->date_start = $this->db->jdate($obj->date_start);
248 248
 			$this->date_end = $this->db->jdate($obj->date_end);
249 249
 			$this->label = $obj->label;
250 250
 			$this->statut = $obj->status;
Please login to merge, or discard this patch.
htdocs/core/ajax/extraparams.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 //print $object->id.' - '.$object->module.' - '.$object->element.' - '.$object->table_element.' - '.$usesublevelpermission."\n";
58 58
 
59 59
 // Security check
60
-$result = restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission, 'fk_soc', 'rowid', 0, 1);	// Call with mode return
60
+$result = restrictedArea($user, $object->module, $object, $object->table_element, $usesublevelpermission, 'fk_soc', 'rowid', 0, 1); // Call with mode return
61 61
 if (!$result) {
62 62
 	httponly_accessforbidden('Not allowed by restrictArea');
63 63
 }
Please login to merge, or discard this patch.
htdocs/core/boxes/box_birthdays_members.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 			$sql .= " WHERE u.entity IN (".getEntity('adherent').")";
94 94
 			$sql .= " AND u.statut = ".Adherent::STATUS_VALIDATED;
95 95
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
96
-			$sql .= " ORDER BY daya ASC";	// We want to have date of the month sorted by the day without taking into consideration the year
96
+			$sql .= " ORDER BY daya ASC"; // We want to have date of the month sorted by the day without taking into consideration the year
97 97
 			$sql .= $this->db->plimit($max, 0);
98 98
 
99 99
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
Please login to merge, or discard this patch.
htdocs/core/boxes/box_graph_product_distribution.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
 		$userid = 0; // No filter on user creation
151 151
 
152 152
 		$WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '300' : '320';
153
-		$HEIGHT = '150';	// Height require to have 5+1 entries into legend visible.
153
+		$HEIGHT = '150'; // Height require to have 5+1 entries into legend visible.
154 154
 
155 155
 		if (isModEnabled("propal") && $user->hasRight('propal', 'lire')) {
156 156
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
Please login to merge, or discard this patch.