Completed
Branch develop (c23a95)
by
unknown
18:46
created
htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -235,7 +235,7 @@
 block discarded – undo
235 235
 			if (!function_exists('simplexml_load_string')) {
236 236
 				throw new PrestaShopWebserviceException('Method simplexml_load_string not available. Your PHP does not support xml.');
237 237
 			}
238
-			$xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
238
+			$xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NONET);
239 239
 			if (libxml_get_errors()) {
240 240
 				$msg = var_export(libxml_get_errors(), true);
241 241
 				libxml_clear_errors();
Please login to merge, or discard this patch.
htdocs/accountancy/customer/list.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 $search_date_endday = GETPOST('search_date_endday', 'int');
69 69
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
70 70
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
71
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
71
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
72 72
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
73 73
 $search_country = GETPOST('search_country', 'alpha');
74 74
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -258,20 +258,20 @@  discard block
 block discarded – undo
258 258
 $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
259 259
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
260 260
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
261
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
261
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
262 262
 }
263 263
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
264 264
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facturedet as l ON f.rowid = l.fk_facture";
265 265
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
266 266
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
267
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
267
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
268 268
 }
269 269
 $alias_societe_perentity = empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED) ? "s" : "spe";
270 270
 $alias_product_perentity = empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p" : "ppe";
271
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON " . $alias_product_perentity . ".accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
272
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
273
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
274
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_societe_perentity . ".accountancy_code_sell = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
271
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON ".$alias_product_perentity.".accountancy_code_sell = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
272
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON ".$alias_product_perentity.".accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
273
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON ".$alias_product_perentity.".accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
274
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON ".$alias_societe_perentity.".accountancy_code_sell = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
275 275
 
276 276
 $sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
277 277
 $sql .= " AND l.product_type <= 2";
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
461 461
 
462 462
 	if ($massaction == 'set_default_account') {
463
-		$formquestion[]=array('type' => 'other',
463
+		$formquestion[] = array('type' => 'other',
464 464
 			'name' => 'set_default_account',
465 465
 			'label' => $langs->trans("AccountancyCode"),
466 466
 			'value' => $formaccounting->select_account('', 'default_account', 1, array(), 0, 0, 'maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone'));
@@ -552,14 +552,14 @@  discard block
 block discarded – undo
552 552
 		$thirdpartystatic->client = $objp->client;
553 553
 		$thirdpartystatic->fournisseur = $objp->fournisseur;
554 554
 		$thirdpartystatic->code_client = $objp->code_client;
555
-		$thirdpartystatic->code_compta = $objp->code_compta_client;		// For backward compatibility
555
+		$thirdpartystatic->code_compta = $objp->code_compta_client; // For backward compatibility
556 556
 		$thirdpartystatic->code_compta_client = $objp->code_compta_client;
557 557
 		$thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
558 558
 		$thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
559 559
 		$thirdpartystatic->email = $objp->email;
560 560
 		$thirdpartystatic->country_code = $objp->country_code;
561 561
 		$thirdpartystatic->tva_intra = $objp->tva_intra;
562
-		$thirdpartystatic->code_compta_product = $objp->company_code_sell;		// The accounting account for product stored on thirdparty object (for level3 suggestion)
562
+		$thirdpartystatic->code_compta_product = $objp->company_code_sell; // The accounting account for product stored on thirdparty object (for level3 suggestion)
563 563
 
564 564
 		$product_static->ref = $objp->product_ref;
565 565
 		$product_static->id = $objp->product_id;
@@ -598,16 +598,16 @@  discard block
 block discarded – undo
598 598
 
599 599
 		$suggestedid = 0;
600 600
 
601
-		$return=$accountingAccount->getAccountingCodeToBind($thirdpartystatic, $mysoc, $product_static, $facture_static, $facture_static_det, $accountingAccountArray, 'customer');
602
-		if (!is_array($return) && $return<0) {
601
+		$return = $accountingAccount->getAccountingCodeToBind($thirdpartystatic, $mysoc, $product_static, $facture_static, $facture_static_det, $accountingAccountArray, 'customer');
602
+		if (!is_array($return) && $return < 0) {
603 603
 			setEventMessage($accountingAccount->error, 'errors');
604 604
 		} else {
605
-			$suggestedid=$return['suggestedid'];
606
-			$suggestedaccountingaccountfor=$return['suggestedaccountingaccountfor'];
607
-			$suggestedaccountingaccountbydefaultfor=$return['suggestedaccountingaccountbydefaultfor'];
608
-			$code_sell_l=$return['code_l'];
609
-			$code_sell_p=$return['code_p'];
610
-			$code_sell_t=$return['code_t'];
605
+			$suggestedid = $return['suggestedid'];
606
+			$suggestedaccountingaccountfor = $return['suggestedaccountingaccountfor'];
607
+			$suggestedaccountingaccountbydefaultfor = $return['suggestedaccountingaccountbydefaultfor'];
608
+			$code_sell_l = $return['code_l'];
609
+			$code_sell_p = $return['code_p'];
610
+			$code_sell_t = $return['code_t'];
611 611
 		}
612 612
 		//var_dump($return);
613 613
 
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 		if ($product_static->tva_tx !== $facture_static_det->tva_tx && price2num($product_static->tva_tx) && price2num($facture_static_det->tva_tx)) {	// Note: having a vat rate of 0 is often the normal case when sells is intra b2b or to export
665 665
 			$code_vat_differ = 'warning bold';
666 666
 		}
667
-		print '<td class="right'.($code_vat_differ?' '.$code_vat_differ:'').'">';
667
+		print '<td class="right'.($code_vat_differ ? ' '.$code_vat_differ : '').'">';
668 668
 		print vatrate($facture_static_det->tva_tx.($facture_static_det->vat_src_code ? ' ('.$facture_static_det->vat_src_code.')' : ''));
669 669
 		print '</td>';
670 670
 
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 		if (!empty($toselect)) {
739 739
 			$ischecked = 0;
740 740
 			if (in_array($objp->rowid."_".$i, $toselect)) {
741
-				$ischecked=1;
741
+				$ischecked = 1;
742 742
 			}
743 743
 		}
744 744
 
Please login to merge, or discard this patch.
htdocs/core/lib/website2.lib.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
 		if ($backupold) {
158 158
 			dol_delete_file($filetpl.'.old');
159 159
 			$result = dol_move($filetpl, $filetpl.'.old', 0, 1, 0, 0);
160
-			if (! $result) {
160
+			if (!$result) {
161 161
 				return false;
162 162
 			}
163 163
 		} else {
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
347 347
 						$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
348 348
 						$indexcontent .= "}\n";
349
-						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n";	// use .. instead of .
349
+						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n"; // use .. instead of .
350 350
 						$indexcontent .= '// END PHP ?>'."\n";
351 351
 						$result = file_put_contents($fileindexsub, $indexcontent);
352 352
 						if ($result === false) {
Please login to merge, or discard this patch.
htdocs/exports/class/export.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -354,7 +354,7 @@
 block discarded – undo
354 354
 				if (is_numeric($ValueField) && $ValueField > 0) {
355 355
 					$szFilterQuery = " ".$NameField." = ".((float) $ValueField);
356 356
 				} else {
357
-					$szFilterQuery = " 1=1";	// Test always true
357
+					$szFilterQuery = " 1=1"; // Test always true
358 358
 				}
359 359
 				break;
360 360
 			case 'Status':
Please login to merge, or discard this patch.
htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -616,7 +616,7 @@
 block discarded – undo
616 616
 			$posy += 4;
617 617
 			$pdf->SetXY($posx, $posy);
618 618
 			$pdf->SetTextColor(0, 0, 60);
619
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer") . " : " . dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
619
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
620 620
 		}
621 621
 
622 622
 
Please login to merge, or discard this patch.
htdocs/core/boxes/box_graph_nb_tickets_type.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		$colorseriesstat = array();
86 86
 		if ($user->rights->ticket->read) {
87 87
 			$sql = "SELECT ctt.rowid, ctt.label, ctt.code";
88
-			$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_type as ctt";
88
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as ctt";
89 89
 			$sql .= " WHERE ctt.active = 1";
90 90
 			$sql .= $this->db->order('ctt.rowid', 'ASC');
91 91
 			$resql = $this->db->query($sql);
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 			$dataseries = array();
118 118
 			$data = array();
119 119
 			$sql = "SELECT t.type_code, COUNT(t.type_code) as nb";
120
-			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
120
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
121 121
 			$sql .= " WHERE t.fk_statut <> 8";
122 122
 			$sql .= " GROUP BY t.type_code";
123 123
 			$resql = $this->db->query($sql);
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 				}
132 132
 				foreach ($listofoppcode as $rowid => $code) {
133 133
 					$dataseries[] = array(
134
-						'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort' . $code, 'c_ticket_type', 'code', 'label', $code),
134
+						'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort'.$code, 'c_ticket_type', 'code', 'label', $code),
135 135
 						'data' => (empty($data[$code]) ? 0 : $data[$code])
136 136
 					);
137 137
 				}
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 					$stringtoprint .= $px1->show($totalnb ? 0 : 1);
171 171
 				}
172 172
 				$stringtoprint .= '</div>';
173
-				$this->info_box_contents[][]=array(
173
+				$this->info_box_contents[][] = array(
174 174
 					'td' => 'class="center"',
175 175
 					'text' => $stringtoprint
176 176
 				);
Please login to merge, or discard this patch.
htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -254,7 +254,7 @@
 block discarded – undo
254 254
 		// Clean data
255 255
 		// $this->knowledgerecord->abc = sanitizeVal($this->knowledgerecord->abc, 'alphanohtml');
256 256
 
257
-		if ($this->knowledgerecord->create(DolibarrApiAccess::$user)<0) {
257
+		if ($this->knowledgerecord->create(DolibarrApiAccess::$user) < 0) {
258 258
 			throw new RestException(500, "Error creating KnowledgeRecord", array_merge(array($this->knowledgerecord->error), $this->knowledgerecord->errors));
259 259
 		}
260 260
 		return $this->knowledgerecord->id;
Please login to merge, or discard this patch.
htdocs/modulebuilder/template/class/api_mymodule.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -220,7 +220,7 @@
 block discarded – undo
220 220
 		// Clean data
221 221
 		// $this->myobject->abc = sanitizeVal($this->myobject->abc, 'alphanohtml');
222 222
 
223
-		if ($this->myobject->create(DolibarrApiAccess::$user)<0) {
223
+		if ($this->myobject->create(DolibarrApiAccess::$user) < 0) {
224 224
 			throw new RestException(500, "Error creating MyObject", array_merge(array($this->myobject->error), $this->myobject->errors));
225 225
 		}
226 226
 		return $this->myobject->id;
Please login to merge, or discard this patch.
htdocs/contact/consumption.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -366,7 +366,7 @@
 block discarded – undo
366 366
 $param .= "&type_element=".urlencode($type_element);
367 367
 
368 368
 $total_qty = 0;
369
-$num=0;
369
+$num = 0;
370 370
 if ($sql_select) {
371 371
 	$resql = $db->query($sql);
372 372
 	if (!$resql) {
Please login to merge, or discard this patch.