Dolibarr / dolibarr

htdocs/takepos/receipt.php

Spacing +9 added lines, -9 removed lines

@@ -140,7 +140,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
 	}
 }
 
@@ -218,7 +218,7 @@ 
 <?php
 // Invoice Ref
 if (getDolGlobalString('TAKEPOS_RECEIPT_NAME')) {
-	print getDolGlobalString('TAKEPOS_RECEIPT_NAME') . " ";
+	print getDolGlobalString('TAKEPOS_RECEIPT_NAME')." ";
 } else {
 	print $langs->trans("InvoiceRef")." ";
 }
@@ -262,7 +262,7 @@ 
 $isADuplicata = $object->pos_print_counter;
 
 if ($isADuplicata) {
-	print '<b>*** DUPLICATA***</b>';	// Hard coded string
+	print '<b>*** DUPLICATA***</b>'; // Hard coded string
 }
 ?>
 </p>
@@ -291,13 +291,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) {
@@ -461,7 +461,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/public/company/new.php

Spacing +53 added lines, -53 removed lines

@@ -52,16 +52,16 @@ 
 
 // Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/payments.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
-require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent_type.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/cunits.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/public.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/public.lib.php';
 
 /**
  * @var Conf $conf
@@ -149,8 +149,8 @@ 
 	printCommonFooter('public');
 
 	if (!empty($conf->use_javascript_ajax)) {
-		print "\n" . '<!-- Includes JS Footer of Dolibarr -->' . "\n";
-		print '<script src="' . DOL_URL_ROOT . '/core/js/lib_foot.js.php?lang=' . $langs->defaultlang . '"></script>' . "\n";
+		print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+		print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.'"></script>'."\n";
 	}
 
 	print "</body>\n";
@@ -188,7 +188,7 @@ 
 		$ok = (array_key_exists($sessionkey, $_SESSION) && (strtolower($_SESSION[$sessionkey]) == strtolower(GETPOST('code'))));
 		if (!$ok) {
 			$error++;
-			$errmsg .= $langs->trans("ErrorBadValueForCode") . "<br>\n";
+			$errmsg .= $langs->trans("ErrorBadValueForCode")."<br>\n";
 			$action = '';
 		}
 	}
@@ -203,7 +203,7 @@ 
 		$societe->phone = GETPOST('phone', 'alpha');
 		$societe->fax = GETPOST('fax', 'alpha');
 		$societe->email = trim(GETPOST('email', 'email'));
-		$societe->client = 2 ; // our client is a prospect
+		$societe->client = 2; // our client is a prospect
 		$societe->code_client = '-1';
 		$societe->name_alias = GETPOST('name_alias', 'alphanohtml');
 		$societe->note_private = GETPOST('note_private', 'alphanohtml');
@@ -229,7 +229,7 @@ 
 		if (!$error) {
 			$result = $societe->create($user);
 			if ($result > 0) {
-				require_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 				$object = $societe;
 
 				if (!empty($backtopage)) {
@@ -238,7 +238,7 @@ 
 					$urlback = getDolGlobalString('MEMBER_URL_REDIRECT_SUBSCRIPTION');
 					// TODO Make replacement of __AMOUNT__, etc...
 				} else {
-					$urlback = $_SERVER["PHP_SELF"] . "?action=added&token=" . newToken();
+					$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
 				}
 			} else {
 				$error++;
@@ -250,7 +250,7 @@ 
 	if (!$error) {
 		$db->commit();
 
-		header("Location: " . $urlback);
+		header("Location: ".$urlback);
 		exit;
 	} else {
 		$db->rollback();
@@ -290,7 +290,7 @@ 
 llxHeaderVierge($langs->trans("ContactUs"));
 
 print '<br>';
-print load_fiche_titre(img_picto('', 'member_nocolor', 'class="pictofixedwidth"') . ' &nbsp; ' . $langs->trans("ContactUs"), '', '', 0, '', 'center');
+print load_fiche_titre(img_picto('', 'member_nocolor', 'class="pictofixedwidth"').' &nbsp; '.$langs->trans("ContactUs"), '', '', 0, '', 'center');
 
 
 print '<div align="center">';
@@ -298,9 +298,9 @@ 
 
 print '<div class="center subscriptionformhelptext opacitymedium justify">';
 if (getDolGlobalString('COMPANY_NEWFORM_TEXT')) {
-	print $langs->trans(getDolGlobalString('COMPANY_NEWFORM_TEXT')) . "<br>\n";
+	print $langs->trans(getDolGlobalString('COMPANY_NEWFORM_TEXT'))."<br>\n";
 } else {
-	print $langs->trans("ContactUsDesc", getDolGlobalString("MAIN_INFO_SOCIETE_MAIL")) . "<br>\n";
+	print $langs->trans("ContactUsDesc", getDolGlobalString("MAIN_INFO_SOCIETE_MAIL"))."<br>\n";
 }
 print '</div>';
 
@@ -308,13 +308,13 @@ 
 dol_htmloutput_events();
 
 // Print form
-print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST" name="newprospect">' . "\n";
-print '<input type="hidden" name="token" value="' . newToken() . '" / >';
-print '<input type="hidden" name="entity" value="' . $entity . '" />';
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newprospect">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'" / >';
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print '<input type="hidden" name="action" value="add" />';
 print '<br>';
 
-$messagemandatory = '<span class="">' . $langs->trans("FieldsWithAreMandatory", '*') . '</span>';
+$messagemandatory = '<span class="">'.$langs->trans("FieldsWithAreMandatory", '*').'</span>';
 //print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
 //print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
 
@@ -350,7 +350,7 @@ 
 </script>';
 
 
-print '<table class="border" summary="form to subscribe" id="tablesubscribe">' . "\n";
+print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 //Third party name
 /*
 if ($object->particulier || $private) {
@@ -360,30 +360,30 @@ 
 }
 */
 print '<tr class="tr-field-thirdparty-name"><td class="titlefieldcreate">'; // text appreas left
-print '<input type="hidden" name="ThirdPartyName" value="' . $langs->trans('ThirdPartyName') . '">';
-print '<span id="TypeName" class="fieldrequired"  title="' .dol_escape_htmltag($langs->trans("FieldsWithAreMandatory", '*')) . '" >' . $form->editfieldkey('Company', 'name', '', $object, 0) . '<span class="star"> *</span></span>';
+print '<input type="hidden" name="ThirdPartyName" value="'.$langs->trans('ThirdPartyName').'">';
+print '<span id="TypeName" class="fieldrequired"  title="'.dol_escape_htmltag($langs->trans("FieldsWithAreMandatory", '*')).'" >'.$form->editfieldkey('Company', 'name', '', $object, 0).'<span class="star"> *</span></span>';
 print '</td><td>'; // inline input
-print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="' . dol_escape_htmltag($object->name) . '" autofocus="autofocus">';
+print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
 //
 
 // Name and lastname
-print '<tr><td class="classfortooltip" title="' . dol_escape_htmltag($messagemandatory) . '">' . $langs->trans("Firstname") . ' <span class="star">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="' . dol_escape_htmltag(GETPOST('firstname')) . '"></td></tr>' . "\n";
+print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Firstname").' <span class="star">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
 
-print '<tr><td class="classfortooltip" title="' . dol_escape_htmltag($messagemandatory) . '">' . $langs->trans("Lastname") . ' <span class="star">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="' . dol_escape_htmltag(GETPOST('lastname')) . '"></td></tr>' . "\n";
+print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Lastname").' <span class="star">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
 
 // Address
 print '<tr><td class="tdtop">';
 print $form->editfieldkey('Address', 'address', '', $object, 0);
 print '</td>';
 print '<td>';
-print '<textarea name="address" id="address" class="quatrevingtpercent" rows="' . ROWS_2 . '" wrap="soft">';
+print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_2.'" wrap="soft">';
 print dol_escape_htmltag($object->address, 0, 1);
 print '</textarea>';
 print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
 print '</td></tr>';
 
 // Country
-print '<tr><td>' . $form->editfieldkey('Country', 'selectcountry_id', '', $object, 0) . '</td><td class="maxwidthonsmartphone">';
+print '<tr><td>'.$form->editfieldkey('Country', 'selectcountry_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
 print img_picto('', 'country', 'class="pictofixedwidth"');
 print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 maxwidth500 widthcentpercentminusx');
 if ($user->admin) {
@@ -392,40 +392,40 @@ 
 print '</td></tr>';
 
 // Phone / Fax
-print '<tr><td>' . $form->editfieldkey('Phone', 'phone', '', $object, 0) . '</td>';
-print '<td>' . img_picto('', 'object_phoning', 'class="pictofixedwidth"') . ' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="' . (GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone) . '"></td>';
+print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
+print '<td>'.img_picto('', 'object_phoning', 'class="pictofixedwidth"').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ? GETPOST('phone', 'alpha') : $object->phone).'"></td>';
 print '</tr>';
 
 print '<tr>';
-print '<td>' . $form->editfieldkey('Fax', 'fax', '', $object, 0) . '</td>';
-print '<td>' . img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"') . ' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="' . (GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax) . '"></td>';
+print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
+print '<td>'.img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
 print '</tr>';
 
 // Email / Web
-print '<tr><td>' . $form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', !getDolGlobalString('SOCIETE_EMAIL_MANDATORY') ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY) . '</td>';
-print '<td>' . img_picto('', 'object_email', 'class="pictofixedwidth"') . ' <input type="text" class="maxwidth200 widthcentpercentminusx" name="email" id="email" value="' . $object->email . '"></td>';
+print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', !getDolGlobalString('SOCIETE_EMAIL_MANDATORY') ? '' : $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
+print '<td>'.img_picto('', 'object_email', 'class="pictofixedwidth"').' <input type="text" class="maxwidth200 widthcentpercentminusx" name="email" id="email" value="'.$object->email.'"></td>';
 if (isModEnabled('mailing') && getDolGlobalString('THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION')) {
 	if ($conf->browser->layout == 'phone') {
 		print '</tr><tr>';
 	}
-	print '<td class="individualline noemail">' . $form->editfieldkey($langs->trans('No_Email') . ' (' . $langs->trans('Contact') . ')', 'contact_no_email', '', $object, 0) . '</td>';
-	print '<td class="individualline" ' . (($conf->browser->layout == 'phone') /* || !isModEnabled('mailing') */ ? ' colspan="3"' : '') . '>' . $form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ? GETPOST("contact_no_email", 'alpha') : (empty($object->no_email) ? 0 : 1)), 1, false, 1) . '</td>';
+	print '<td class="individualline noemail">'.$form->editfieldkey($langs->trans('No_Email').' ('.$langs->trans('Contact').')', 'contact_no_email', '', $object, 0).'</td>';
+	print '<td class="individualline" '.(($conf->browser->layout == 'phone') /* || !isModEnabled('mailing') */ ? ' colspan="3"' : '').'>'.$form->selectyesno('contact_no_email', (GETPOSTISSET("contact_no_email") ? GETPOST("contact_no_email", 'alpha') : (empty($object->no_email) ? 0 : 1)), 1, false, 1).'</td>';
 }
 print '</tr>';
 
-print '<tr><td>' . $form->editfieldkey('Web', 'url', '', $object, 0) . '</td>';
-print '<td>' . img_picto('', 'globe', 'class="pictofixedwidth"') . ' <input type="text" class="maxwidth500 widthcentpercentminusx" name="url" id="url" value="' . $object->url . '"></td></tr>';
+print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
+print '<td>'.img_picto('', 'globe', 'class="pictofixedwidth"').' <input type="text" class="maxwidth500 widthcentpercentminusx" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
 
 // Comments
 print '<tr>';
-print '<td class="tdtop">' . $langs->trans("Comments") . '</td>';
-print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="' . ROWS_3 . '">' . dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1) . '</textarea></td>';
-print '</tr>' . "\n";
+print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
+print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1).'</textarea></td>';
+print '</tr>'."\n";
 
 
 // Other attributes
-$parameters['tpl_context'] = 'public';	// define template context to public
+$parameters['tpl_context'] = 'public'; // define template context to public
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 
@@ -433,14 +433,14 @@ 
 
 // Display Captcha code if is enabled
 if (getDolGlobalString('MAIN_SECURITY_ENABLECAPTCHA_THIRDPARTY')) {
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
-	print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">' . $langs->trans("SecurityCode") . '</span></label></td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+	print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.$langs->trans("SecurityCode").'</span></label></td><td>';
 	print '<span class="span-icon-security inline-block">';
-	print '<input id="securitycode" placeholder="' . $langs->trans("SecurityCode") . '" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" />';
+	print '<input id="securitycode" placeholder="'.$langs->trans("SecurityCode").'" class="flat input-icon-security width150" type="text" maxlength="5" name="code" tabindex="3" />';
 	print '</span>';
 	print '<span class="nowrap inline-block">';
-	print '<img class="inline-block valignmiddle" src="' . DOL_URL_ROOT . '/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />';
-	print '<a class="inline-block valignmiddle" href="' . $_SERVER['PHP_SELF'] . '" tabindex="4" data-role="button">' . img_picto($langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"') . '</a>';
+	print '<img class="inline-block valignmiddle" src="'.DOL_URL_ROOT.'/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />';
+	print '<a class="inline-block valignmiddle" href="'.$_SERVER['PHP_SELF'].'" tabindex="4" data-role="button">'.img_picto($langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"').'</a>';
 	print '</span>';
 	print '</td></tr>';
 }
@@ -451,9 +451,9 @@ 
 
 // Save / Submit
 print '<div class="center">';
-print '<input type="submit" value="' . $langs->trans("Send") . '" id="submitsave" class="button">';
+print '<input type="submit" value="'.$langs->trans("Send").'" id="submitsave" class="button">';
 if (!empty($backtopage)) {
-	print ' &nbsp; &nbsp; <input type="submit" value="' . $langs->trans("Cancel") . '" id="submitcancel" class="button button-cancel">';
+	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
 }
 print '</div>';
 

htdocs/expensereport/class/expensereport.class.php

Spacing +22 added lines, -22 removed lines

@@ -255,12 +255,12 @@ 
 	 * @var float|int
 	 * @deprecated See $total_localtax1
 	 */
-	public $localtax1;	// for backward compatibility (real field should be total_localtax1 defined into CommonObject)
+	public $localtax1; // for backward compatibility (real field should be total_localtax1 defined into CommonObject)
 	/**
 	 * @var float|int
 	 * @deprecated See $total_localtax2
 	 */
-	public $localtax2;	// for backward compatibility (real field should be total_localtax2 defined into CommonObject)
+	public $localtax2; // for backward compatibility (real field should be total_localtax2 defined into CommonObject)
 
 	/**
 	 * Draft status
@@ -351,8 +351,8 @@ 
 		$this->total_tva = 0;
 		$this->total_localtax1 = 0;
 		$this->total_localtax2 = 0;
-		$this->localtax1 = 0;	// For backward compatibility
-		$this->localtax2 = 0;	// For backward compatibility
+		$this->localtax1 = 0; // For backward compatibility
+		$this->localtax2 = 0; // For backward compatibility
 		$this->modepaymentid = 0;
 
 		// List of language codes for status
@@ -714,8 +714,8 @@ 
 				$this->total_ht     = $obj->total_ht;
 				$this->total_tva    = $obj->total_tva;
 				$this->total_ttc    = $obj->total_ttc;
-				$this->localtax1    = $obj->total_localtax1;		// For backward compatibility
-				$this->localtax2    = $obj->total_localtax2;		// For backward compatibility
+				$this->localtax1    = $obj->total_localtax1; // For backward compatibility
+				$this->localtax2    = $obj->total_localtax2; // For backward compatibility
 				$this->total_localtax1 = $obj->total_localtax1;
 				$this->total_localtax2 = $obj->total_localtax2;
 
@@ -978,7 +978,7 @@ 
 
 		$this->note_private = 'Private note';
 		$this->note_public = 'SPECIMEN';
-		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5);	// We can force the nb of lines to test from command line (but not more than 1000)
+		$nbp = min(1000, GETPOSTINT('nblines') ? GETPOSTINT('nblines') : 5); // We can force the nb of lines to test from command line (but not more than 1000)
 		$xnbp = 0;
 		while ($xnbp < $nbp) {
 			$line = new ExpenseReportLine($this->db);
@@ -1188,7 +1188,7 @@ 
 
 				$deplig->rule_warning_message = $objp->rule_warning_message;
 
-				$deplig->rang               = $objp->rang;
+				$deplig->rang = $objp->rang;
 
 				$this->lines[$i] = $deplig;
 
@@ -1736,7 +1736,7 @@ 
 		if (getDolGlobalString('EXPENSEREPORT_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('EXPENSEREPORT_ADDON') . ".php";
+			$file = getDolGlobalString('EXPENSEREPORT_ADDON').".php";
 			$classname = getDolGlobalString('EXPENSEREPORT_ADDON');
 
 			// Include file with class
@@ -1893,7 +1893,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) {
@@ -1986,8 +1986,8 @@ 
 			$this->line = new ExpenseReportLine($this->db);
 
 			// We don't know seller and buyer for expense reports
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
 			$buyer = new Societe($this->db);
 
 			$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -2069,8 +2069,8 @@ 
 
 		// We don't know seller and buyer for expense reports
 		if (!is_object($seller)) {
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
 		}
 
 		$expensereportrule = new ExpenseReportRule($this->db);
@@ -2154,8 +2154,8 @@ 
 
 		// We don't know seller and buyer for expense reports
 		if (!is_object($seller)) {
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
 		}
 
 		$expenseik = new ExpenseReportIk($this->db);
@@ -2249,10 +2249,10 @@ 
 			$type = 0; // TODO What if type is service ?
 
 			// We don't know seller and buyer for expense reports
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
-			$seller->localtax1_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
-			$seller->localtax2_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
+			$seller->localtax1_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
+			$seller->localtax2_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
 			$buyer = new Societe($this->db);
 
 			$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -2412,7 +2412,7 @@ 
 
 		if ($row === false) {
 			$this->error = $this->db->lasterror();
-			dol_syslog(__CLASS__."::". __METHOD__."  Error ".$this->error, LOG_ERR);
+			dol_syslog(__CLASS__."::".__METHOD__."  Error ".$this->error, LOG_ERR);
 			return -1;
 		}
 
@@ -2835,7 +2835,7 @@ 
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">' . $this->getNomUrl(1) . '</span>';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.$this->getNomUrl(1).'</span>';
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}

htdocs/admin/openid_connect.php

Spacing +32 added lines, -32 removed lines

@@ -116,7 +116,7 @@ 
 if ($action != '') {
 	if (!$error) {
 		setEventMessage($langs->trans("SetupSaved"));
-		header("Location: " . $_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
 		setEventMessages('', $errors, 'errors');
@@ -187,84 +187,84 @@ 
 	print "</tr>\n";
 
 	// MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM
-	print '<tr class="oddeven">' . "\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcLoginClaimName").'</td>'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcLoginClaimDesc").'</td>'."\n";
-	print '<td align="right">' . "\n";
+	print '<td align="right">'."\n";
 	print '<input name="MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM" id="MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM" class="minwidth400" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM') ? GETPOST('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM', 'nohtml') : (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM') ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_LOGIN_CLAIM") : ''))).'"></td></tr>';
-	print '</td></tr>' . "\n";
+	print '</td></tr>'."\n";
 
 	// MAIN_AUTHENTICATION_OIDC_CLIENT_ID
-	print '<tr class="oddeven">' . "\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcClientIdName").'</td>'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcClientIdDesc").'</td>'."\n";
-	print '<td align="right">' . "\n";
+	print '<td align="right">'."\n";
 	print '<input name="MAIN_AUTHENTICATION_OIDC_CLIENT_ID" id="MAIN_AUTHENTICATION_OIDC_CLIENT_ID" class="minwidth400" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_CLIENT_ID') ? GETPOST('MAIN_AUTHENTICATION_OIDC_CLIENT_ID', 'nohtml') : (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_CLIENT_ID') ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_CLIENT_ID") : ''))).'"></td></tr>';
-	print '</td></tr>' . "\n";
+	print '</td></tr>'."\n";
 
 	// MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET
-	print '<tr class="oddeven">' . "\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcClientSecretName").'</td>'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcClientSecretDesc").'</td>'."\n";
-	print '<td align="right">' . "\n";
+	print '<td align="right">'."\n";
 	print '<input type="password" name="MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET" id="MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET" class="minwidth400" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET') ? GETPOST('MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET', 'nohtml') : (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET') ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_CLIENT_SECRET") : ''))).'"></td></tr>';
-	print '</td></tr>' . "\n";
+	print '</td></tr>'."\n";
 
 	// MAIN_AUTHENTICATION_OIDC_SCOPES
-	print '<tr class="oddeven">' . "\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcScopesName").'</td>'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcScopesDesc").'</td>'."\n";
-	print '<td align="right">' . "\n";
+	print '<td align="right">'."\n";
 	print '<input name="MAIN_AUTHENTICATION_OIDC_SCOPES" id="MAIN_AUTHENTICATION_OIDC_SCOPES" class="minwidth400" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_SCOPES') ? GETPOST('MAIN_AUTHENTICATION_OIDC_SCOPES', 'nohtml') : (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_SCOPES') ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_SCOPES") : ''))).'"></td></tr>';
-	print '</td></tr>' . "\n";
+	print '</td></tr>'."\n";
 
 	// MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL
-	print '<tr class="oddeven">' . "\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcAuthorizeUrlName").'</td>'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcAuthorizeUrlDesc").'</td>'."\n";
-	print '<td align="right">' . "\n";
+	print '<td align="right">'."\n";
 	print '<input name="MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL" id="MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL" class="minwidth400" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL') ? GETPOST('MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL', 'nohtml') : (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL') ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_AUTHORIZE_URL") : ''))).'"></td></tr>';
-	print '</td></tr>' . "\n";
+	print '</td></tr>'."\n";
 
 	// MAIN_AUTHENTICATION_OIDC_TOKEN_URL
-	print '<tr class="oddeven">' . "\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcTokenUrlName").'</td>'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcTokenUrlDesc").'</td>'."\n";
-	print '<td align="right">' . "\n";
+	print '<td align="right">'."\n";
 	print '<input name="MAIN_AUTHENTICATION_OIDC_TOKEN_URL" id="MAIN_AUTHENTICATION_OIDC_TOKEN_URL" class="minwidth400" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_TOKEN_URL') ? GETPOST('MAIN_AUTHENTICATION_OIDC_TOKEN_URL', 'nohtml') : (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_TOKEN_URL') ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_TOKEN_URL") : ''))).'"></td></tr>';
-	print '</td></tr>' . "\n";
+	print '</td></tr>'."\n";
 
 	// MAIN_AUTHENTICATION_OIDC_USERINFO_URL
-	print '<tr class="oddeven">' . "\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcUserinfoUrlName").'</td>'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcUserinfoUrlDesc").'</td>'."\n";
-	print '<td align="right">' . "\n";
+	print '<td align="right">'."\n";
 	print '<input name="MAIN_AUTHENTICATION_OIDC_USERINFO_URL" id="MAIN_AUTHENTICATION_OIDC_USERINFO_URL" class="minwidth400" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_USERINFO_URL') ? GETPOST('MAIN_AUTHENTICATION_OIDC_USERINFO_URL', 'nohtml') : (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_USERINFO_URL') ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_USERINFO_URL") : ''))).'"></td></tr>';
-	print '</td></tr>' . "\n";
+	print '</td></tr>'."\n";
 
 	// MAIN_AUTHENTICATION_OIDC_LOGOUT_URL
-	print '<tr class="oddeven">' . "\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcLogoutUrlName").'</td>'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcLogoutUrlDesc").'</td>'."\n";
-	print '<td align="right">' . "\n";
+	print '<td align="right">'."\n";
 	print '<input name="MAIN_AUTHENTICATION_OIDC_LOGOUT_URL" id="MAIN_AUTHENTICATION_OIDC_LOGOUT_URL" class="minwidth400" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_AUTHENTICATION_OIDC_LOGOUT_URL') ? GETPOST('MAIN_AUTHENTICATION_OIDC_LOGOUT_URL', 'nohtml') : (getDolGlobalString('MAIN_AUTHENTICATION_OIDC_LOGOUT_URL') ? getDolGlobalString("MAIN_AUTHENTICATION_OIDC_LOGOUT_URL") : ''))).'"></td></tr>';
-	print '</td></tr>' . "\n";
+	print '</td></tr>'."\n";
 
 	// REDIRECT_URL
-	print '<tr class="oddeven">' . "\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcRedirectUrlName").'</td>'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcRedirectUrlDesc").'</td>'."\n";
-	print '<td align="right">' . "\n";
+	print '<td align="right">'."\n";
 	print '<input class="minwidth400" value="'.dol_escape_htmltag(openid_connect_get_redirect_url()).'" disabled></td></tr>';
-	print '</td></tr>' . "\n";
+	print '</td></tr>'."\n";
 
 	// LOGOUT_URL
-	print '<tr class="oddeven">' . "\n";
+	print '<tr class="oddeven">'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcLogoutRedirectUrlName").'</td>'."\n";
 	print '<td>'.$langs->trans("MainAuthenticationOidcLogoutRedirectUrlDesc").'</td>'."\n";
-	print '<td align="right">' . "\n";
-	print '<input class="minwidth400" value="'.dol_escape_htmltag(getDolGlobalString('MAIN_LOGOUT_GOTO_URL', DOL_MAIN_URL_ROOT . "/index.php")).'" disabled></td></tr>';
-	print '</td></tr>' . "\n";
+	print '<td align="right">'."\n";
+	print '<input class="minwidth400" value="'.dol_escape_htmltag(getDolGlobalString('MAIN_LOGOUT_GOTO_URL', DOL_MAIN_URL_ROOT."/index.php")).'" disabled></td></tr>';
+	print '</td></tr>'."\n";
 
 	print '</table>'."\n";
 	print '</div>';

htdocs/user/logout.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 	unset($_SESSION["dol_login"]);
 	unset($_SESSION['dol_entity']);
 	unset($_SESSION['urlfrom']);
-	die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]);	// TODO Really ? It at least delete the session file ?!
+	die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]); // TODO Really ? It at least delete the session file ?!
 }
 
 /**
@@ -111,9 +111,9 @@ 
 if (getDolGlobalInt('MAIN_AUTHENTICATION_OIDC_ON', 0) > 0 && !empty($_SESSION['OPENID_CONNECT']) && getDolGlobalString("MAIN_AUTHENTICATION_OIDC_LOGOUT_URL")) {
 	// We need the full URL
 	if (strpos($url, '/') === 0) {
-		$url = DOL_MAIN_URL_ROOT . $url;
+		$url = DOL_MAIN_URL_ROOT.$url;
 	}
-	$url = getDolGlobalString('MAIN_AUTHENTICATION_OIDC_LOGOUT_URL') . '?client_id=' . getDolGlobalString('MAIN_AUTHENTICATION_OIDC_CLIENT_ID') . '&returnTo=' . urlencode($url);
+	$url = getDolGlobalString('MAIN_AUTHENTICATION_OIDC_LOGOUT_URL').'?client_id='.getDolGlobalString('MAIN_AUTHENTICATION_OIDC_CLIENT_ID').'&returnTo='.urlencode($url);
 }
 
 // Destroy session

htdocs/don/list.php

Spacing +7 added lines, -7 removed lines

@@ -56,7 +56,7 @@ 
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $mode       = GETPOST('mode', 'aZ'); // The display mode ('list', 'kanban', 'hierarchy', 'calendar', 'gantt', ...)
-$groupby = GETPOST('groupby', 'aZ09');	// Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
+$groupby = GETPOST('groupby', 'aZ09'); // Example: $groupby = 'p.fk_opp_status' or $groupby = 'p.fk_statut'
 
 $type = GETPOST('type', 'aZ');
 
@@ -94,7 +94,7 @@ 
 $object = new Don($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->don->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -249,8 +249,8 @@ 
 
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
 $sql .= " ON p.rowid = d.fk_projet";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe AS s ON s.rowid = d.fk_soc";
-$sql .= " WHERE d.entity IN (". getEntity('donation') . ")";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe AS s ON s.rowid = d.fk_soc";
+$sql .= " WHERE d.entity IN (".getEntity('donation').")";
 
 if ($search_status != '' && $search_status != '-4') {
 	$sql .= " AND d.fk_statut IN (".$db->sanitize($search_status).")";
@@ -327,7 +327,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-donation page-list bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'mod-donation page-list bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 // Example : Adding jquery code
 // print '<script type="text/javascript">
@@ -483,7 +483,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column ? 'left' : '');  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column ? 'left' : ''); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -625,7 +625,7 @@ 
 		if (!empty($obj->socid) && $company->id > 0) {
 			$donationstatic->societe = $company->getNomUrl(1);
 		} else {
-			$donationstatic->societe = (string) $obj->societe;  // Value from sql query
+			$donationstatic->societe = (string) $obj->societe; // Value from sql query
 		}
 
 		$object = $donationstatic;

htdocs/compta/tva/quadri_detail.php

Spacing +95 added lines, -95 removed lines

@@ -39,18 +39,18 @@ 
  * @var Translate $langs
  * @var User $user
  */
-require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/tax.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/tva/class/tva.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/localtax/class/localtax.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
-require_once DOL_DOCUMENT_ROOT . '/fourn/class/paiementfourn.class.php';
-require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
-require_once DOL_DOCUMENT_ROOT . '/expensereport/class/paymentexpensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
@@ -127,11 +127,11 @@ 
 $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
 foreach ($listofparams as $param) {
 	if (GETPOST($param) != '') {
-		$morequerystring .= ($morequerystring ? '&' : '') . $param . '=' . GETPOST($param);
+		$morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
 	}
 }
 
-$title = $langs->trans("VATReport") . " " . dol_print_date($date_start, '', 'tzserver') . " -> " . dol_print_date($date_end, '', 'tzserver');
+$title = $langs->trans("VATReport")." ".dol_print_date($date_start, '', 'tzserver')." -> ".dol_print_date($date_end, '', 'tzserver');
 llxHeader('', $title, '', '', 0, 0, '', '', $morequerystring);
 
 
@@ -139,8 +139,8 @@ 
 
 //$fsearch.='<br>';
 $fsearch = '<!-- hidden fields for form -->';
-$fsearch .= '<input type="hidden" name="token" value="' . newToken() . '">';
-$fsearch .= '<input type="hidden" name="modetax" value="' . $modetax . '">';
+$fsearch .= '<input type="hidden" name="token" value="'.newToken().'">';
+$fsearch .= '<input type="hidden" name="modetax" value="'.$modetax.'">';
 //$fsearch.='  '.$langs->trans("SalesTurnoverMinimum").': ';
 //$fsearch.='  <input type="text" name="min" value="'.$min.'">';
 
@@ -157,7 +157,7 @@ 
 if ($modetax == 2) {
 	$calcmode = $langs->trans('OptionPaymentForProductAndServices');
 }
-$calcmode .= ' <span class="opacitymedium">(' . $langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT . '/admin/taxes.php') . ')</span>';
+$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
 // Set period
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
 $period .= ' - ';
@@ -173,31 +173,31 @@ 
 	$description .= $langs->trans("RulesVATInProducts");
 }
 if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice') {
-	$description .= '<br>' . $langs->trans("RulesVATDueServices");
+	$description .= '<br>'.$langs->trans("RulesVATDueServices");
 }
 if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') {
-	$description .= '<br>' . $langs->trans("RulesVATInServices");
+	$description .= '<br>'.$langs->trans("RulesVATInServices");
 }
 if (getDolGlobalString('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	if (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice' && getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'invoice') {
-		$description .= '<br>' . $langs->trans("DepositsAreNotIncluded");
+		$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 	} elseif (getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice') { // calculate on sale invoice for service only
-		$description .= '<br>' . $langs->trans("DepositsAreNotIncluded").' (for services)';
+		$description .= '<br>'.$langs->trans("DepositsAreNotIncluded").' (for services)';
 	} elseif (getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'invoice') { // calculate on sale invoice for service only
-		$description .= '<br>' . $langs->trans("DepositsAreNotIncluded").' (for products)';
+		$description .= '<br>'.$langs->trans("DepositsAreNotIncluded").' (for products)';
 	}
 }
 if (getDolGlobalString('FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS')) {
 	if (getDolGlobalString('TAX_MODE_BUY_SERVICE') == 'invoice' && getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'invoice') {
-		$description .= '<br>' . $langs->trans("SupplierDepositsAreNotIncluded");
+		$description .= '<br>'.$langs->trans("SupplierDepositsAreNotIncluded");
 	} elseif (getDolGlobalString('TAX_MODE_BUY_SERVICE') == 'invoice') { // calculate on supplier invoice for service only
-		$description .= '<br>' . $langs->trans("SupplierDepositsAreNotIncluded").' (for services)';
+		$description .= '<br>'.$langs->trans("SupplierDepositsAreNotIncluded").' (for services)';
 	} elseif (getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'invoice') { // calculate on supplier invoice for product only
-		$description .= '<br>' . $langs->trans("SupplierDepositsAreNotIncluded").' (for products)';
+		$description .= '<br>'.$langs->trans("SupplierDepositsAreNotIncluded").' (for products)';
 	}
 }
 if (isModEnabled('accounting')) {
-	$description .= '<br>' . $langs->trans("ThisIsAnEstimatedValue");
+	$description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
 }
 
 // Customers invoices
@@ -207,7 +207,7 @@ 
 $vatcust = $langs->trans("VATReceived");
 $namecust = $langs->trans("Name");
 if ($mysoc->tva_assuj) {
-	$vatcust .= ' (' . $langs->trans("VATToPay") . ')';
+	$vatcust .= ' ('.$langs->trans("VATToPay").')';
 }
 
 // Suppliers invoices
@@ -217,7 +217,7 @@ 
 $vatsup = $langs->trans("VATPaid");
 $namesup = $namecust;
 if ($mysoc->tva_assuj) {
-	$vatsup .= ' (' . $langs->trans("ToGetBack") . ')';
+	$vatsup .= ' ('.$langs->trans("ToGetBack").')';
 }
 
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -253,11 +253,11 @@ 
 if (!is_array($x_coll) || !is_array($x_paye)) {
 	$langs->load("errors");
 	if ($x_coll == -1) {
-		print '<tr><td colspan="' . $columns . '">' . $langs->trans("ErrorNoAccountancyModuleLoaded") . '</td></tr>';
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 	} elseif ($x_coll == -2) {
-		print '<tr><td colspan="' . $columns . '">' . $langs->trans("FeatureNotYetAvailable") . '</td></tr>';
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 	} else {
-		print '<tr><td colspan="' . $columns . '">' . $langs->trans("Error") . '</td></tr>';
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
 	}
 } else {
 	$x_both = array();
@@ -411,21 +411,21 @@ 
 
 	// Customers invoices
 	print '<tr class="liste_titre">';
-	print '<td class="left">' . $elementcust . '</td>';
-	print '<td class="left">' . $langs->trans("DateInvoice") . '</td>';
+	print '<td class="left">'.$elementcust.'</td>';
+	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
 	if (getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'payment' || getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') {
-		print '<td class="left">' . $langs->trans("DatePayment") . '</td>';
+		print '<td class="left">'.$langs->trans("DatePayment").'</td>';
 	} else {
 		print '<td></td>';
 	}
-	print '<td class="left">' . $namecust . '</td>';
-	print '<td class="left">' . $productcust . '</td>';
+	print '<td class="left">'.$namecust.'</td>';
+	print '<td class="left">'.$productcust.'</td>';
 	if ($modetax != 1) {
-		print '<td class="right">' . $amountcust . '</td>';
-		print '<td class="right">' . $langs->trans("Payment") . ' (' . $langs->trans("PercentOfInvoice") . ')</td>';
+		print '<td class="right">'.$amountcust.'</td>';
+		print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
 	}
-	print '<td class="right">' . $langs->trans("AmountHTVATRealReceived") . '</td>';
-	print '<td class="right">' . $vatcust . '</td>';
+	print '<td class="right">'.$langs->trans("AmountHTVATRealReceived").'</td>';
+	print '<td class="right">'.$vatcust.'</td>';
 	print '</tr>';
 
 	$action = "tvadetail";
@@ -446,16 +446,16 @@ 
 		if (is_array($x_both[$rate]['coll']['detail'])) {
 			// VAT Rate
 			print "<tr>";
-			print '<td class="tax_rate" colspan="' . ($span + 1) . '">';
-			print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
-			print ' - <a class="reposition" href="' . DOL_URL_ROOT . '/compta/tva/quadri_detail.php?invoice_type=customer';
+			print '<td class="tax_rate" colspan="'.($span + 1).'">';
+			print $langs->trans('Rate').' : '.vatrate($rate).'%';
+			print ' - <a class="reposition" href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?invoice_type=customer';
 			if ($invoice_type != 'customer' || !GETPOSTISSET('vat_rate_show') || GETPOST('vat_rate_show') != $rate) {
-				print '&amp;vat_rate_show=' . urlencode($rate);
+				print '&amp;vat_rate_show='.urlencode($rate);
 			}
-			print '&amp;date_startyear=' . ((int) $date_start_year) . '&amp;date_startmonth=' . ((int) $date_start_month) . '&amp;date_startday=' . ((int) $date_start_day) . '&amp;date_endyear=' . ((int) $date_end_year) . '&amp;date_endmonth=' . ((int) $date_end_month) . '&amp;date_endday=' . ((int) $date_end_day) . '">';
-			print img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '</a>';
+			print '&amp;date_startyear='.((int) $date_start_year).'&amp;date_startmonth='.((int) $date_start_month).'&amp;date_startday='.((int) $date_start_day).'&amp;date_endyear='.((int) $date_end_year).'&amp;date_endmonth='.((int) $date_end_month).'&amp;date_endday='.((int) $date_end_day).'">';
+			print img_picto('', 'chevron-down', 'class="paddingrightonly"').$langs->trans('VATReportShowByRateDetails').'</a>';
 			print '</td>';
-			print '</tr>' . "\n";
+			print '</tr>'."\n";
 
 			foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
 				// Define type
@@ -524,14 +524,14 @@ 
 					print '<tr class="oddeven">';
 
 					// Ref
-					print '<td class="nowrap left">' . $fields['link'] . '</td>';
+					print '<td class="nowrap left">'.$fields['link'].'</td>';
 
 					// Invoice date
-					print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+					print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
 					// Payment date
 					if (getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'payment' || getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'payment') {
-						print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+						print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
 					} else {
 						print '<td></td>';
 					}
@@ -547,10 +547,10 @@ 
 					if ($fields['pid']) {
 						$product_static->id = $fields['pid'];
 						$product_static->ref = $fields['pref'];
-						$product_static->type = $fields['dtype'];        // We force with the type of line to have type how line is registered
+						$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) {
-							print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 						}
 					} else {
 						if ($type) {
@@ -567,7 +567,7 @@ 
 								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
 							}
 						}
-						print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
 						// Show range
 						print_date_range($fields['ddate_start'], $fields['ddate_end']);
@@ -594,7 +594,7 @@ 
 						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
 							$payment_static->id = $fields['payment_id'];
 							$payment_static->ref = $fields['payment_ref'];
-							print $payment_static->getNomUrl(2, '', '', 0) . ' ';
+							print $payment_static->getNomUrl(2, '', '', 0).' ';
 						}
 						if (($type == 0 && getDolGlobalString('TAX_MODE_SELL_PRODUCT') == 'invoice')
 							|| ($type == 1 && getDolGlobalString('TAX_MODE_SELL_SERVICE') == 'invoice')) {
@@ -605,7 +605,7 @@ 
 							}
 							print price(price2num($fields['payment_amount'], 'MT'));
 							if (isset($fields['payment_amount'])) {
-								print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
 							}
 						}
 						print '</td>';
@@ -634,50 +634,50 @@ 
 		// Total customers for this vat rate
 		print '<tr class="liste_total">';
 		print '<td colspan="4"></td>';
-		print '<td class="right">' . $langs->trans("Total") . ':</td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
 		if ($modetax != 1) {
 			print '<td class="nowrap right">&nbsp;</td>';
 			print '<td class="right">&nbsp;</td>';
 		}
-		print '<td class="right"><span class="amount">' . price(price2num($subtot_coll_total_ht, 'MT')) . '</span></td>';
-		print '<td class="nowrap right"><span class="amount">' . price(price2num($subtot_coll_vat, 'MT')) . '</span></td>';
+		print '<td class="right"><span class="amount">'.price(price2num($subtot_coll_total_ht, 'MT')).'</span></td>';
+		print '<td class="nowrap right"><span class="amount">'.price(price2num($subtot_coll_vat, 'MT')).'</span></td>';
 		print '</tr>';
 	}
 
 	if (count($x_coll) == 0) {   // Show a total line if nothing shown
 		print '<tr class="liste_total">';
 		print '<td colspan="4"></td>';
-		print '<td class="right">' . $langs->trans("Total") . ':</td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
 		if ($modetax != 1) {
 			print '<td class="nowrap right">&nbsp;</td>';
 			print '<td class="right">&nbsp;</td>';
 		}
-		print '<td class="right">' . price(price2num(0, 'MT')) . '</td>';
-		print '<td class="nowrap right">' . price(price2num(0, 'MT')) . '</td>';
+		print '<td class="right">'.price(price2num(0, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num(0, 'MT')).'</td>';
 		print '</tr>';
 	}
 
 	// Blank line
-	print '<tr><td colspan="' . ($span + 2) . '">&nbsp;</td></tr>';
+	print '<tr><td colspan="'.($span + 2).'">&nbsp;</td></tr>';
 
 	// Print table headers for this quadri - expenses
 	print '<tr class="liste_titre liste_titre_topborder">';
-	print '<td class="left">' . $elementsup . '</td>';
-	print '<td class="left">' . $langs->trans("DateInvoice") . '</td>';
+	print '<td class="left">'.$elementsup.'</td>';
+	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
 	if (getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'payment' || getDolGlobalString('TAX_MODE_BUY_SERVICE') == 'payment') {
-		print '<td class="left">' . $langs->trans("DatePayment") . '</td>';
+		print '<td class="left">'.$langs->trans("DatePayment").'</td>';
 	} else {
 		print '<td></td>';
 	}
-	print '<td class="left">' . $namesup . '</td>';
-	print '<td class="left">' . $productsup . '</td>';
+	print '<td class="left">'.$namesup.'</td>';
+	print '<td class="left">'.$productsup.'</td>';
 	if ($modetax != 1) {
-		print '<td class="right">' . $amountsup . '</td>';
-		print '<td class="right">' . $langs->trans("Payment") . ' (' . $langs->trans("PercentOfInvoice") . ')</td>';
+		print '<td class="right">'.$amountsup.'</td>';
+		print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
 	}
-	print '<td class="right">' . $langs->trans("AmountHTVATRealPaid") . '</td>';
-	print '<td class="right">' . $vatsup . '</td>';
-	print '</tr>' . "\n";
+	print '<td class="right">'.$langs->trans("AmountHTVATRealPaid").'</td>';
+	print '<td class="right">'.$vatsup.'</td>';
+	print '</tr>'."\n";
 
 	foreach (array_keys($x_paye) as $rate) {
 		$subtot_paye_total_ht = 0;
@@ -685,16 +685,16 @@ 
 
 		if (is_array($x_both[$rate]['paye']['detail'])) {  // @phpstan-ignore-line
 			print "<tr>";
-			print '<td class="tax_rate" colspan="' . ($span + 1) . '">';
-			print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
-			print ' - <a class="reposition" href="' . DOL_URL_ROOT . '/compta/tva/quadri_detail.php?invoice_type=supplier';
+			print '<td class="tax_rate" colspan="'.($span + 1).'">';
+			print $langs->trans('Rate').' : '.vatrate($rate).'%';
+			print ' - <a class="reposition" href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?invoice_type=supplier';
 			if ($invoice_type != 'supplier' || !GETPOSTISSET('vat_rate_show') || GETPOST('vat_rate_show') != $rate) {
-				print '&amp;vat_rate_show=' . urlencode($rate);
+				print '&amp;vat_rate_show='.urlencode($rate);
 			}
-			print '&amp;date_startyear=' . ((int) $date_start_year) . '&amp;date_startmonth=' . ((int) $date_start_month) . '&amp;date_startday=' . ((int) $date_start_day) . '&amp;date_endyear=' . ((int) $date_end_year) . '&amp;date_endmonth=' . ((int) $date_end_month) . '&amp;date_endday=' . ((int) $date_end_day) . '">';
-			print img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '</a>';
+			print '&amp;date_startyear='.((int) $date_start_year).'&amp;date_startmonth='.((int) $date_start_month).'&amp;date_startday='.((int) $date_start_day).'&amp;date_endyear='.((int) $date_end_year).'&amp;date_endmonth='.((int) $date_end_month).'&amp;date_endday='.((int) $date_end_day).'">';
+			print img_picto('', 'chevron-down', 'class="paddingrightonly"').$langs->trans('VATReportShowByRateDetails').'</a>';
 			print '</td>';
-			print '</tr>' . "\n";
+			print '</tr>'."\n";
 
 			foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
 				// Define type
@@ -760,14 +760,14 @@ 
 					print '<tr class="oddeven">';
 
 					// Ref
-					print '<td class="nowrap left">' . $fields['link'] . '</td>';
+					print '<td class="nowrap left">'.$fields['link'].'</td>';
 
 					// Invoice date
-					print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+					print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
 					// Payment date
 					if (getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'payment' || getDolGlobalString('TAX_MODE_BUY_SERVICE') == 'payment') {
-						print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+						print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
 					} else {
 						print '<td></td>';
 					}
@@ -783,10 +783,10 @@ 
 					if ($fields['pid']) {
 						$product_static->id = $fields['pid'];
 						$product_static->ref = $fields['pref'];
-						$product_static->type = $fields['dtype'];        // We force with the type of line to have type how line is registered
+						$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) {
-							print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 						}
 					} else {
 						if ($type) {
@@ -803,7 +803,7 @@ 
 								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
 							}
 						}
-						print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
 						// Show range
 						print_date_range($fields['ddate_start'], $fields['ddate_end']);
@@ -829,7 +829,7 @@ 
 						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
 							$paymentfourn_static->id = $fields['payment_id'];
 							$paymentfourn_static->ref = $fields['payment_ref'];
-							print $paymentfourn_static->getNomUrl(2, '', '', 0) . ' ';
+							print $paymentfourn_static->getNomUrl(2, '', '', 0).' ';
 						}
 
 						if (($type == 0 && getDolGlobalString('TAX_MODE_BUY_PRODUCT') == 'invoice')
@@ -841,7 +841,7 @@ 
 							}
 							print price(price2num($fields['payment_amount'], 'MT'));
 							if (isset($fields['payment_amount'])) {
-								print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
 							}
 						}
 						print '</td>';
@@ -871,26 +871,26 @@ 
 		// Total suppliers for this vat rate
 		print '<tr class="liste_total">';
 		print '<td colspan="4"></td>';
-		print '<td class="right">' . $langs->trans("Total") . ':</td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
 		if ($modetax != 1) {
 			print '<td class="nowrap right">&nbsp;</td>';
 			print '<td class="right">&nbsp;</td>';
 		}
-		print '<td class="right"><span class="amount">' . price(price2num($subtot_paye_total_ht, 'MT')) . '</span></td>';
-		print '<td class="nowrap right"><span class="amount">' . price(price2num($subtot_paye_vat, 'MT')) . '</span></td>';
+		print '<td class="right"><span class="amount">'.price(price2num($subtot_paye_total_ht, 'MT')).'</span></td>';
+		print '<td class="nowrap right"><span class="amount">'.price(price2num($subtot_paye_vat, 'MT')).'</span></td>';
 		print '</tr>';
 	}
 
 	if (count($x_paye) == 0) {  // Show a total line if nothing shown
 		print '<tr class="liste_total">';
 		print '<td colspan="4"></td>';
-		print '<td class="right">' . $langs->trans("Total") . ':</td>';
+		print '<td class="right">'.$langs->trans("Total").':</td>';
 		if ($modetax != 1) {
 			print '<td class="nowrap right">&nbsp;</td>';
 			print '<td class="right">&nbsp;</td>';
 		}
-		print '<td class="right"><span class="amount">' . price(price2num(0, 'MT')) . '</span></td>';
-		print '<td class="nowrap right"><span class="amount">' . price(price2num(0, 'MT')) . '</span></td>';
+		print '<td class="right"><span class="amount">'.price(price2num(0, 'MT')).'</span></td>';
+		print '<td class="nowrap right"><span class="amount">'.price(price2num(0, 'MT')).'</span></td>';
 		print '</tr>';
 	}
 
@@ -902,8 +902,8 @@ 
 	print '<table class="noborder centpercent">';
 	$diff = $x_coll_sum - $x_paye_sum;
 	print '<tr class="liste_total">';
-	print '<td class="liste_total" colspan="' . $span . '">' . $langs->trans("TotalToPay") . '</td>';
-	print '<td class="liste_total nowrap right"><b>' . price(price2num($diff, 'MT')) . "</b></td>\n";
+	print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").'</td>';
+	print '<td class="liste_total nowrap right"><b>'.price(price2num($diff, 'MT'))."</b></td>\n";
 	print "</tr>\n";
 
 	$i++;

htdocs/product/class/productbatch.class.php

Spacing +10 added lines, -10 removed lines

@@ -84,13 +84,13 @@ 
 	 * @var int|''|null
 	 * @deprecated
 	 */
-	public $sellby = '';	// dlc
+	public $sellby = ''; // dlc
 
 	/**
 	 * @var int|''|null
 	 * @deprecated
 	 */
-	public $eatby = '';		// dmd/dluo
+	public $eatby = ''; // dmd/dluo
 
 
 	/**
@@ -124,15 +124,15 @@ 
 		// Insert request
 		$sql = "INSERT INTO ".$this->db->prefix()."product_batch (";
 		$sql .= "fk_product_stock,";
-		$sql .= "sellby,";				// no more used
-		$sql .= "eatby,";				// no more used
+		$sql .= "sellby,"; // no more used
+		$sql .= "eatby,"; // no more used
 		$sql .= "batch,";
 		$sql .= "qty,";
 		$sql .= "import_key";
 		$sql .= ") VALUES (";
 		$sql .= " ".(!isset($this->fk_product_stock) ? 'NULL' : $this->fk_product_stock).",";
-		$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").",";		// no more used
-		$sql .= " ".(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").",";			// no more used
+		$sql .= " ".(!isset($this->sellby) || dol_strlen($this->sellby) == 0 ? 'NULL' : "'".$this->db->idate($this->sellby)."'").","; // no more used
+		$sql .= " ".(!isset($this->eatby) || dol_strlen($this->eatby) == 0 ? 'NULL' : "'".$this->db->idate($this->eatby)."'").","; // no more used
 		$sql .= " ".(!isset($this->batch) ? 'NULL' : "'".$this->db->escape($this->batch)."'").",";
 		$sql .= " ".(!isset($this->qty) ? 'NULL' : $this->qty).",";
 		$sql .= " ".(!isset($this->import_key) ? 'NULL' : "'".$this->db->escape($this->import_key)."'");
@@ -183,7 +183,7 @@ 
 		$sql .= " pl.eatby,";
 		$sql .= " pl.sellby";
 		$sql .= " FROM ".$this->db->prefix()."product_batch as t";
-		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock w on t.fk_product_stock = w.rowid";	// llx_product_stock is a parent table so this link does NOT generate duplicate record
+		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock w on t.fk_product_stock = w.rowid"; // llx_product_stock is a parent table so this link does NOT generate duplicate record
 		$sql .= " LEFT JOIN ".$this->db->prefix()."product_lot as pl on pl.fk_product = w.fk_product and pl.batch = t.batch";
 		$sql .= " WHERE t.rowid = ".((int) $id);
 
@@ -459,8 +459,8 @@ 
 
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->fk_product_stock = $obj->fk_product_stock;
-				$this->sellby = $this->db->jdate($obj->sellby);	// deprecated. do not use this data.
-				$this->eatby = $this->db->jdate($obj->eatby);	// deprecated. do not use this data.
+				$this->sellby = $this->db->jdate($obj->sellby); // deprecated. do not use this data.
+				$this->eatby = $this->db->jdate($obj->eatby); // deprecated. do not use this data.
 				$this->batch = $obj->batch;
 				$this->qty = $obj->qty;
 				$this->import_key = $obj->import_key;
@@ -558,7 +558,7 @@ 
 
 				if ($fk_product > 0) {
 					// Some properties of the lot
-					$tmp->lotid = $obj->lotid;	// ID in table of the details of properties of each lots
+					$tmp->lotid = $obj->lotid; // ID in table of the details of properties of each lots
 					$tmp->sellby = $dbs->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
 					$tmp->eatby = $dbs->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
 				}

htdocs/product/stock/class/entrepot.class.php

Spacing +5 added lines, -5 removed lines

@@ -577,7 +577,7 @@ 
 				$this->fax            = $obj->fax;
 
 				$this->date_creation  = $obj->date_creation;
-				$this->barcode		  = $obj->barcode;
+				$this->barcode = $obj->barcode;
 				$this->fk_departement = $obj->fk_departement;
 				$this->barcode_type   = $obj->fk_barcode_type;
 				$this->warehouse_id   = $obj->rowid;
@@ -734,7 +734,7 @@ 
 		}
 		$sql .= " WHERE ps.fk_entrepot = ".((int) $this->id);
 		if ($separatedPMP) {
-			$sql .= " AND pa.fk_product = p.rowid AND pa.entity = ". (int) $conf->entity;
+			$sql .= " AND pa.fk_product = p.rowid AND pa.entity = ".(int) $conf->entity;
 		}
 		$sql .= " AND ps.fk_product = p.rowid";
 		//print $sql;
@@ -818,9 +818,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (!$nofetch && isModEnabled('category')) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories_warehouse'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_WAREHOUSE, 1, 1);
+			$datas['categories_warehouse'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_WAREHOUSE, 1, 1);
 		}
 
 		return $datas;
@@ -1079,7 +1079,7 @@ 
 		$return .= img_picto('', $this->picto);
 		$return .= '</div>';
 		$return .= '<div class="info-box-content" >';
-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">' . $this->getNomUrl() . '</span>';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.$this->getNomUrl().'</span>';
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}