Dolibarr / dolibarr

htdocs/takepos/invoice.php

Spacing +35 added lines, -35 removed lines

@@ -202,7 +202,7 @@ 
  */
 $error = 0;
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -224,9 +224,9 @@ 
 			$bankaccount = GETPOSTINT('accountid');
 		} else {
 			if ($pay == 'LIQ') {
-				$bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]);            // For backward compatibility
+				$bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]); // For backward compatibility
 			} elseif ($pay == "CHQ") {
-				$bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]);    // For backward compatibility
+				$bankaccount = getDolGlobalInt('CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]); // For backward compatibility
 			} else {
 				$accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
 				$bankaccount = getDolGlobalInt($accountname);
@@ -296,14 +296,14 @@ 
 			// The case for isModEnabled('productbatch') is processed few lines later.
 			$savconst = getDolGlobalString('STOCK_CALCULATE_ON_BILL');
 
-			$conf->global->STOCK_CALCULATE_ON_BILL = 1;	// To force the change of stock during invoice validation
+			$conf->global->STOCK_CALCULATE_ON_BILL = 1; // To force the change of stock during invoice validation
 
 			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
 			dol_syslog("Validate invoice with stock change. Warehouse defined into constant ".$constantforkey." = ".getDolGlobalString($constantforkey));
 
 			// Validate invoice with stock change into warehouse getDolGlobalInt($constantforkey)
 			// Label of stock movement will be the same as when we validate invoice "Invoice XXXX validated"
-			$batch_rule = 0;	// Module productbatch is disabled here, so no need for a batch_rule.
+			$batch_rule = 0; // Module productbatch is disabled here, so no need for a batch_rule.
 			$res = $invoice->validate($user, '', getDolGlobalInt($constantforkey), 0, $batch_rule);
 
 			// Restore setup
@@ -344,7 +344,7 @@ 
 				$payment->num_payment = $invoice->ref;
 
 				if ($pay != "delayed") {
-					$res = $payment->create($user);		// This record payment and regenerate the PDF
+					$res = $payment->create($user); // This record payment and regenerate the PDF
 					if ($res < 0) {
 						$error++;
 						//setEventMessages($payment->error, $payment->errors, 'error');
@@ -393,7 +393,7 @@ 
 				dol_syslog("Now we record the stock movement for each qualified line");
 
 				// The case !isModEnabled('productbatch') was processed few lines before.
-				require_once DOL_DOCUMENT_ROOT . "/product/stock/class/mouvementstock.class.php";
+				require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
 				$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 				$inventorycode = dol_print_date(dol_now(), 'dayhourlog');
 				// Label of stock movement will be "TakePOS - Invoice XXXX"
@@ -449,7 +449,7 @@ 
 		$creditnote->socid = $invoice->socid;
 		$creditnote->date = dol_now();
 		$creditnote->module_source = 'takepos';
-		$creditnote->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
+		$creditnote->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '';
 		$creditnote->type = Facture::TYPE_CREDIT_NOTE;
 		$creditnote->fk_facture_source = $placeid;
 		//$creditnote->remise_absolue = $invoice->remise_absolue;
@@ -576,7 +576,7 @@ 
 			// If module stock is enabled and we do not setup takepo to disable stock decrease
 			// The case for isModEnabled('productbatch') is processed few lines later.
 			$savconst = getDolGlobalString('STOCK_CALCULATE_ON_BILL');
-			$conf->global->STOCK_CALCULATE_ON_BILL = 1;	// We force setup to have update of stock on invoice validation/unvalidation
+			$conf->global->STOCK_CALCULATE_ON_BILL = 1; // We force setup to have update of stock on invoice validation/unvalidation
 
 			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
 
@@ -584,7 +584,7 @@ 
 
 			// Validate invoice with stock change into warehouse getDolGlobalInt($constantforkey)
 			// Label of stock movement will be the same as when we validate invoice "Invoice XXXX validated"
-			$batch_rule = 0;	// Module productbatch is disabled here, so no need for a batch_rule.
+			$batch_rule = 0; // Module productbatch is disabled here, so no need for a batch_rule.
 			$res = $creditnote->validate($user, '', getDolGlobalInt($constantforkey), 0, $batch_rule);
 			if ($res < 0) {
 				$error++;
@@ -604,7 +604,7 @@ 
 				dol_syslog("Now we record the stock movement for each qualified line");
 
 				// The case !isModEnabled('productbatch') was processed few lines before.
-				require_once DOL_DOCUMENT_ROOT . "/product/stock/class/mouvementstock.class.php";
+				require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
 				$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
 				$inventorycode = dol_print_date(dol_now(), 'dayhourlog');
 				// Label of stock movement will be "TakePOS - Invoice XXXX"
@@ -644,7 +644,7 @@ 
 		if (!$error && $res >= 0) {
 			$db->commit();
 		} else {
-			$creditnote->id = $placeid;	// Creation has failed, we reset to ID of source invoice so we go back to this one in action=history
+			$creditnote->id = $placeid; // Creation has failed, we reset to ID of source invoice so we go back to this one in action=history
 			$db->rollback();
 		}
 	}
@@ -664,14 +664,14 @@ 
 	if (($action == "addline" || $action == "freezone") && $placeid == 0 && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
 		$invoice->socid = getDolGlobalInt($constforcompanyid);
 
-		$dolnowtzuserrel = dol_now('tzuserrel');	// If user is 02 january 22:00, we want to store '02 january'
+		$dolnowtzuserrel = dol_now('tzuserrel'); // If user is 02 january 22:00, we want to store '02 january'
 		$monthuser = dol_print_date($dolnowtzuserrel, '%m', 'gmt');
 		$dayuser = dol_print_date($dolnowtzuserrel, '%d', 'gmt');
 		$yearuser = dol_print_date($dolnowtzuserrel, '%Y', 'gmt');
-		$dateinvoice = dol_mktime(0, 0, 0, (int) $monthuser, (int) $dayuser, (int) $yearuser, 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
+		$dateinvoice = dol_mktime(0, 0, 0, (int) $monthuser, (int) $dayuser, (int) $yearuser, 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-		$invoice->date = $dateinvoice;		// Invoice::create() needs a date with no hours
+		$invoice->date = $dateinvoice; // Invoice::create() needs a date with no hours
 
 		/*
 		print "monthuser=".$monthuser." dayuser=".$dayuser." yearuser=".$yearuser.'<br>';
@@ -686,7 +686,7 @@ 
 		*/
 
 		$invoice->module_source = 'takepos';
-		$invoice->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
+		$invoice->pos_source = isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '';
 		$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
 
 		if ($invoice->socid <= 0) {
@@ -899,7 +899,7 @@ 
 
 			// complete line by hook
 			$parameters = array('prod' => $prod, 'line' => $line);
-			$reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action);    // Note that $action and $line may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('completeTakePosAddLine', $parameters, $invoice, $action); // Note that $action and $line may have been modified by some hooks
 			if ($reshook < 0) {
 				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 			}
@@ -1114,7 +1114,7 @@ 
 
 					if (!$permissiontoupdateline) {
 						dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos").' - No permission to updateprice', [], 1);
-					} elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT')  == 1) {
+					} elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT') == 1) {
 						$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $vatratecode, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 					} else {
 						$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $vatratecode, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
@@ -1186,7 +1186,7 @@ 
 
 	if ($action == "setbatch" && ($user->hasRight('takepos', 'run') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE'))) {
 		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-		$warehouseid = (GETPOSTINT('warehouseid') > 0 ? GETPOSTINT('warehouseid') : getDolGlobalInt($constantforkey));	// Get the warehouse id from GETPOSTINT('warehouseid'), otherwise use default setup.
+		$warehouseid = (GETPOSTINT('warehouseid') > 0 ? GETPOSTINT('warehouseid') : getDolGlobalInt($constantforkey)); // Get the warehouse id from GETPOSTINT('warehouseid'), otherwise use default setup.
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET batch = '".$db->escape($batch)."', fk_warehouse = ".((int) $warehouseid);
 		$sql .= " WHERE rowid=".((int) $idoflineadded);
 		$db->query($sql);
@@ -1334,12 +1334,12 @@ 
 		$customprinttemplateallowed = true;
 		include_once DOL_DOCUMENT_ROOT.'/blockedlog/lib/blockedlog.lib.php';
 		if (isALNERunningVersion()) {		// No need to show this option because it has no effect when isALNERunningVersion is true.
-			$customprinttemplateallowed = false;	// Custom printer may be allowed if mandatory information in template are guaranteed. For the moment, we prefer not allow this.
+			$customprinttemplateallowed = false; // Custom printer may be allowed if mandatory information in template are guaranteed. For the moment, we prefer not allow this.
 		}
 
 		if ($invoice->status == $invoice::STATUS_CLOSED) {
 			if (getDolGlobalInt('TAKEPOS_PRINT_INVOICE_DOC_INSTEAD_OF_RECEIPT')) {
-				$sectionwithinvoicelink .= ' <a target="_blank" class="button" href="' . DOL_URL_ROOT . '/document.php?token=' . newToken() . '&modulepart=facture&file=' . $invoice->ref . '/' . $invoice->ref . '.pdf">'.$langs->trans("Invoice").'</a>';
+				$sectionwithinvoicelink .= ' <a target="_blank" class="button" href="'.DOL_URL_ROOT.'/document.php?token='.newToken().'&modulepart=facture&file='.$invoice->ref.'/'.$invoice->ref.'.pdf">'.$langs->trans("Invoice").'</a>';
 			} elseif (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
 				// Used when the external addon takeposconnector is installed. Deprecated.
 				if (getDolGlobalString('TAKEPOS_PRINT_SERVER') && filter_var(getDolGlobalString('TAKEPOS_PRINT_SERVER'), FILTER_VALIDATE_URL) == true) {
@@ -1382,7 +1382,7 @@ 
 if (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
 	if (getDolGlobalString('MAIN_APPLICATION_TITLE')) {
-		$title = 'TakePOS - ' . getDolGlobalString('MAIN_APPLICATION_TITLE');
+		$title = 'TakePOS - '.getDolGlobalString('MAIN_APPLICATION_TITLE');
 	}
 	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 	<meta name="apple-mobile-web-app-capable" content="yes">
@@ -1632,7 +1632,7 @@ 
 			if ($contactid > 0) {
 				$contact = new Contact($db);
 				$contact->fetch($contactid);
-				$s .= " - " . $contact->getFullName($langs);
+				$s .= " - ".$contact->getFullName($langs);
 			}
 		}
 	} elseif (getDolGlobalInt("TAKEPOS_NO_GENERIC_THIRDPARTY")) {
@@ -1695,10 +1695,10 @@ 
 	$s = '';
 
 	$idwarehouse = 0;
-	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
+	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
 	if (isModEnabled('stock')) {
 		if (getDolGlobalString($constantforkey) != "1") {
-			$constantforkey = 'CASHDESK_ID_WAREHOUSE'. (isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
+			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.(isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '');
 			$idwarehouse = getDolGlobalInt($constantforkey);
 			if ($idwarehouse > 0) {
 				$s = '<span class="small">';
@@ -1808,11 +1808,11 @@ 
 }
 
 $buttontocreatecreditnote = '';
-if (($action == "valid" || $action == "history" ||  ($action == "addline" && $invoice->status == $invoice::STATUS_CLOSED)) && $invoice->type != Facture::TYPE_CREDIT_NOTE && !getDolGlobalString('TAKEPOS_NO_CREDITNOTE')) {
+if (($action == "valid" || $action == "history" || ($action == "addline" && $invoice->status == $invoice::STATUS_CLOSED)) && $invoice->type != Facture::TYPE_CREDIT_NOTE && !getDolGlobalString('TAKEPOS_NO_CREDITNOTE')) {
 	$buttontocreatecreditnote .= ' &nbsp; <!-- Show button to create a credit note -->'."\n";
 	$buttontocreatecreditnote .= '<button id="buttonprint" type="button" onclick="ModalBox(\'ModalCreditNote\')">'.$langs->trans('CreateCreditNote').'</button>';
 	if (getDolGlobalInt('TAKEPOS_PRINT_INVOICE_DOC_INSTEAD_OF_RECEIPT')) {
-		$buttontocreatecreditnote .= ' <a target="_blank" class="button" href="' . DOL_URL_ROOT . '/document.php?token=' . newToken() . '&modulepart=facture&file=' . urlencode($invoice->ref . '/' . $invoice->ref . '.pdf').'">'.$langs->trans("Invoice").'</a>';
+		$buttontocreatecreditnote .= ' <a target="_blank" class="button" href="'.DOL_URL_ROOT.'/document.php?token='.newToken().'&modulepart=facture&file='.urlencode($invoice->ref.'/'.$invoice->ref.'.pdf').'">'.$langs->trans("Invoice").'</a>';
 	}
 }
 
@@ -1864,7 +1864,7 @@ 
 
 // Complete header by hook
 $parameters = array();
-$reshook = $hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('completeTakePosInvoiceHeader', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -1878,16 +1878,16 @@ 
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 	if (getDolGlobalString('TAKEPOS_SHOW_HT')) {
 		print '<td class="linecolht right nowraponall">';
-		print '<span class="opacitymedium small">' . $langs->trans('TotalHTShort') . '</span><br>';
+		print '<span class="opacitymedium small">'.$langs->trans('TotalHTShort').'</span><br>';
 		// In phone version only show when it is invoice page
 		if (empty($mobilepage) || $mobilepage == "invoice") {
-			print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">' . price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency) . '</span>';
+			print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">'.price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency).'</span>';
 			if (isModEnabled('multicurrency') && !empty($_SESSION["takeposcustomercurrency"]) && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 				//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
-				include_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
+				include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 				$multicurrency = new MultiCurrency($db);
 				$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
-				print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">(' . price($invoice->total_ht * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
+				print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($invoice->total_ht * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
 			}
 		}
 		print '</td>';
@@ -2034,7 +2034,7 @@ 
 
 				// complete line by hook
 				$parameters = array('line' => $line);
-				$reshook = $hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('completeTakePosInvoiceParentLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
 					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				}
@@ -2089,7 +2089,7 @@ 
 					}
 				}
 				if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) {
-					$htmlforlines .= $form->textwithpicto($line->product_label ? '<b>' . $line->product_ref . '</b> - ' . $line->product_label : dolGetFirstLineOfText($line->desc, 1), $tooltiptext);
+					$htmlforlines .= $form->textwithpicto($line->product_label ? '<b>'.$line->product_ref.'</b> - '.$line->product_label : dolGetFirstLineOfText($line->desc, 1), $tooltiptext);
 				} elseif (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 2) {
 					$htmlforlines .= $form->textwithpicto($line->product_ref ? '<b>'.$line->product_ref.'<b>' : dolGetFirstLineOfText($line->desc, 1), $tooltiptext);
 				} else {
@@ -2147,7 +2147,7 @@ 
 
 				// complete line by hook
 				$parameters = array('line' => $line);
-				$reshook = $hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('completeTakePosInvoiceLine', $parameters, $invoice, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
 					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 				}

htdocs/takepos/receipt.php

Spacing +10 added lines, -10 removed lines

@@ -143,7 +143,7 @@ 
 	$reshook = $hookmanager->executeHooks('TakeposReceipt', $parameters, $object);
 	if (!empty($hookmanager->resPrint)) {
 		print $hookmanager->resPrint;
-		return;	// Receipt page can be called by the takepos/send.php page that use ob_start/end so we must use return and not exit to stop page
+		return; // Receipt page can be called by the takepos/send.php page that use ob_start/end so we must use return and not exit to stop page
 	}
 }
 
@@ -221,7 +221,7 @@ 
 <?php
 // Invoice Ref
 if (getDolGlobalString('TAKEPOS_RECEIPT_NAME')) {
-	print getDolGlobalString('TAKEPOS_RECEIPT_NAME') . " ";
+	print getDolGlobalString('TAKEPOS_RECEIPT_NAME')." ";
 } else {
 	print $langs->trans("InvoiceRef")." ";
 }
@@ -281,10 +281,10 @@ 
 
 if ($object->status == $object::STATUS_CLOSED) {
 	if ($isADuplicata) {
-		print '<br><b>*** DUPLICATA***</b>';	// Hard coded string
+		print '<br><b>*** DUPLICATA***</b>'; // Hard coded string
 	}
 } else {
-	print '<br><b>*** '.strtoupper($langs->trans("TemporaryReceipt")).' ***</b>';	// Hard coded string
+	print '<br><b>*** '.strtoupper($langs->trans("TemporaryReceipt")).' ***</b>'; // Hard coded string
 }
 ?>
 </p>
@@ -313,13 +313,13 @@ 
 	if ($action == 'without_details') {
 		$qty = GETPOSTINT('qty') > 0 ? GETPOSTINT('qty') : 1;
 		print '<tr>';
-		print '<td>' . GETPOST('label', 'alphanohtml') . '</td>';
-		print '<td class="right">' . $qty . '</td>';
-		print '<td class="right">' . price(price2num($object->total_ttc / $qty, 'MU'), 1) . '</td>';
+		print '<td>'.GETPOST('label', 'alphanohtml').'</td>';
+		print '<td class="right">'.$qty.'</td>';
+		print '<td class="right">'.price(price2num($object->total_ttc / $qty, 'MU'), 1).'</td>';
 		if (getDolGlobalString('TAKEPOS_SHOW_HT_RECEIPT')) {
-			print '<td class="right">' . price($object->total_ht, 1) . '</td>';
+			print '<td class="right">'.price($object->total_ht, 1).'</td>';
 		}
-		print '<td class="right">' . price($object->total_ttc, 1) . '</td>';
+		print '<td class="right">'.price($object->total_ttc, 1).'</td>';
 		print '</tr>';
 	} else {
 		foreach ($object->lines as $line) {
@@ -483,7 +483,7 @@ 
 				if ((!isModEnabled('multicurrency') || $object->multicurrency_tx == 1) && $row->code == "LIQ" && $row->pos_change > 0) {
 					echo '<tr>';
 					echo '<td class="right">';
-					echo $langs->trans("Change");	// ChangeBack ?
+					echo $langs->trans("Change"); // ChangeBack ?
 					echo '</td>';
 					echo '<td class="right">';
 					echo price($row->pos_change, 1, '', 1, - 1, - 1, $currency);

htdocs/core/triggers/interface_95_modWebhook_WebhookTriggers.class.php

Spacing +4 added lines, -4 removed lines

@@ -75,11 +75,11 @@ 
 		$errors = 0;
 		$errorforhistory = 0;
 		$static_object = new Target($this->db);
-		$filter = '';	// TODO Replace this with a search with filter on $action trigger to avoid to filter later.
+		$filter = ''; // TODO Replace this with a search with filter on $action trigger to avoid to filter later.
 		$target_url = $static_object->fetchAll('', '', 0, 0, $filter);
 
 		if (is_numeric($target_url) && $target_url < 0) {
-			dol_syslog("Error Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Error Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			$this->errors = array_merge($this->errors, $static_object->errors);
 			return -1;
 		}
@@ -130,7 +130,7 @@ 
 					$nbPosts++;
 				} else {
 					$errormsg = "The WebHook for ".$action." failed to get URL ".$tmpobject->url." with httpcode=".(!empty($response['http_code']) ? $response['http_code'] : "")." curl_error_no=".(!empty($response['curl_error_no']) ? $response['curl_error_no'] : "");
-					$errorforhistory ++;
+					$errorforhistory++;
 
 					if ($tmpobject->type == Target::TYPE_BLOCKING) {
 						$errors++;
@@ -176,7 +176,7 @@ 
 			$dbhistory->close();
 		}
 
-		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id." -> nbPost=".$nbPosts);
+		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id." -> nbPost=".$nbPosts);
 
 		if (!empty($errors)) {
 			return $errors * -1;

test/phpunit/DoliDBTest.php

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -56,7 +56,7 @@ 
 	 */
 	public function testDDLCreateTable()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -91,7 +91,7 @@ 
 	 */
 	public function testDDLUpdateField()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -134,7 +134,7 @@ 
 	 */
 	public function testGetNextAutoIncrementId()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -142,7 +142,7 @@ 
 
 		print __METHOD__.' db->type = '.$db->type."\n";
 		$result = $db->getNextAutoIncrementId(MAIN_DB_PREFIX.'blockedlog');
-		$this->assertGreaterThan(0, $result);	// Must be strictlyhigher than 0
+		$this->assertGreaterThan(0, $result); // Must be strictlyhigher than 0
 		print __METHOD__." result=".$result."\n";
 	}
 }