Dolibarr / dolibarr

htdocs/user/logout.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,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 ?!
 }
 
 //global $conf, $langs, $user;

htdocs/user/passwordforgotten.php

Spacing +2 added lines, -2 removed lines

@@ -142,12 +142,12 @@
 			$messagewarning .= '</div>';
 
 			if ($result <= 0 && $edituser->error == 'USERNOTFOUND') {
-				usleep(20000);	// add delay to simulate setPassword() and send_password() actions delay (0.02s)
+				usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s)
 				$message .= $messagewarning;
 				$username = '';
 			} else {
 				if (empty($edituser->email)) {
-					usleep(20000);	// add delay to simulate setPassword() and send_password() actions delay (0.02s)
+					usleep(20000); // add delay to simulate setPassword() and send_password() actions delay (0.02s)
 					$message .= $messagewarning;
 				} else {
 					$newpassword = $edituser->setPassword($user, '', 1);

htdocs/admin/supplier_invoice.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 
 $type = GETPOST('type', 'alpha');
 $value = GETPOST('value', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');

htdocs/admin/expensereport_rules.php

Spacing +43 added lines, -43 removed lines

@@ -36,7 +36,7 @@ 
 $langs->loadLangs(array("admin", "other", "trips", "errors", "dict"));
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('admin', 'dictionaryadmin','expensereport_rules'));
+$hookmanager->initHooks(array('admin', 'dictionaryadmin', 'expensereport_rules'));
 
 $object = new ExpenseReportRule($db);
 
@@ -144,7 +144,7 @@ 
 			}
 
 			if (!$error) {
-				header('Location: ' . $_SERVER['PHP_SELF']);
+				header('Location: '.$_SERVER['PHP_SELF']);
 				exit;
 			} else {
 				$action = '';
@@ -158,7 +158,7 @@ 
 			dol_print_error($object->db);
 		}
 
-		header('Location: ' . $_SERVER['PHP_SELF']);
+		header('Location: '.$_SERVER['PHP_SELF']);
 		exit;
 	}
 
@@ -184,47 +184,47 @@ 
 
 	$form = new Form($db);
 
-	$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 	print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
 
 	$head = expensereport_admin_prepare_head();
 	print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
 
-	echo '<span class="opacitymedium">' . $langs->trans('ExpenseReportRulesDesc') . '</span>';
+	echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportRulesDesc').'</span>';
 	print '<br><br>';
 
 if ($action != 'edit') {
-	echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
-	echo '<input type="hidden" name="token" value="' . newToken() . '" />';
+	echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
+	echo '<input type="hidden" name="token" value="'.newToken().'" />';
 	echo '<input type="hidden" name="action" value="save" />';
 
 	echo '<table class="noborder centpercent">';
 
 	echo '<tr class="liste_titre headerexpensereportrules">';
-	echo '<th class="linecolapplyto">' . $langs->trans('ExpenseReportApplyTo') . '</th>';
-	echo '<th class="linecoltype">' . $langs->trans('Type') . '</th>';
-	echo '<th class="linecollimiton">' . $langs->trans('ExpenseReportLimitOn') . '</th>';
-	echo '<th class="linecoldatestart">' . $langs->trans('ExpenseReportDateStart') . '</th>';
-	echo '<th class="linecoldateend">' . $langs->trans('ExpenseReportDateEnd') . '</th>';
-	echo '<th class="linecollimitamount">' . $langs->trans('ExpenseReportLimitAmount') . '</th>';
-	echo '<th class="linecolrestrictive">' . $langs->trans('ExpenseReportRestrictive') . '</th>';
+	echo '<th class="linecolapplyto">'.$langs->trans('ExpenseReportApplyTo').'</th>';
+	echo '<th class="linecoltype">'.$langs->trans('Type').'</th>';
+	echo '<th class="linecollimiton">'.$langs->trans('ExpenseReportLimitOn').'</th>';
+	echo '<th class="linecoldatestart">'.$langs->trans('ExpenseReportDateStart').'</th>';
+	echo '<th class="linecoldateend">'.$langs->trans('ExpenseReportDateEnd').'</th>';
+	echo '<th class="linecollimitamount">'.$langs->trans('ExpenseReportLimitAmount').'</th>';
+	echo '<th class="linecolrestrictive">'.$langs->trans('ExpenseReportRestrictive').'</th>';
 	echo '<th>&nbsp;</th>';
 	echo '</tr>';
 
 	echo '<tr class="oddeven">';
 	echo '<td>';
-	echo '<div class="float linecolapplyto">' . $form->selectarray('apply_to', $tab_apply, '', 0) . '</div>';
-	echo '<div id="user" class="float linecoluser">' . $form->select_dolusers('', 'fk_user') . '</div>';
-	echo '<div id="group" class="float linecolgroup">' . $form->select_dolgroups('', 'fk_usergroup') . '</div>';
+	echo '<div class="float linecolapplyto">'.$form->selectarray('apply_to', $tab_apply, '', 0).'</div>';
+	echo '<div id="user" class="float linecoluser">'.$form->select_dolusers('', 'fk_user').'</div>';
+	echo '<div id="group" class="float linecolgroup">'.$form->select_dolgroups('', 'fk_usergroup').'</div>';
 	echo '</td>';
 
-	echo '<td class="linecoltype">' . $form->selectExpense('', 'fk_c_type_fees', 0, 1, 1) . '</td>';
-	echo '<td class="linecoltyperule">' . $form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0) . '</td>';
-	echo '<td class="linecoldatestart">' . $form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', '', '', 0, '', 1, 0) . '</td>';
-	echo '<td class="linecoldateend">' . $form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', '', '', 0, '', 1, 0) . '</td>';
+	echo '<td class="linecoltype">'.$form->selectExpense('', 'fk_c_type_fees', 0, 1, 1).'</td>';
+	echo '<td class="linecoltyperule">'.$form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0).'</td>';
+	echo '<td class="linecoldatestart">'.$form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', '', '', 0, '', 1, 0).'</td>';
+	echo '<td class="linecoldateend">'.$form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', '', '', 0, '', 1, 0).'</td>';
 	echo '<td class="linecolamount"><input type="text" value="" class="maxwidth100" name="amount" class="amount right" /></td>';
-	echo '<td class="linecolrestrictive">' . $form->selectyesno('restrictive', 0, 1) . '</td>';
-	echo '<td class="right linecolbutton"><input type="submit" class="button button-add" value="' . $langs->trans('Add') . '" /></td>';
+	echo '<td class="linecolrestrictive">'.$form->selectyesno('restrictive', 0, 1).'</td>';
+	echo '<td class="right linecolbutton"><input type="submit" class="button button-add" value="'.$langs->trans('Add').'" /></td>';
 	echo '</tr>';
 
 	echo '</table>';
@@ -232,24 +232,24 @@ 
 }
 
 
-	echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
-	echo '<input type="hidden" name="token" value="' . newToken() . '" />';
+	echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
+	echo '<input type="hidden" name="token" value="'.newToken().'" />';
 
 if ($action == 'edit') {
-	echo '<input type="hidden" name="id" value="' . $object->id . '" />';
+	echo '<input type="hidden" name="id" value="'.$object->id.'" />';
 	echo '<input type="hidden" name="action" value="save" />';
 }
 
 	echo '<table class="noborder centpercent">';
 
 	echo '<tr class="liste_titre expensereportrules">';
-	echo '<th class="linecolapplyto">' . $langs->trans('ExpenseReportApplyTo') . '</th>';
-	echo '<th class="linecoltype">' . $langs->trans('Type') . '</th>';
-	echo '<th class="linecollimiton">' . $langs->trans('ExpenseReportLimitOn') . '</th>';
-	echo '<th class="linecoldatestart">' . $langs->trans('ExpenseReportDateStart') . '</th>';
-	echo '<th class="linecoldateend">' . $langs->trans('ExpenseReportDateEnd') . '</th>';
-	echo '<th class="linecollimitamount">' . $langs->trans('ExpenseReportLimitAmount') . '</th>';
-	echo '<th class="linecolrestrictive">' . $langs->trans('ExpenseReportRestrictive') . '</th>';
+	echo '<th class="linecolapplyto">'.$langs->trans('ExpenseReportApplyTo').'</th>';
+	echo '<th class="linecoltype">'.$langs->trans('Type').'</th>';
+	echo '<th class="linecollimiton">'.$langs->trans('ExpenseReportLimitOn').'</th>';
+	echo '<th class="linecoldatestart">'.$langs->trans('ExpenseReportDateStart').'</th>';
+	echo '<th class="linecoldateend">'.$langs->trans('ExpenseReportDateEnd').'</th>';
+	echo '<th class="linecollimitamount">'.$langs->trans('ExpenseReportLimitAmount').'</th>';
+	echo '<th class="linecolrestrictive">'.$langs->trans('ExpenseReportRestrictive').'</th>';
 	echo '<th>&nbsp;</th>';
 	echo '</tr>';
 
@@ -259,16 +259,16 @@ 
 	echo '<td class="linecolusergroup">';
 	if ($action == 'edit' && $object->id == $rule->id) {
 		$selected = ($object->is_for_all > 0) ? 'A' : ($object->fk_usergroup > 0 ? 'G' : 'U');
-		echo '<div class="float">' . $form->selectarray('apply_to', $tab_apply, $selected, 0) . '</div>';
-		echo '<div id="user" class="float">' . $form->select_dolusers($object->fk_user, 'fk_user') . '</div>';
-		echo '<div id="group" class="float">' . $form->select_dolgroups($object->fk_usergroup, 'fk_usergroup') . '</div>';
+		echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, $selected, 0).'</div>';
+		echo '<div id="user" class="float">'.$form->select_dolusers($object->fk_user, 'fk_user').'</div>';
+		echo '<div id="group" class="float">'.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'</div>';
 	} else {
 		if ($rule->is_for_all > 0) {
 			echo $tab_apply['A'];
 		} elseif ($rule->fk_usergroup > 0) {
-			echo $tab_apply['G'] . ' (' . $rule->getGroupLabel() . ')';
+			echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
 		} elseif ($rule->fk_user > 0) {
-			echo $tab_apply['U'] . ' (' . $rule->getUserName() . ')';
+			echo $tab_apply['U'].' ('.$rule->getUserName().')';
 		}
 	}
 	echo '</td>';
@@ -322,7 +322,7 @@ 
 	// Amount
 	echo '<td class="linecolamount">';
 	if ($action == 'edit' && $object->id == $rule->id) {
-		echo '<input type="text" value="' . price2num($object->amount) . '" name="amount" class="amount width50 right" />';
+		echo '<input type="text" value="'.price2num($object->amount).'" name="amount" class="amount width50 right" />';
 	} else {
 		echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
 	}
@@ -340,11 +340,11 @@ 
 
 	echo '<td class="center">';
 	if ($object->id != $rule->id) {
-		echo '<a class="editfielda paddingright paddingleft" href="' . $_SERVER['PHP_SELF'] . '?action=edit&token=' . newToken() . '&id=' . $rule->id . '">' . img_edit() . '</a>&nbsp;';
-		echo '<a class="paddingright paddingleft" href="' . $_SERVER['PHP_SELF'] . '?action=delete&token=' . newToken() . '&id=' . $rule->id . '">' . img_delete() . '</a>';
+		echo '<a class="editfielda paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
+		echo '<a class="paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$rule->id.'">'.img_delete().'</a>';
 	} else {
-		echo '<input type="submit" class="button button-edit" value="' . $langs->trans('Update') . '" />&nbsp;';
-		echo '<a href="' . $_SERVER['PHP_SELF'] . '" class="button button-cancel">' . $langs->trans("Cancel") . '</a>';
+		echo '<input type="submit" class="button button-edit" value="'.$langs->trans('Update').'" />&nbsp;';
+		echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button button-cancel">'.$langs->trans("Cancel").'</a>';
 	}
 	echo '</td>';
 

htdocs/admin/system/database-tables.php

Spacing +6 added lines, -6 removed lines

@@ -24,8 +24,8 @@ 
  *	\brief      Page with information on database tables. Add also some maintenance action to convert tables.
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) {
-	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 }
 
 // Load Dolibarr environment
@@ -114,7 +114,7 @@ 
 			//print $shortsqlfilename.' ';
 			$shortsqlfilename = preg_replace('/\-[a-z]+\./', '.', $value['name']);
 			$arrayoffiles[$value['name']] = $shortsqlfilename;
-			if ($value['name'] == $shortsqlfilename && ! preg_match('/\.key\.sql$/', $value['name'])) {
+			if ($value['name'] == $shortsqlfilename && !preg_match('/\.key\.sql$/', $value['name'])) {
 				// This is a sql file automatically created
 				$arrayoftablesautocreated[$value['name']] = $shortsqlfilename;
 			}
@@ -132,7 +132,7 @@ 
 
 				print '<tr class="oddeven">';
 
-				print '<td>'.($i+1).'</td>';
+				print '<td>'.($i + 1).'</td>';
 				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a>';
 				$tablename = preg_replace('/^'.MAIN_DB_PREFIX.'/', 'llx_', $obj->Name);
 
@@ -204,7 +204,7 @@ 
 			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				print '<tr class="oddeven">';
-				print '<td>'.($i+1).'</td>';
+				print '<td>'.($i + 1).'</td>';
 				print '<td>'.$row[0].'</td>';
 				print '<td class="right">'.$row[1].'</td>';
 				print '<td class="right">'.$row[2].'</td>';
@@ -243,7 +243,7 @@ 
 				}
 
 				print '<tr class="oddeven">';
-				print '<td>'.($i+1).'</td>';
+				print '<td>'.($i + 1).'</td>';
 				print '<td>'.$row[0].'</td>';
 				print '<td>'.$count.'</td>';
 				print '</tr>';

htdocs/admin/bomline_extrafields.php

Spacing +8 added lines, -8 removed lines

@@ -28,8 +28,8 @@ 
  */
 
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/bom/lib/bom.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('mrp', 'admin'));
@@ -57,7 +57,7 @@ 
  * Actions
  */
 
-require DOL_DOCUMENT_ROOT . '/core/actions_extrafields.inc.php';
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
 
 
 /*
@@ -68,7 +68,7 @@ 
 llxHeader('', $langs->trans("BOMsSetup"), $help_url);
 
 
-$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("BOMsSetup"), $linkback, 'title_setup');
 
 
@@ -76,7 +76,7 @@ 
 
 print dol_get_fiche_head($head, 'bomline_extrafields', $langs->trans("ExtraFields"), -1, 'account');
 
-require DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_view.tpl.php';
+require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
 print dol_get_fiche_end();
 
@@ -84,7 +84,7 @@ 
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<a class="butAction reposition" href="' . $_SERVER["PHP_SELF"] . '?action=create">' . $langs->trans("NewAttribute") . '</a>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
@@ -96,7 +96,7 @@ 
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-	require DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /*
@@ -106,7 +106,7 @@ 
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-	require DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page

htdocs/admin/const.php

Spacing +5 added lines, -5 removed lines

@@ -199,12 +199,12 @@ 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '') . "\n";
+print getTitleFieldOfList('Name', 0, $_SERVER['PHP_SELF'], 'name', '', $param, '', $sortfield, $sortorder, '')."\n";
 print getTitleFieldOfList("Value", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
 print getTitleFieldOfList("Comment", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n";
+print getTitleFieldOfList('DateModificationShort', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
 if (isModEnabled('multicompany') && !$user->entity) {
-	print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ') . "\n";
+	print getTitleFieldOfList('Entity', 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
 }
 print getTitleFieldOfList("", 0, $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
 print "</tr>\n";
@@ -227,12 +227,12 @@ 
 // Limit to superadmin
 if (isModEnabled('multicompany') && !$user->entity) {
 	print '<td>';
-	print '<input type="text" class="flat" size="1" name="entity" value="' . $conf->entity . '">';
+	print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
 	print '</td>';
 	print '<td class="center">';
 } else {
 	print '<td class="center">';
-	print '<input type="hidden" name="entity" value="' . $conf->entity . '">';
+	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 }
 print '<input type="submit" class="button button-add small" id="add" name="add" value="'.$langs->trans("Add").'">';
 print "</td>\n";

htdocs/fourn/class/fournisseur.product.class.php

Spacing +8 added lines, -8 removed lines

@@ -71,7 +71,7 @@ 
 	public $product_ref;
 
 	public $fourn_id; //supplier id
-	public $fourn_name;	// supplier name
+	public $fourn_name; // supplier name
 	public $fourn_qty; // quantity for price (can be set by get_buyprice)
 	public $fourn_pu; // unit price for quantity (can be set by get_buyprice)
 
@@ -79,7 +79,7 @@ 
 	public $fourn_remise_percent; // discount for quantity (percent)
 	public $fourn_remise; // discount for quantity (amount)
 
-	public $fourn_charges;	// when getDolGlobalString('PRODUCT_CHARGES') is set
+	public $fourn_charges; // when getDolGlobalString('PRODUCT_CHARGES') is set
 
 	public $product_fourn_id; // product-supplier id
 	public $product_fourn_entity;
@@ -95,7 +95,7 @@ 
 	public $fk_availability;
 
 	public $fourn_unitprice;
-	public $fourn_unitprice_with_discount;	// not saved into database
+	public $fourn_unitprice_with_discount; // not saved into database
 	public $fourn_tva_tx;
 	public $fourn_tva_npr;
 
@@ -610,8 +610,8 @@ 
 
 				$this->fk_product				= $obj->fk_product;
 				$this->product_id				= $obj->fk_product;
-				$this->product_ref				= $obj->product_ref;
-				$this->status					= $obj->status;
+				$this->product_ref = $obj->product_ref;
+				$this->status = $obj->status;
 				$this->status_buy				= $obj->status_buy;
 				$this->fourn_id					= $obj->fk_soc;
 				$this->fourn_ref				= $obj->ref_fourn; // deprecated
@@ -719,8 +719,8 @@ 
 
 				$prodfourn->product_ref = $record["product_ref"];
 				$prodfourn->product_fourn_price_id = $record["product_fourn_pri_id"];
-				$prodfourn->status					= $record["status"];
-				$prodfourn->status_buy				= $record["status_buy"];
+				$prodfourn->status = $record["status"];
+				$prodfourn->status_buy = $record["status_buy"];
 				$prodfourn->product_fourn_id = $record["product_fourn_id"];
 				$prodfourn->product_fourn_entity = $record["entity"];
 				$prodfourn->ref_supplier			= $record["ref_fourn"];
@@ -1301,7 +1301,7 @@ 
 		}
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {

htdocs/fourn/commande/note.php

Spacing +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
 
 // Permissions
 $permissionnote = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); // Used by the include of actions_setnotes.inc.php
-$usercancreate	= ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
-$permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
+$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
+$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
 
 
 /*