Dolibarr / dolibarr

htdocs/accountancy/class/accountancyexport.class.php

Indentation +5 added lines, -5 removed lines

@@ -2387,14 +2387,14 @@
 	}
 
 	/**
-	* Export format : iSuite Expert
-	*
-	* by OpenSolus [https://opensolus.fr]
-	*
+	 * Export format : iSuite Expert
+	 *
+	 * by OpenSolus [https://opensolus.fr]
+	 *
 	 * @param 	array 		$objectLines 			data
 	 * @param 	resource	$exportFile				[=null] File resource to export or print if null
 	 * @return 	void
-	*/
+	 */
 	public function exportiSuiteExpert($objectLines, $exportFile = null)
 	{
 		$separator = ';';

Spacing +19 added lines, -19 removed lines

@@ -334,8 +334,8 @@ 
 	 */
 	public function export(&$TData, $formatexportset, $withAttachment = 0, $downloadMode = 0, $outputMode = 0, $noouput = 0)
 	{
-		global $db, $conf, $langs;	// The tpl file use $db
-		global $search_date_end; 	// Used into /accountancy/tpl/export_journal.tpl.php
+		global $db, $conf, $langs; // The tpl file use $db
+		global $search_date_end; // Used into /accountancy/tpl/export_journal.tpl.php
 
 		// Define name of file to save
 		$filename = 'general_ledger-'.$this->getFormatCode($formatexportset);
@@ -415,7 +415,7 @@ 
 					$exportFileFullName = $completefilename;
 					$exportFileBaseName = basename($exportFileFullName);
 					$exportFileName = pathinfo($exportFileBaseName, PATHINFO_FILENAME);
-					$exportFilePath = $outputDir . '/' . $exportFileFullName;
+					$exportFilePath = $outputDir.'/'.$exportFileFullName;
 					$exportFile = fopen($exportFilePath, 'w');
 					if (!$exportFile) {
 						$this->errors[] = $langs->trans('ErrorFileNotFound', $exportFilePath);
@@ -429,8 +429,8 @@ 
 						);
 
 						// archive name and path
-						$archiveFullName = $exportFileName . '.zip';
-						$archivePath = $outputDir . '/' . $archiveFullName;
+						$archiveFullName = $exportFileName.'.zip';
+						$archivePath = $outputDir.'/'.$archiveFullName;
 					}
 				}
 			}
@@ -568,11 +568,11 @@ 
 					if (!empty($downloadFileMimeType) && !empty($downloadFileFullName) && !empty($downloadFilePath) && empty($noouput)) {
 						// deprecated. We must not use this anymore, but have $noouput = 1 because HTTP header must be sent
 						// into main page not into a method.
-						header('Content-Type: ' . $downloadFileMimeType);
-						header('Content-Disposition: attachment; filename=' . $downloadFileFullName);
+						header('Content-Type: '.$downloadFileMimeType);
+						header('Content-Disposition: attachment; filename='.$downloadFileFullName);
 						header('Cache-Control: Public, must-revalidate');
 						header('Pragma: public');
-						header('Content-Length: ' . dol_filesize($downloadFilePath));
+						header('Content-Length: '.dol_filesize($downloadFilePath));
 
 						readfileLowMemory($downloadFilePath);
 					}
@@ -644,14 +644,14 @@ 
 			$refInvoice = '';
 			if ($line->doc_type == 'customer_invoice') {
 				// Customer invoice
-				require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$invoice = new Facture($this->db);
 				$invoice->fetch($line->fk_doc);
 
 				$refInvoice = $invoice->ref;
 			} elseif ($line->doc_type == 'supplier_invoice') {
 				// Supplier invoice
-				require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 				$invoice = new FactureFournisseur($this->db);
 				$invoice->fetch($line->fk_doc);
 
@@ -1999,7 +1999,7 @@ 
 			// MOPM
 			$tab[] = "";
 			// BONP
-			$tab[] =  "";
+			$tab[] = "";
 			// BQAF
 			$tab[] = "";
 			// ECES
@@ -2205,7 +2205,7 @@ 
 				}
 			} elseif ($line->doc_type == 'customer_invoice') {
 				if (($line->amount) < 0) {
-					$nature_piece = 'AC';		// Currently, only the sign of amount allows to know the type of invoice (standard or credit note). Other solution is to analyse debit/credit/role of account. TODO Add column doc_type_long or make amount mandatory with rule on sign.
+					$nature_piece = 'AC'; // Currently, only the sign of amount allows to know the type of invoice (standard or credit note). Other solution is to analyse debit/credit/role of account. TODO Add column doc_type_long or make amount mandatory with rule on sign.
 				} else {
 					$nature_piece = 'FC';
 				}
@@ -2414,8 +2414,8 @@ 
 						($line->doc_type == 'supplier_invoice' && !isset($supplier_invoices_infos[$line->fk_doc]))) {
 						if ($line->doc_type == 'customer_invoice') {
 							// Get new customer invoice ref and company name
-							$sql = 'SELECT f.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture as f';
-							$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON f.fk_soc = s.rowid';
+							$sql = 'SELECT f.ref, s.nom FROM '.MAIN_DB_PREFIX.'facture as f';
+							$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON f.fk_soc = s.rowid';
 							$sql .= ' WHERE f.rowid = '.((int) $line->fk_doc);
 							$resql = $this->db->query($sql);
 							if ($resql) {
@@ -2428,8 +2428,8 @@ 
 							}
 						} else {
 							// Get new supplier invoice ref and company name
-							$sql = 'SELECT ff.ref, s.nom FROM ' . MAIN_DB_PREFIX . 'facture_fourn as ff';
-							$sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON ff.fk_soc = s.rowid';
+							$sql = 'SELECT ff.ref, s.nom FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
+							$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON ff.fk_soc = s.rowid';
 							$sql .= ' WHERE ff.rowid = '.((int) $line->fk_doc);
 							$resql = $this->db->query($sql);
 							if ($resql) {
@@ -2467,7 +2467,7 @@ 
 				$tab[] = "";
 				//print '"'.dol_trunc(str_replace('"', '', $line->label_operation),40,'right','UTF-8',1).'"';
 				//Libellé manual
-				$tab[] = dol_trunc(str_replace('"', '', $invoice_ref . (!empty($company_name) ? ' - ' : '') . $company_name), 40, 'right', 'UTF-8', 1);
+				$tab[] = dol_trunc(str_replace('"', '', $invoice_ref.(!empty($company_name) ? ' - ' : '').$company_name), 40, 'right', 'UTF-8', 1);
 				//Numéro de pièce
 				$tab[] = dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1);
 				//Devise
@@ -2521,8 +2521,8 @@ 
 				}
 				$tab[] = "";
 				$tab[] = '"'.dol_trunc(str_replace('"', '', $line->label_operation), 40, 'right', 'UTF-8', 1).'"';
-				$tab[] = '"' . dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1) . '"';
-				$tab[] = '"' . dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1) . '"';
+				$tab[] = '"'.dol_trunc(str_replace('"', '', $line->doc_ref), 40, 'right', 'UTF-8', 1).'"';
+				$tab[] = '"'.dol_trunc(str_replace('"', '', $line->piece_num), 10, 'right', 'UTF-8', 1).'"';
 				$tab[] = price2num(abs($line->debit - $line->credit));
 				$tab[] = $line->sens;
 				$tab[] = $date_document;

htdocs/accountancy/tpl/export_journal.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -72,5 +72,5 @@
 }
 
 if (empty($downloadMode)) {
-	header('Content-Disposition: attachment;filename=' . $completefilename);
+	header('Content-Disposition: attachment;filename='.$completefilename);
 }

htdocs/accountancy/admin/card.php

Spacing +14 added lines, -14 removed lines

@@ -76,9 +76,9 @@ 
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 		} else {
-			$sql = "SELECT pcg_version FROM " . MAIN_DB_PREFIX . "accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
+			$sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid = ".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
 
-			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+			dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
 			$result = $db->query($sql);
 			$obj = $db->fetch_object($result);
 
@@ -123,7 +123,7 @@ 
 			if (!$error) {
 				setEventMessages("RecordCreatedSuccessfully", null, 'mesgs');
 				$urltogo = $backtopage ? $backtopage : DOL_URL_ROOT.'/accountancy/admin/account.php';
-				header("Location: " . $urltogo);
+				header("Location: ".$urltogo);
 				exit;
 			}
 		}
@@ -141,7 +141,7 @@ 
 
 			$sql = "SELECT pcg_version FROM ".MAIN_DB_PREFIX."accounting_system WHERE rowid=".((int) getDolGlobalInt('CHARTOFACCOUNTS'));
 
-			dol_syslog('accountancy/admin/card.php:: $sql=' . $sql);
+			dol_syslog('accountancy/admin/card.php:: $sql='.$sql);
 			$result2 = $db->query($sql);
 			$obj = $db->fetch_object($result2);
 
@@ -171,8 +171,8 @@ 
 			$result = $object->update($user);
 
 			if ($result > 0) {
-				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id);
-				header("Location: " . $urltogo);
+				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"]."?id=".$id);
+				header("Location: ".$urltogo);
 				exit();
 			} elseif ($result == -2) {
 				setEventMessages($langs->trans("ErrorAccountNumberAlreadyExists", $object->account_number), null, 'errors');
@@ -264,14 +264,14 @@ 
 	print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 	// autosuggest from existing account types if found
 	print '<datalist id="pcg_type_datalist">';
-	$sql = "SELECT DISTINCT pcg_type FROM " . MAIN_DB_PREFIX . "accounting_account";
-	$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
-	$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
+	$sql = "SELECT DISTINCT pcg_type FROM ".MAIN_DB_PREFIX."accounting_account";
+	$sql .= " WHERE fk_pcg_version = '".$db->escape($accountsystem->ref)."'";
+	$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy.
 	$sql .= ' LIMIT 50000'; // just as a sanity check
 	$resql = $db->query($sql);
 	if ($resql) {
 		while ($obj = $db->fetch_object($resql)) {
-			print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
+			print '<option value="'.dol_escape_htmltag($obj->pcg_type).'">';
 		}
 	}
 	print '</datalist>';
@@ -341,14 +341,14 @@ 
 			print '<input type="text" name="pcg_type" list="pcg_type_datalist" value="'.dol_escape_htmltag(GETPOSTISSET('pcg_type') ? GETPOST('pcg_type', 'alpha') : $object->pcg_type).'">';
 			// autosuggest from existing account types if found
 			print '<datalist id="pcg_type_datalist">';
-			$sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account';
-			$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
-			$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
+			$sql = 'SELECT DISTINCT pcg_type FROM '.MAIN_DB_PREFIX.'accounting_account';
+			$sql .= " WHERE fk_pcg_version = '".$db->escape($accountsystem->ref)."'";
+			$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')'; // Always limit to current entity. No sharing in accountancy.
 			$sql .= ' LIMIT 50000'; // just as a sanity check
 			$resql = $db->query($sql);
 			if ($resql) {
 				while ($obj = $db->fetch_object($resql)) {
-					print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
+					print '<option value="'.dol_escape_htmltag($obj->pcg_type).'">';
 				}
 			}
 			print '</datalist>';

htdocs/compta/tva/card.php

Spacing +5 added lines, -5 removed lines

@@ -252,7 +252,7 @@ 
 				}
 			}
 			if (empty($error)) {
-				header("Location: card.php?id=" . $object->id);
+				header("Location: card.php?id=".$object->id);
 				exit;
 			}
 		}
@@ -307,7 +307,7 @@ 
 		} else {
 			$result = $object->fetch($id);
 
-			$object->amount	= $amount;
+			$object->amount = $amount;
 
 			$result = $object->update($user);
 			if ($result <= 0) {
@@ -469,7 +469,7 @@ 
 
 	// Auto create payment
 	print '<tr><td><label for="auto_create_paiement">'.$langs->trans('AutomaticCreationPayment').'</label></td>';
-	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" ' . (empty($auto_create_payment) ? '' : 'checked="checked"') . ' value="1"></td></tr>'."\n";
+	print '<td><input id="auto_create_paiement" name="auto_create_paiement" type="checkbox" '.(empty($auto_create_payment) ? '' : 'checked="checked"').' value="1"></td></tr>'."\n";
 
 	print '<tr class="hide_if_no_auto_create_payment">';
 	print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
@@ -609,9 +609,9 @@ 
 	print '</td></tr>';
 
 	if ($action == 'edit') {
-		print '<tr><td class="fieldrequired">' . $langs->trans("Amount") . '</td><td><input name="amount" size="10" value="' . price($object->amount) . '"></td></tr>';
+		print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.price($object->amount).'"></td></tr>';
 	} else {
-		print '<tr><td>' . $langs->trans("Amount") . '</td><td>' . price($object->amount) . '</td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 	}
 
 	// Mode of payment

htdocs/compta/stats/index.php

Spacing +3 added lines, -3 removed lines

@@ -52,8 +52,8 @@ 
 	$month_current = dol_print_date(dol_now(), "%m");
 	$year_start = $year - $nbofyear + (getDolGlobalInt('SOCIETE_FISCAL_MONTH_START') > 1 ? 0 : 1);
 }
-$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver');	// We use timezone of server so report is same from everywhere
-$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver');		// We use timezone of server so report is same from everywhere
+$date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear, 'tzserver'); // We use timezone of server so report is same from everywhere
+$date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear, 'tzserver'); // We use timezone of server so report is same from everywhere
 
 // We define date_start and date_end
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
@@ -255,7 +255,7 @@ 
 	$sql .= " AND b.doc_type = 'customer_invoice'";
 	$sql .= " AND aa.entity = ".$conf->entity;
 	$sql .= " AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
-	$sql .= " AND aa.pcg_type = 'INCOME'";		// TODO Be able to use a custom group
+	$sql .= " AND aa.pcg_type = 'INCOME'"; // TODO Be able to use a custom group
 }
 $sql .= " GROUP BY dm";
 $sql .= " ORDER BY dm";

htdocs/compta/bank/class/paymentvarious.class.php

Spacing +2 added lines, -2 removed lines

@@ -306,7 +306,7 @@ 
 				$this->type_payment         = $obj->fk_typepayment;
 				$this->num_payment          = $obj->num_payment;
 				$this->label                = $obj->label;
-				$this->note                 = $obj->note_private;	// For backward compatibility
+				$this->note                 = $obj->note_private; // For backward compatibility
 				$this->note_private         = $obj->note_private;
 				$this->subledger_account    = $obj->subledger_account;
 				$this->accountancy_code     = $obj->accountancy_code;
@@ -486,7 +486,7 @@ 
 		$sql .= ", ".($this->fk_project > 0 ? ((int) $this->fk_project) : 0);
 		$sql .= ", ".((int) $user->id);
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", NULL";	// Filled later
+		$sql .= ", NULL"; // Filled later
 		$sql .= ", ".((int) $conf->entity);
 		$sql .= ")";
 

htdocs/compta/prelevement/class/ligneprelevement.class.php

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
 
 	const STATUS_DRAFT = 0;
 	const STATUS_NOT_USED = 1;
-	const STATUS_CREDITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
-	const STATUS_DEBITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
+	const STATUS_CREDITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
+	const STATUS_DEBITED = 2; // STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
 	const STATUS_REJECTED = 3;
 
 

htdocs/compta/localtax/clients.php

Spacing +1 added lines, -1 removed lines

@@ -142,7 +142,7 @@
 
 $calc = getDolGlobalString('MAIN_INFO_LOCALTAX_CALC').$local;
 // Affiche en-tete du rapport
-$description='';
+$description = '';
 if ($calc == 0 || $calc == 1) {	// Calculate on invoice for goods and services
 	$calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec");
 	$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';

htdocs/fichinter/contact.php

Spacing +2 added lines, -2 removed lines

@@ -124,8 +124,8 @@
 	// Ref customer
 	//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', 0, 1);
 	//$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1);
-	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project