Dolibarr / dolibarr

htdocs/compta/paiement/class/paiement.class.php

Spacing +9 added lines, -9 removed lines

@@ -309,7 +309,7 @@ 
 		global $conf, $langs;
 
 		$error = 0;
-		$way = $this->getWay();	// 'dolibarr' to use amount, 'customer' to use foreign multicurrency amount
+		$way = $this->getWay(); // 'dolibarr' to use amount, 'customer' to use foreign multicurrency amount
 
 		$now = dol_now();
 
@@ -370,7 +370,7 @@ 
 				$currencytxofpayment = isset($this->multicurrency_tx[$key]) ? $this->multicurrency_tx[$key] : "";
 			}
 
-			$totalamount_converted += $value_converted;	// Total in currency of the invoice
+			$totalamount_converted += $value_converted; // Total in currency of the invoice
 			$amounts_to_update[$key] = price2num($value_converted, 'MT');
 
 			$newvalue = price2num($value, 'MT');
@@ -498,7 +498,7 @@ 
 									$this->error = $hookmanager->error;
 									$error++;
 								} elseif ($reshook == 0) {
-									dol_syslog("Remain to pay for invoice " . $facid . " not null. We do nothing more.");
+									dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
 								}
 								// } else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
 							} else {
@@ -813,8 +813,8 @@ 
 
 			// if company currency != bank currency, then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
 			if ($conf->currency != $acc->currency_code) {
-				$totalamount = $this->multicurrency_amount;		// We will insert into llx_bank.amount in foreign currency of invoice
-				$totalamount_main_currency = $this->amount;		// We will also save the amount in main currency into column llx_bank.amount_main_currency
+				$totalamount = $this->multicurrency_amount; // We will insert into llx_bank.amount in foreign currency of invoice
+				$totalamount_main_currency = $this->amount; // We will also save the amount in main currency into column llx_bank.amount_main_currency
 			}
 
 			if ($mode == 'payment_supplier') {
@@ -1245,7 +1245,7 @@ 
 		if (getDolGlobalString('PAYMENT_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('PAYMENT_ADDON') . ".php";
+			$file = getDolGlobalString('PAYMENT_ADDON').".php";
 			$classname = getDolGlobalString('PAYMENT_ADDON');
 
 			// Include file with class
@@ -1262,8 +1262,8 @@ 
 
 			// For compatibility
 			if (!$mybool) {
-				$file = getDolGlobalString('PAYMENT_ADDON') . ".php";
-				$classname = "mod_payment_" . getDolGlobalString('PAYMENT_ADDON');
+				$file = getDolGlobalString('PAYMENT_ADDON').".php";
+				$classname = "mod_payment_".getDolGlobalString('PAYMENT_ADDON');
 				$classname = preg_replace('/\-.*$/', '', $classname);
 				// Include file with class
 				foreach ($conf->file->dol_document_root as $dirroot) {
@@ -1426,7 +1426,7 @@ 
 		}
 		$result .= $linkend;
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {

htdocs/product/inventory/inventory.php

Spacing +28 added lines, -28 removed lines

@@ -108,8 +108,8 @@ 
 //$result = restrictedArea($user, 'mymodule', $id);
 
 //Parameters Page
-$paramwithsearch = '&sortfield=' . urlencode($sortfield);
-$paramwithsearch .= '&sortorder=' . urlencode($sortorder);
+$paramwithsearch = '&sortfield='.urlencode($sortfield);
+$paramwithsearch .= '&sortorder='.urlencode($sortorder);
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$paramwithsearch .= '&limit='.((int) $limit);
 }
@@ -177,7 +177,7 @@ 
 				$line = $db->fetch_object($resql);
 
 				$qty_stock = $line->qty_stock;
-				$qty_view = $line->qty_view;		// The quantity viewed by inventorier, the qty we target
+				$qty_view = $line->qty_view; // The quantity viewed by inventorier, the qty we target
 
 
 				// Load real stock we have now.
@@ -234,7 +234,7 @@ 
 						}
 						$sqlupdate .= " WHERE rowid = ".((int) $line->rowid);
 						$resqlupdate = $db->query($sqlupdate);
-						if (! $resqlupdate) {
+						if (!$resqlupdate) {
 							$error++;
 							setEventMessages($db->lasterror(), null, 'errors');
 							break;
@@ -244,7 +244,7 @@ 
 					if (!empty($line->pmp_real) && getDolGlobalString('INVENTORY_MANAGE_REAL_PMP')) {
 						$sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product SET pmp = '.((float) $line->pmp_real).' WHERE rowid = '.((int) $line->fk_product);
 						$resqlpmp = $db->query($sqlpmp);
-						if (! $resqlpmp) {
+						if (!$resqlpmp) {
 							$error++;
 							setEventMessages($db->lasterror(), null, 'errors');
 							break;
@@ -252,7 +252,7 @@ 
 						if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
 							$sqlpmp = 'UPDATE '.MAIN_DB_PREFIX.'product_perentity SET pmp = '.((float) $line->pmp_real).' WHERE fk_product = '.((int) $line->fk_product).' AND entity='.$conf->entity;
 							$resqlpmp = $db->query($sqlpmp);
-							if (! $resqlpmp) {
+							if (!$resqlpmp) {
 								$error++;
 								setEventMessages($db->lasterror(), null, 'errors');
 								break;
@@ -271,7 +271,7 @@ 
 			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -311,17 +311,17 @@ 
 						setEventMessages($langs->trans("FieldCannotBeNegative", $langs->transnoentitiesnoconv("RealQty")), null, 'errors');
 					}
 					if ($result > 0) {
-						$inventoryline->qty_stock = (float) price2num(GETPOST('stock_qty_'.$lineid, 'alpha'), 'MS');	// The new value that was set in as hidden field
-						$inventoryline->qty_view = $qtytoupdate;	// The new value we want
+						$inventoryline->qty_stock = (float) price2num(GETPOST('stock_qty_'.$lineid, 'alpha'), 'MS'); // The new value that was set in as hidden field
+						$inventoryline->qty_view = $qtytoupdate; // The new value we want
 						$inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
 						$inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
 						$resultupdate = $inventoryline->update($user);
 					}
-				} elseif (GETPOSTISSET('id_' . $lineid)) {
+				} elseif (GETPOSTISSET('id_'.$lineid)) {
 					// Delete record
 					$result = $inventoryline->fetch($lineid);
 					if ($result > 0) {
-						$inventoryline->qty_view = null;			// The new value we want
+						$inventoryline->qty_view = null; // The new value we want
 						$inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
 						$inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
 						$resultupdate = $inventoryline->update($user);
@@ -337,12 +337,12 @@ 
 		}
 
 		// Update line with id of stock movement (and the start quantity if it has changed this last recording)
-		if (! $error) {
+		if (!$error) {
 			$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."inventory";
 			$sqlupdate .= " SET fk_user_modif = ".((int) $user->id);
 			$sqlupdate .= " WHERE rowid = ".((int) $object->id);
 			$resqlupdate = $db->query($sqlupdate);
-			if (! $resqlupdate) {
+			if (!$resqlupdate) {
 				$error++;
 				setEventMessages($db->lasterror(), null, 'errors');
 			}
@@ -426,7 +426,7 @@ 
 				}
 			} else {
 				// Clear var
-				$_POST['batch'] = '';		// TODO Replace this with a var
+				$_POST['batch'] = ''; // TODO Replace this with a var
 				$_POST['qtytoadd'] = '';
 			}
 		}
@@ -454,7 +454,7 @@ 
 
 $param = '';
 if ($limit > 0 && $limit != $conf->liste_limit) {
-	$param .= '&limit=' . ((int) $limit);
+	$param .= '&limit='.((int) $limit);
 }
 
 
@@ -592,8 +592,8 @@ 
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="updateinventorylines">';
 print '<input type="hidden" name="id" value="'.$object->id.'">';
-print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';
-print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 if ($backtopage) {
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 }
@@ -944,8 +944,8 @@ 
 print '<table id="tablelines" class="noborder noshadow centpercent">';
 
 print '<tr class="liste_titre">';
-print getTitleFieldOfList($langs->trans("Warehouse"), 0, $_SERVER['PHP_SELF'], 'e.ref', '', 'id=' . $object->id . '&page=' . $page . $param, '', $sortfield, $sortorder, '', 0, '') . "\n";
-print getTitleFieldOfList($langs->trans("Product"), 0, $_SERVER['PHP_SELF'], 'p.ref', '', 'id=' . $object->id . '&page=' . $page . $param, '', $sortfield, $sortorder, '', 0, '') . "\n";
+print getTitleFieldOfList($langs->trans("Warehouse"), 0, $_SERVER['PHP_SELF'], 'e.ref', '', 'id='.$object->id.'&page='.$page.$param, '', $sortfield, $sortorder, '', 0, '')."\n";
+print getTitleFieldOfList($langs->trans("Product"), 0, $_SERVER['PHP_SELF'], 'p.ref', '', 'id='.$object->id.'&page='.$page.$param, '', $sortfield, $sortorder, '', 0, '')."\n";
 if (isModEnabled('productbatch')) {
 	print '<td>';
 	print $langs->trans("Batch");
@@ -1030,16 +1030,16 @@ 
 }
 
 // Sort by warehouse/product or product/warehouse
-$sortfield .= ',' . ($sortfield == 'e.ref' ? 'p.ref' : 'e.ref');
-$sortorder .= ',' . $sortorder;
+$sortfield .= ','.($sortfield == 'e.ref' ? 'p.ref' : 'e.ref');
+$sortorder .= ','.$sortorder;
 
 // Request to show lines of inventory (prefilled after start/validate step)
 $sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
 $sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement, id.pmp_real, id.pmp_expected';
-$sql .= ' FROM ' . $db->prefix() . 'inventorydet as id';
-$sql .= ' LEFT JOIN ' . $db->prefix() . 'product as p ON id.fk_product = p.rowid';
-$sql .= ' LEFT JOIN ' . $db->prefix() . 'entrepot as e ON id.fk_warehouse = e.rowid';
-$sql .= ' WHERE id.fk_inventory = ' . ((int) $object->id);
+$sql .= ' FROM '.$db->prefix().'inventorydet as id';
+$sql .= ' LEFT JOIN '.$db->prefix().'product as p ON id.fk_product = p.rowid';
+$sql .= ' LEFT JOIN '.$db->prefix().'entrepot as e ON id.fk_warehouse = e.rowid';
+$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($limit, $offset);
 
@@ -1052,7 +1052,7 @@ 
 	$num = $db->num_rows($resql);
 
 	if (!empty($limit != 0) || $num > $limit || $page) {
-		print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$object->id.$paramwithsearch, ($num >= $limit ? 1 : 0), '<li class="pagination"><span>' . $langs->trans("Page") . ' ' . ($page + 1) . '</span></li>', '', $limit);
+		print_fleche_navigation($page, $_SERVER["PHP_SELF"], '&id='.$object->id.$paramwithsearch, ($num >= $limit ? 1 : 0), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>', '', $limit);
 	}
 
 	$i = 0;
@@ -1204,7 +1204,7 @@ 
 				print '</td>';
 
 				print '<td class="right nowraponall">';
-				print $obj->qty_view;	// qty found
+				print $obj->qty_view; // qty found
 				print '</td>';
 
 				//PMP Real
@@ -1226,7 +1226,7 @@ 
 				$totalRealValuation += $pmp_valuation_real;
 			} else {
 				print '<td class="right nowraponall">';
-				print $obj->qty_view;	// qty found
+				print $obj->qty_view; // qty found
 				print '</td>';
 			}
 			print '<td>';