Dolibarr / dolibarr

htdocs/fourn/facture/card.php

Spacing +50 added lines, -50 removed lines

@@ -190,7 +190,7 @@ 
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
-		'@phan-var-force FactureFournisseur $objectutil';  // Same object type for cloned object
+		'@phan-var-force FactureFournisseur $objectutil'; // Same object type for cloned object
 
 		if (GETPOST('newsupplierref', 'alphanohtml')) {
 			$objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
@@ -776,7 +776,7 @@ 
 		$db->begin();
 
 		$error = 0;
-		$tmpproject = 0;  // Ensure a value
+		$tmpproject = 0; // Ensure a value
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -784,7 +784,7 @@ 
 			$error++;
 		}
 
-		$dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
+		$dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server
 		$datedue = dol_mktime(0, 0, 0, GETPOSTINT('echmonth'), GETPOSTINT('echday'), GETPOSTINT('echyear'), 'tzserver');
 		//var_dump($dateinvoice.' '.dol_print_date($dateinvoice, 'dayhour'));
 		//var_dump(dol_now('tzuserrel').' '.dol_get_last_hour(dol_now('tzuserrel')).' '.dol_print_date(dol_now('tzuserrel'),'dayhour').' '.dol_print_date(dol_get_last_hour(dol_now('tzuserrel')), 'dayhour'));
@@ -823,7 +823,7 @@ 
 				$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
 				$object->socid = GETPOSTINT('socid');
 				$object->label = GETPOST('label', 'alphanohtml');
-				$object->libelle = $object->label;	// deprecated
+				$object->libelle = $object->label; // deprecated
 				$object->date = $dateinvoice;
 				$object->date_echeance = $datedue;
 				$object->note_public = GETPOST('note_public', 'restricthtml');
@@ -897,7 +897,7 @@ 
 				$object->subtype            = GETPOST('subtype', 'alphanohtml');
 				$object->socid				= GETPOSTINT('socid');
 				$object->label				= GETPOST('label', 'alphanohtml');
-				$object->libelle            = $object->label;  // Deprecated
+				$object->libelle            = $object->label; // Deprecated
 				$object->date               = $dateinvoice;
 				$object->date_echeance      = $datedue;
 				$object->note_public        = GETPOST('note_public', 'restricthtml');
@@ -1007,7 +1007,7 @@ 
 				$object->cond_reglement_id	= (GETPOSTINT('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
 				$object->mode_reglement_id	= GETPOSTINT('mode_reglement_id');
 				$object->fk_account         = GETPOSTINT('fk_account');
-				$object->amount             = (float) price2num(GETPOST('amount'));  // FIXME: FactureFournisseur::$amount is deprecated and not used?
+				$object->amount             = (float) price2num(GETPOST('amount')); // FIXME: FactureFournisseur::$amount is deprecated and not used?
 				//$object->remise_absolue		= price2num(GETPOST('remise_absolue'), 'MU');
 				//$object->remise_percent		= price2num(GETPOST('remise_percent'), '', 2);
 				$object->fk_incoterms       = GETPOSTINT('incoterm_id');
@@ -1060,28 +1060,28 @@ 
 				$tmpproject = GETPOSTINT('projectid');
 
 				// Creation invoice
-				$object->socid				= GETPOSTINT('socid');
-				$object->type				= GETPOST('type', 'alphanohtml');
-				$object->subtype            = GETPOSTINT('subtype');
-				$object->ref				= GETPOST('ref', 'alphanohtml');
-				$object->ref_supplier		= GETPOST('ref_supplier', 'alphanohtml');
+				$object->socid = GETPOSTINT('socid');
+				$object->type = GETPOST('type', 'alphanohtml');
+				$object->subtype = GETPOSTINT('subtype');
+				$object->ref = GETPOST('ref', 'alphanohtml');
+				$object->ref_supplier = GETPOST('ref_supplier', 'alphanohtml');
 				$object->socid				= GETPOSTINT('socid');
 				$object->label				= GETPOST('label', 'alphanohtml');
-				$object->libelle			= $object->label;	// deprecated
-				$object->date				= $dateinvoice;
-				$object->date_echeance		= $datedue;
-				$object->note_public		= GETPOST('note_public', 'restricthtml');
-				$object->note_private		= GETPOST('note_private', 'restricthtml');
+				$object->libelle = $object->label; // deprecated
+				$object->date = $dateinvoice;
+				$object->date_echeance = $datedue;
+				$object->note_public = GETPOST('note_public', 'restricthtml');
+				$object->note_private = GETPOST('note_private', 'restricthtml');
 				$object->cond_reglement_id	= GETPOST('cond_reglement_id');
 				$object->mode_reglement_id	= GETPOST('mode_reglement_id');
 				$object->fk_account			= GETPOSTINT('fk_account');
 				$object->vat_reverse_charge	= GETPOST('vat_reverse_charge') == 'on' ? 1 : 0;
 				$object->fk_project			= ($tmpproject > 0) ? $tmpproject : null;
-				$object->fk_incoterms		= GETPOSTINT('incoterm_id');
+				$object->fk_incoterms = GETPOSTINT('incoterm_id');
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx	= GETPOSTINT('originmulticurrency_tx');
-				$object->transport_mode_id	= GETPOSTINT('transport_mode_id');
+				$object->multicurrency_tx = GETPOSTINT('originmulticurrency_tx');
+				$object->transport_mode_id = GETPOSTINT('transport_mode_id');
 
 				// Auto calculation of date due if not filled by user
 				if (empty($object->date_echeance)) {
@@ -1293,7 +1293,7 @@ 
 									0,
 									$object->lines[0]->date_start,
 									$object->lines[0]->date_end,
-									array(),  // array_options
+									array(), // array_options
 									0,
 									0,
 									'',
@@ -1425,7 +1425,7 @@ 
 		// Edit line
 		$db->begin();
 
-		if (! $object->fetch($id) > 0) {
+		if (!$object->fetch($id) > 0) {
 			dol_print_error($db);
 		}
 		$object->fetch_thirdparty();
@@ -1578,7 +1578,7 @@ 
 			$idprod = GETPOSTINT('idprod');
 		}
 
-		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);		// Can be '1.2' or '1.2 (CODE)'
+		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)'
 
 		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
@@ -2074,7 +2074,7 @@ 
 // Mode creation
 if ($action == 'create') {
 	$facturestatic = new FactureFournisseur($db);
-	$selectedLines = array();  // Ensure initialised
+	$selectedLines = array(); // Ensure initialised
 
 	print load_fiche_titre($langs->trans('NewSupplierInvoice'), '', 'supplier_invoice');
 
@@ -2268,7 +2268,7 @@ 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="changecompany" value="0">';	// will be set to 1 by javascript so we know post is done after a company change
+	print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change
 
 	if (!empty($societe->id) && $societe->id > 0) {
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">'."\n";
@@ -2352,7 +2352,7 @@ 
 
 			$sql = 'SELECT r.rowid, r.titre as title, r.total_ttc';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_rec as r';
-			$sql .= ' WHERE r.fk_soc = '. (int) $invoice_predefined->socid;
+			$sql .= ' WHERE r.fk_soc = '.(int) $invoice_predefined->socid;
 
 			$resql = $db->query($sql);
 			if ($resql) {
@@ -2419,7 +2419,7 @@ 
 			// Deposit - Down payment
 			if (!getDolGlobalString('INVOICE_DISABLE_DEPOSIT')) {
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-				$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"' . (GETPOSTINT('type') == 3 ? ' checked' : '') . '> ';
+				$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"'.(GETPOSTINT('type') == 3 ? ' checked' : '').'> ';
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					jQuery("#typestandardinvoice, #valuestandardinvoice").click(function() {
@@ -2466,7 +2466,7 @@ 
 					print $form->selectarray('typedeposit', $arraylist, GETPOST('typedeposit', 'aZ09'), 0, 0, 0, '', 1);
 					print '</td>';
 					print '<td class="nowrap" style="padding-left: 5px">';
-					print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="' . GETPOSTINT('valuedeposit') . '"/>';
+					print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="'.GETPOSTINT('valuedeposit').'"/>';
 					print '</td>';
 				}
 				print '</tr></table>';
@@ -2716,8 +2716,8 @@ 
 
 		// Vat reverse-charge by default
 		if (getDolGlobalString('ACCOUNTING_FORCE_ENABLE_VAT_REVERSE_CHARGE')) {
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-			print '<tr><td>' . $langs->trans('VATReverseCharge') . '</td><td>';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+			print '<tr><td>'.$langs->trans('VATReverseCharge').'</td><td>';
 			// Try to propose to use VAT reverse charge even if the VAT reverse charge is not activated in the supplier card, if this corresponds to the context of use, the activation is proposed
 			if ($vat_reverse_charge == 1 || $societe->vat_reverse_charge == 1 || ($societe->country_code != 'FR' && isInEEC($societe) && !empty($societe->tva_intra))) {
 				$vat_reverse_charge = 1;
@@ -2725,7 +2725,7 @@ 
 				$vat_reverse_charge = 0;
 			}
 
-			print '<input type="checkbox" name="vat_reverse_charge"'. (!empty($vat_reverse_charge) ? ' checked ' : '') . '>';
+			print '<input type="checkbox" name="vat_reverse_charge"'.(!empty($vat_reverse_charge) ? ' checked ' : '').'>';
 			print '</td></tr>';
 		}
 
@@ -3295,7 +3295,7 @@ 
 					$facavoir->fetch($id);
 					$invoicecredits[] = $facavoir->getNomUrl(1);
 				}
-				print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
+				print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir").(count($invoicecredits) ? ' ' : '').implode(',', $invoicecredits);
 				print '</span>';
 			}
 			if (isset($objectidnext) && $objectidnext > 0) {
@@ -3491,12 +3491,12 @@ 
 					print '<input type="hidden" name="action" value="setvatreversecharge">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
 
-					print '<input type="checkbox" name="vat_reverse_charge"' . ($object->vat_reverse_charge == '1' ? ' checked ' : '') . '>';
+					print '<input type="checkbox" name="vat_reverse_charge"'.($object->vat_reverse_charge == '1' ? ' checked ' : '').'>';
 
 					print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 					print '</form>';
 				} else {
-					print '<input type="checkbox" name="vat_reverse_charge"'. ($object->vat_reverse_charge == '1' ? ' checked ' : '') . ' disabled>';
+					print '<input type="checkbox" name="vat_reverse_charge"'.($object->vat_reverse_charge == '1' ? ' checked ' : '').' disabled>';
 				}
 				print '</td></tr>';
 			}
@@ -3562,15 +3562,15 @@ 
 			print '<table class="border tableforfield centpercent">';
 
 			print '<tr>';
-			print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_ht, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ht, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 
 			print '<tr>';
-			print '<td>' . $langs->trans('AmountVAT') . '</td>';
+			print '<td>'.$langs->trans('AmountVAT').'</td>';
 			print '<td class="nowrap amountcard right">';
 			if (GETPOST('calculationrule')) {
 				$calculationrule = GETPOST('calculationrule', 'alpha');
@@ -3584,40 +3584,40 @@ 
 			}
 			// Show link for "recalculate"
 			if ($object->getVentilExportCompta() == 0) {
-				$s = '<span class="hideonsmartphone opacitymedium">' . $langs->trans("ReCalculate") . ' </span>';
-				$s .= '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=calculate&calculationrule=totalofround">' . $langs->trans("Mode1") . '</a>';
+				$s = '<span class="hideonsmartphone opacitymedium">'.$langs->trans("ReCalculate").' </span>';
+				$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=totalofround">'.$langs->trans("Mode1").'</a>';
 				$s .= ' / ';
-				$s .= '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=calculate&calculationrule=roundoftotal">' . $langs->trans("Mode2") . '</a>';
+				$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=roundoftotal">'.$langs->trans("Mode2").'</a>';
 				print '<div class="inline-block">';
-				print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc", $calculationrulenum) . '<br>' . $langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('', 'help'), '', 3, '', 0, 'recalculate');
+				print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc", $calculationrulenum).'<br>'.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('', 'help'), '', 3, '', 0, 'recalculate');
 				print '&nbsp; &nbsp; &nbsp; &nbsp;';
 				print '</div>';
 			}
 			print price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency);
 			print '</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_tva, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 
 			if ($societe->localtax1_assuj == "1") { //Localtax1
 				print '<tr>';
-				print '<td>' . $langs->transcountry("AmountLT1", $societe->country_code) . '</td>';
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency) . '</td>';
+				print '<td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
+				print '<td class="nowrap amountcard right">'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 				print '</tr>';
 			}
 			if ($societe->localtax2_assuj == "1") { //Localtax2
 				print '<tr>';
-				print '<td>' . $langs->transcountry("AmountLT2", $societe->country_code) . '</td>';
-				print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency) . '</td>';
+				print '<td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
+				print '<td class="nowrap amountcard right">'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 				print '</tr>';
 			}
 
 			print '<tr>';
-			print '<td>' . $langs->trans('AmountTTC') . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency) . '</td>';
+			print '<td>'.$langs->trans('AmountTTC').'</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_ttc, 0, $langs, 0, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ttc, 0, $langs, 0, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 
@@ -4161,7 +4161,7 @@ 
 				}
 
 				// Clone as predefined / Create template
-				if (($object->type ==  FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->status == 0 && $usercancreate) {
+				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->status == 0 && $usercancreate) {
 					if (!$objectidnext && count($object->lines) > 0) {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card-rec.php?facid='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableInvoice").'</a>';
 					}

htdocs/mrp/mo_list.php

Spacing +2 added lines, -2 removed lines

@@ -72,7 +72,7 @@ 
 $object = new Mo($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->mrp->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);
@@ -483,7 +483,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

htdocs/core/tpl/objectline_title.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) {
 	print '<th class="linecolcycleref right">'.$langs->trans('Progress').'</th>';
 	if (getDolGlobalInt('INVOICE_USE_SITUATION') == 2) {
-		print '<th class="linecolcycleref2 right">' . $langs->trans('SituationInvoiceProgressCurrent') . '</th>';
+		print '<th class="linecolcycleref2 right">'.$langs->trans('SituationInvoiceProgressCurrent').'</th>';
 	}
 	print '<th class="linecolcycleref2 right">'.$form->textwithpicto($langs->trans('TotalHT100Short'), $langs->trans('UnitPriceXQtyLessDiscount')).'</th>';
 }

htdocs/core/tpl/objectline_edit.tpl.php

Spacing +7 added lines, -7 removed lines

@@ -309,7 +309,7 @@ 
 
 			print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="'.$fieldv.'" name="progress">%</td>';
 		} else {
-			print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="' . (GETPOSTISSET('progress') ? GETPOST('progress') : $line->situation_percent) . '" name="progress">%</td>';
+			print '<td class="nowrap right linecolcycleref"><input class="right" type="text" size="1" value="'.(GETPOSTISSET('progress') ? GETPOST('progress') : $line->situation_percent).'" name="progress">%</td>';
 		}
 		$coldisplay++;
 		print '<td></td>';
@@ -407,16 +407,16 @@ 
 	}
 	if (!$line->date_start) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_HOUR)) {
-			print 'jQuery("#date_starthour").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_START_HOUR').'");';
+			print 'jQuery("#date_starthour").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_START_HOUR').'");';
 		}
 
 
 		if (isset($conf->global->MAIN_DEFAULT_DATE_START_MIN)) {
-			print 'jQuery("#date_startmin").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_START_MIN').'");';
+			print 'jQuery("#date_startmin").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_START_MIN').'");';
 		}
 
 		$res = $line->fetch_product();
-		if ($res  > 0) {
+		if ($res > 0) {
 			if ($line->product->isMandatoryPeriod() && $line->product->isService()) {
 				print  'jQuery("#date_start").addClass("error");';
 			}
@@ -424,15 +424,15 @@ 
 	}
 	if (!$line->date_end) {
 		if (isset($conf->global->MAIN_DEFAULT_DATE_END_HOUR)) {
-			print 'jQuery("#date_endhour").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_END_HOUR').'");';
+			print 'jQuery("#date_endhour").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_END_HOUR').'");';
 		}
 		if (isset($conf->global->MAIN_DEFAULT_DATE_END_MIN)) {
-			print 'jQuery("#date_endmin").val("' . getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN').'");';
+			print 'jQuery("#date_endmin").val("'.getDolGlobalString('MAIN_DEFAULT_DATE_END_MIN').'");';
 		}
 
 		$res = $line->fetch_product();
 		// on doit fetch le product là !!! pour connaître le type
-		if ($res  > 0) {
+		if ($res > 0) {
 			if ($line->product->isMandatoryperiod() && $line->product->isService()) {
 				print  'jQuery("#date_end").addClass("error");';
 			}

dev/tools/phan/config_extended.php

Spacing +22 added lines, -22 removed lines

@@ -64,33 +64,33 @@
 		// Dolibarr uses a lot of internal deprecated stuff, not reporting
 		'PhanDeprecatedProperty',
 
-		'PhanCompatibleNegativeStringOffset',	// return false positive
-		'PhanPluginConstantVariableBool',		// a lot of false positive, in most cases, we want to keep the code as it is
-		'PhanTypeInvalidDimOffset',				// this option costs more time to be supported than it solves time
+		'PhanCompatibleNegativeStringOffset', // return false positive
+		'PhanPluginConstantVariableBool', // a lot of false positive, in most cases, we want to keep the code as it is
+		'PhanTypeInvalidDimOffset', // this option costs more time to be supported than it solves time
 		'PhanTypeObjectUnsetDeclaredProperty',
-		'PhanTypePossiblyInvalidDimOffset',		// a lot of false positive, in most cases, we want to keep the code as it is
+		'PhanTypePossiblyInvalidDimOffset', // a lot of false positive, in most cases, we want to keep the code as it is
 
-		'PhanPluginWhitespaceTab',		// Dolibarr used tabs
-		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility
-		'PhanPluginShortArray',			// Dolibarr uses array()
-		'PhanPluginShortArrayList',		// Dolibarr uses array()
+		'PhanPluginWhitespaceTab', // Dolibarr used tabs
+		'PhanPluginCanUsePHP71Void', // Dolibarr is maintaining 7.0 compatibility
+		'PhanPluginShortArray', // Dolibarr uses array()
+		'PhanPluginShortArrayList', // Dolibarr uses array()
 		// Fixers From PHPDocToRealTypesPlugin:
-		'PhanPluginCanUseParamType',			// Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
-		'PhanPluginCanUseReturnType',			// Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
-		'PhanPluginCanUseNullableParamType',	// Fixer - Report/Add nullable parameter types in the function definition
-		'PhanPluginCanUseNullableReturnType',	// Fixer - Report/Add nullable return types in the function definition
+		'PhanPluginCanUseParamType', // Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseReturnType', // Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseNullableParamType', // Fixer - Report/Add nullable parameter types in the function definition
+		'PhanPluginCanUseNullableReturnType', // Fixer - Report/Add nullable return types in the function definition
 
-		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
-		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
-		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences
-		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
-		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
+		'PhanPluginNonBoolBranch', // Not essential - 31240+ occurrences
+		'PhanPluginNumericalComparison', // Not essential - 19870+ occurrences
+		'PhanTypeMismatchArgument', // Not essential - 12300+ occurrences
+		'PhanPluginNonBoolInLogicalArith', // Not essential - 11040+ occurrences
+		'PhanPluginConstantVariableScalar', // Not essential - 5180+ occurrences
 		'PhanPluginDuplicateAdjacentStatement',
-		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
-		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
-		'PhanPluginRedundantAssignmentInGlobalScope',	// Not essential, a lot of false warning
-		'PhanPluginRedundantAssignment',				// Not essential, useless
-		'PhanPluginDuplicateCatchStatementBody',  // Requires PHP7.1 - 50+ occurrences
+		'PhanPluginDuplicateConditionalTernaryDuplication', // 2750+ occurrences
+		'PhanPluginDuplicateConditionalNullCoalescing', // Not essential - 990+ occurrences
+		'PhanPluginRedundantAssignmentInGlobalScope', // Not essential, a lot of false warning
+		'PhanPluginRedundantAssignment', // Not essential, useless
+		'PhanPluginDuplicateCatchStatementBody', // Requires PHP7.1 - 50+ occurrences
 ];
 
 return $config;

dev/tools/phan/config.php

Spacing +74 added lines, -74 removed lines

@@ -83,12 +83,12 @@ 
 	'bom' => 'Bom',
 	'bookcal' => 'BookCal',
 	'bookmark' => 'Bookmark',
-	'cashdesk' => null,  // TODO: fill in proper class
+	'cashdesk' => null, // TODO: fill in proper class
 	'category' => 'Categorie',
 	'clicktodial' => 'ClickToDial',
 	'collab' => 'Collab',
 	'comptabilite' => 'Comptabilite',
-	'contact' => null,  // TODO: fill in proper class
+	'contact' => null, // TODO: fill in proper class
 	'contract' => 'Contrat',
 	'cron' => 'Cron',
 	'datapolicy' => 'DataPolicy',
@@ -100,7 +100,7 @@ 
 	'don' => 'Don',
 	'dynamicprices' => 'DynamicPrices',
 	'ecm' => 'ECM',
-	'ecotax' => null,  // TODO: External module ?
+	'ecotax' => null, // TODO: External module ?
 	'emailcollector' => 'EmailCollector',
 	'eventorganization' => 'EventOrganization',
 	'expensereport' => 'ExpenseReport',
@@ -111,7 +111,7 @@ 
 	'fournisseur' => 'Fournisseur',
 	'ftp' => 'FTP',
 	'geoipmaxmind' => 'GeoIPMaxmind',
-	'google' => null,  // External ?
+	'google' => null, // External ?
 	'gravatar' => 'Gravatar',
 	'holiday' => 'Holiday',
 	'hrm' => 'HRM',
@@ -125,7 +125,7 @@ 
 	'ldap' => 'Ldap',
 	'loan' => 'Loan',
 	'mailing' => 'Mailing',
-	'mailman' => null,  // Same module as mailmanspip -> MailmanSpip ??
+	'mailman' => null, // Same module as mailmanspip -> MailmanSpip ??
 	'mailmanspip' => 'MailmanSpip',
 	'margin' => 'Margin',
 	'member' => 'Adherent',
@@ -138,7 +138,7 @@ 
 	'notification' => 'Notification',
 	'numberwords' => null, // Not provided by default, no module tests
 	'oauth' => 'Oauth',
-	'openstreetmap' => null,  // External module?
+	'openstreetmap' => null, // External module?
 	'opensurvey' => 'OpenSurvey',
 	'order' => 'Commande',
 	'partnership' => 'Partnership',
@@ -165,8 +165,8 @@ 
 	'stock' => 'Stock',
 	'stocktransfer' => 'StockTransfer',
 	'stripe' => 'Stripe',
-	'supplier_invoice' => null,  // Special case, uses invoice
-	'supplier_order' => null,  // Special case, uses invoice
+	'supplier_invoice' => null, // Special case, uses invoice
+	'supplier_order' => null, // Special case, uses invoice
 	'supplier_proposal' => 'SupplierProposal',
 	'syslog' => 'Syslog',
 	'takepos' => 'TakePos',
@@ -228,7 +228,7 @@ 
 	//	'processes' => 6,
 	'backward_compatibility_checks' => false,
 	'simplify_ast' => true,
-	'analyzed_file_extensions' => ['php','inc'],
+	'analyzed_file_extensions' => ['php', 'inc'],
 	'globals_type_map' => [
 		'action' => 'string',
 		'actioncode' => 'string',
@@ -273,12 +273,12 @@ 
 		'menumanager' => '\MenuManager',
 		'mysoc' => '\Societe',
 		'nblines' => '\int',
-		'obj' => '\CommonObject',     // Deprecated
+		'obj' => '\CommonObject', // Deprecated
 		'object_rights' => 'int|stdClass',
 		'objectoffield' => '\CommonObject',
 		'senderissupplier' => 'int<0,2>',
 		'user' => '\User',
-		'website' => 'string',  // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334  // Disable because Phan infers Website type
+		'website' => 'string', // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334  // Disable because Phan infers Website type
 		'websitepage' => '\WebSitePage',
 		'websitepagefile' => 'string',
 		// 'object' => '\CommonObject',  // Deprecated, not enabled because conflicts with $object assignments
@@ -302,7 +302,7 @@ 
 	// your application should be included in this list.
 	'directory_list' => [
 		'htdocs',
-		PHAN_DIR . '/stubs/',
+		PHAN_DIR.'/stubs/',
 	],
 
 	// A directory list that defines files that will be excluded
@@ -320,7 +320,7 @@ 
 		'htdocs/includes/',
 		'htdocs/install/doctemplates/websites/',
 		'htdocs/core/class/lessc.class.php', // External library
-		PHAN_DIR . '/stubs/',
+		PHAN_DIR.'/stubs/',
 	],
 	//'exclude_file_regex' => '@^vendor/.*/(tests?|Tests?)/@',
 	'exclude_file_regex' => '@^('  // @phpstan-ignore-line
@@ -335,7 +335,7 @@ 
 		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
 		.'|htdocs/conf/conf.php'  // @phpstan-ignore-line
 		// .'|htdocs/[^h].*/.*'  // For testing @phpstan-ignore-line
-		.')@',  // @phpstan-ignore-line
+		.')@', // @phpstan-ignore-line
 
 	// A list of plugin files to execute.
 	// Plugins which are bundled with Phan can be added here by providing their name
@@ -351,14 +351,14 @@ 
 		'/^isModEnabled$/' => [0, $moduleNameRegex, 'UnknownModuleName'],
 		// Note: trick to have different key for same regex:
 		'/^isModEnable[d]$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
-		'/^sanitizeVal$/' => [1, $sanitizeRegex,"UnknownSanitizeType"],
-		'/^checkVal$/' => [1, $sanitizeRegex,"UnknownCheckValSanitizeType"],
-		'/^\\\\ExtraFields::addExtraField$/' => [2, $extraFieldTypeRegex,"UnknownExtrafieldTypeBack"],
-		'/^dol_now$/' => [0, '{^(?:auto|gmt|tz(?:server|ref|user(?:rel)?))$}',"InvalidDolNowArgument"],  // '', 0, 1 match bool and int values
-		'/^dol_mktime$/' => [6, '{^(?:|0|1|auto|gmt|tz(?:server|ref|user(?:rel)?|,[+a-zA-Z-/]+))$}',"InvalidDolMktimeArgument"],  // '', 0, 1 match bool and int values
-		'/^dol_print_date$/' => [2, '{^(?:|0|1|auto|gmt|tz(?:server|user(?:rel)?))$}',"InvalidDolMktimeArgument"],
-		'/^GETPOSTFLOAT$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}',"InvalidGetPostFloatRounding"],
-		'/^price2num$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}',"InvalidPrice2NumRounding"],
+		'/^sanitizeVal$/' => [1, $sanitizeRegex, "UnknownSanitizeType"],
+		'/^checkVal$/' => [1, $sanitizeRegex, "UnknownCheckValSanitizeType"],
+		'/^\\\\ExtraFields::addExtraField$/' => [2, $extraFieldTypeRegex, "UnknownExtrafieldTypeBack"],
+		'/^dol_now$/' => [0, '{^(?:auto|gmt|tz(?:server|ref|user(?:rel)?))$}', "InvalidDolNowArgument"], // '', 0, 1 match bool and int values
+		'/^dol_mktime$/' => [6, '{^(?:|0|1|auto|gmt|tz(?:server|ref|user(?:rel)?|,[+a-zA-Z-/]+))$}', "InvalidDolMktimeArgument"], // '', 0, 1 match bool and int values
+		'/^dol_print_date$/' => [2, '{^(?:|0|1|auto|gmt|tz(?:server|user(?:rel)?))$}', "InvalidDolMktimeArgument"],
+		'/^GETPOSTFLOAT$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}', "InvalidGetPostFloatRounding"],
+		'/^price2num$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}', "InvalidPrice2NumRounding"],
 	],
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
@@ -419,38 +419,38 @@ 
 		// Dolibarr uses a lot of internal deprecated stuff, not reporting
 		'PhanDeprecatedProperty',
 
-		'PhanCompatibleNegativeStringOffset',	// return false positive
-		'PhanPluginConstantVariableBool',		// a lot of false positive, in most cases, we want to keep the code as it is
-		'PhanTypeInvalidDimOffset',				// this option costs more time to be supported than it solves time
+		'PhanCompatibleNegativeStringOffset', // return false positive
+		'PhanPluginConstantVariableBool', // a lot of false positive, in most cases, we want to keep the code as it is
+		'PhanTypeInvalidDimOffset', // this option costs more time to be supported than it solves time
 		'PhanTypeObjectUnsetDeclaredProperty',
-		'PhanTypePossiblyInvalidDimOffset',		// a lot of false positive, in most cases, we want to keep the code as it is
+		'PhanTypePossiblyInvalidDimOffset', // a lot of false positive, in most cases, we want to keep the code as it is
 
-		'PhanPluginWhitespaceTab',		// Dolibarr used tabs
-		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility
-		'PhanPluginShortArray',			// Dolibarr uses array()
-		'PhanPluginShortArrayList',		// Dolibarr uses array()
+		'PhanPluginWhitespaceTab', // Dolibarr used tabs
+		'PhanPluginCanUsePHP71Void', // Dolibarr is maintaining 7.0 compatibility
+		'PhanPluginShortArray', // Dolibarr uses array()
+		'PhanPluginShortArrayList', // Dolibarr uses array()
 		// Fixers From PHPDocToRealTypesPlugin:
-		'PhanPluginCanUseParamType',			// Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
-		'PhanPluginCanUseReturnType',			// Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
-		'PhanPluginCanUseNullableParamType',	// Fixer - Report/Add nullable parameter types in the function definition
-		'PhanPluginCanUseNullableReturnType',	// Fixer - Report/Add nullable return types in the function definition
+		'PhanPluginCanUseParamType', // Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseReturnType', // Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseNullableParamType', // Fixer - Report/Add nullable parameter types in the function definition
+		'PhanPluginCanUseNullableReturnType', // Fixer - Report/Add nullable return types in the function definition
 
-		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
-		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
-		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences
-		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
-		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
+		'PhanPluginNonBoolBranch', // Not essential - 31240+ occurrences
+		'PhanPluginNumericalComparison', // Not essential - 19870+ occurrences
+		'PhanTypeMismatchArgument', // Not essential - 12300+ occurrences
+		'PhanPluginNonBoolInLogicalArith', // Not essential - 11040+ occurrences
+		'PhanPluginConstantVariableScalar', // Not essential - 5180+ occurrences
 		'PhanPluginDuplicateAdjacentStatement',
-		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
-		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
-		'PhanPluginRedundantAssignmentInGlobalScope',	// Not essential, a lot of false warning
-		'PhanPluginRedundantAssignment',				// Not essential, useless
-		'PhanPluginDuplicateCatchStatementBody',  // Requires PHP7.1 - 50+ occurrences
+		'PhanPluginDuplicateConditionalTernaryDuplication', // 2750+ occurrences
+		'PhanPluginDuplicateConditionalNullCoalescing', // Not essential - 990+ occurrences
+		'PhanPluginRedundantAssignmentInGlobalScope', // Not essential, a lot of false warning
+		'PhanPluginRedundantAssignment', // Not essential, useless
+		'PhanPluginDuplicateCatchStatementBody', // Requires PHP7.1 - 50+ occurrences
 
-		'PhanPluginUnknownArrayMethodParamType',	// Too many troubles to manage. Is enabled into config_extended only.
-		'PhanPluginUnknownArrayMethodReturnType',	// Too many troubles to manage. Is enabled into config_extended only.
-		'PhanUndeclaredGlobalVariable',			// Too many false positives on .tpl.php files. Is enabled into config_extended only.
-		'PhanPluginUnknownObjectMethodCall',	// False positive for some class. Is enabled into config_extended only.
+		'PhanPluginUnknownArrayMethodParamType', // Too many troubles to manage. Is enabled into config_extended only.
+		'PhanPluginUnknownArrayMethodReturnType', // Too many troubles to manage. Is enabled into config_extended only.
+		'PhanUndeclaredGlobalVariable', // Too many false positives on .tpl.php files. Is enabled into config_extended only.
+		'PhanPluginUnknownObjectMethodCall', // False positive for some class. Is enabled into config_extended only.
 	],
 	// You can put relative paths to internal stubs in this config option.
 	// Phan will continue using its detailed type annotations,
@@ -469,31 +469,31 @@ 
 		//'xdebug'	=> 'vendor/phan/phan/.phan/internal_stubs/xdebug.phan_php',
 		//'memcached'  => PHAN_DIR . '/your_internal_stubs_folder_name/memcached.phan_php',
 		//'PDO'  => PHAN_DIR . '/stubs/PDO.phan_php',
-		'brotli'  => PHAN_DIR . '/stubs/brotli.phan_php',
-		'curl'  => PHAN_DIR . '/stubs/curl.phan_php',
-		'calendar'  => PHAN_DIR . '/stubs/calendar.phan_php',
-		'fileinfo'  => PHAN_DIR . '/stubs/fileinfo.phan_php',
-		'ftp'  => PHAN_DIR . '/stubs/ftp.phan_php',
-		'gd'  => PHAN_DIR . '/stubs/gd.phan_php',
-		'geoip'  => PHAN_DIR . '/stubs/geoip.phan_php',
-		'imagick'  => PHAN_DIR . '/stubs/imagick.phan_php',
-		'imap'  => PHAN_DIR . '/stubs/imap.phan_php',
-		'intl'  => PHAN_DIR . '/stubs/intl.phan_php',
-		'ldap'  => PHAN_DIR . '/stubs/ldap.phan_php',
-		'mcrypt'  => PHAN_DIR . '/stubs/mcrypt.phan_php',
-		'memcache'  => PHAN_DIR . '/stubs/memcache.phan_php',
-		'memcached' => PHAN_DIR . '/stubs/memcached.phan_php',
-		'mysqli'  => PHAN_DIR . '/stubs/mysqli.phan_php',
-		'pdo_cubrid'  => PHAN_DIR . '/stubs/pdo_cubrid.phan_php',
-		'pdo_mysql'  => PHAN_DIR . '/stubs/pdo_mysql.phan_php',
-		'pdo_pgsql'  => PHAN_DIR . '/stubs/pdo_pgsql.phan_php',
-		'pdo_sqlite'  => PHAN_DIR . '/stubs/pdo_sqlite.phan_php',
-		'pgsql'  => PHAN_DIR . '/stubs/pgsql.phan_php',
-		'session'  => PHAN_DIR . '/stubs/session.phan_php',
-		'simplexml'  => PHAN_DIR . '/stubs/SimpleXML.phan_php',
-		'soap'  => PHAN_DIR . '/stubs/soap.phan_php',
-		'sockets'  => PHAN_DIR . '/stubs/sockets.phan_php',
-		'tidy'  => PHAN_DIR . '/stubs/tidy.phan_php',
-		'zip'  => PHAN_DIR . '/stubs/zip.phan_php',
+		'brotli'  => PHAN_DIR.'/stubs/brotli.phan_php',
+		'curl'  => PHAN_DIR.'/stubs/curl.phan_php',
+		'calendar'  => PHAN_DIR.'/stubs/calendar.phan_php',
+		'fileinfo'  => PHAN_DIR.'/stubs/fileinfo.phan_php',
+		'ftp'  => PHAN_DIR.'/stubs/ftp.phan_php',
+		'gd'  => PHAN_DIR.'/stubs/gd.phan_php',
+		'geoip'  => PHAN_DIR.'/stubs/geoip.phan_php',
+		'imagick'  => PHAN_DIR.'/stubs/imagick.phan_php',
+		'imap'  => PHAN_DIR.'/stubs/imap.phan_php',
+		'intl'  => PHAN_DIR.'/stubs/intl.phan_php',
+		'ldap'  => PHAN_DIR.'/stubs/ldap.phan_php',
+		'mcrypt'  => PHAN_DIR.'/stubs/mcrypt.phan_php',
+		'memcache'  => PHAN_DIR.'/stubs/memcache.phan_php',
+		'memcached' => PHAN_DIR.'/stubs/memcached.phan_php',
+		'mysqli'  => PHAN_DIR.'/stubs/mysqli.phan_php',
+		'pdo_cubrid'  => PHAN_DIR.'/stubs/pdo_cubrid.phan_php',
+		'pdo_mysql'  => PHAN_DIR.'/stubs/pdo_mysql.phan_php',
+		'pdo_pgsql'  => PHAN_DIR.'/stubs/pdo_pgsql.phan_php',
+		'pdo_sqlite'  => PHAN_DIR.'/stubs/pdo_sqlite.phan_php',
+		'pgsql'  => PHAN_DIR.'/stubs/pgsql.phan_php',
+		'session'  => PHAN_DIR.'/stubs/session.phan_php',
+		'simplexml'  => PHAN_DIR.'/stubs/SimpleXML.phan_php',
+		'soap'  => PHAN_DIR.'/stubs/soap.phan_php',
+		'sockets'  => PHAN_DIR.'/stubs/sockets.phan_php',
+		'tidy'  => PHAN_DIR.'/stubs/tidy.phan_php',
+		'zip'  => PHAN_DIR.'/stubs/zip.phan_php',
 	],
 ];