alxarafe / alixar

dolibarr/htdocs/asset/type.php

Indentation +495 added lines, -495 removed lines

@@ -69,8 +69,8 @@ 
 
 if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
 {
-	$type="";
-	$sall="";
+    $type="";
+    $sall="";
 }
 
 
@@ -84,111 +84,111 @@ 
 
 if ($cancel) {
 
-	$action='';
+    $action='';
 
-	if (! empty($backtopage))
-	{
-		header("Location: ".$backtopage);
-		exit;
-	}
+    if (! empty($backtopage))
+    {
+        header("Location: ".$backtopage);
+        exit;
+    }
 }
 
 if ($action == 'add' && $user->rights->asset->write)
 {
-	$object->label									= trim($label);
-	$object->accountancy_code_asset					= trim($accountancy_code_asset);
-	$object->accountancy_code_depreciation_asset	= trim($accountancy_code_depreciation_asset);
-	$object->accountancy_code_depreciation_expense	= trim($accountancy_code_depreciation_expense);
-	$object->note									= trim($comment);
-
-	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-	if ($ret < 0) $error++;
-
-	if (empty($object->label)) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), null, 'errors');
-	}
-	else {
-		$sql = "SELECT label FROM ".MAIN_DB_PREFIX."asset_type WHERE label='".$db->escape($object->label)."'";
-		$result = $db->query($sql);
-		if ($result) {
-			$num = $db->num_rows($result);
-		}
-		if ($num) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorLabelAlreadyExists",$login), null, 'errors');
-		}
-	}
-
-	if (! $error)
-	{
-		$id=$object->create($user);
-		if ($id > 0)
-		{
-			header("Location: ".$_SERVER["PHP_SELF"]);
-			exit;
-		}
-		else
-		{
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = 'create';
-		}
-	}
-	else
-	{
-		$action = 'create';
-	}
+    $object->label									= trim($label);
+    $object->accountancy_code_asset					= trim($accountancy_code_asset);
+    $object->accountancy_code_depreciation_asset	= trim($accountancy_code_depreciation_asset);
+    $object->accountancy_code_depreciation_expense	= trim($accountancy_code_depreciation_expense);
+    $object->note									= trim($comment);
+
+    // Fill array 'array_options' with data from add form
+    $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+    if ($ret < 0) $error++;
+
+    if (empty($object->label)) {
+        $error++;
+        setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), null, 'errors');
+    }
+    else {
+        $sql = "SELECT label FROM ".MAIN_DB_PREFIX."asset_type WHERE label='".$db->escape($object->label)."'";
+        $result = $db->query($sql);
+        if ($result) {
+            $num = $db->num_rows($result);
+        }
+        if ($num) {
+            $error++;
+            $langs->load("errors");
+            setEventMessages($langs->trans("ErrorLabelAlreadyExists",$login), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        $id=$object->create($user);
+        if ($id > 0)
+        {
+            header("Location: ".$_SERVER["PHP_SELF"]);
+            exit;
+        }
+        else
+        {
+            setEventMessages($object->error, $object->errors, 'errors');
+            $action = 'create';
+        }
+    }
+    else
+    {
+        $action = 'create';
+    }
 }
 
 if ($action == 'update' && $user->rights->asset->write)
 {
-	$object->fetch($rowid);
+    $object->fetch($rowid);
 
-	$object->oldcopy = clone $object;
+    $object->oldcopy = clone $object;
 
-	$object->label									= trim($label);
-	$object->accountancy_code_asset					= trim($accountancy_code_asset);
-	$object->accountancy_code_depreciation_asset	= trim($accountancy_code_depreciation_asset);
-	$object->accountancy_code_depreciation_expense	= trim($accountancy_code_depreciation_expense);
-	$object->note									= trim($comment);
+    $object->label									= trim($label);
+    $object->accountancy_code_asset					= trim($accountancy_code_asset);
+    $object->accountancy_code_depreciation_asset	= trim($accountancy_code_depreciation_asset);
+    $object->accountancy_code_depreciation_expense	= trim($accountancy_code_depreciation_expense);
+    $object->note									= trim($comment);
 
-	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-	if ($ret < 0) $error++;
+    // Fill array 'array_options' with data from add form
+    $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+    if ($ret < 0) $error++;
 
-	$ret=$object->update($user);
+    $ret=$object->update($user);
 
-	if ($ret >= 0 && ! count($object->errors))
-	{
-		setEventMessages($langs->trans("AssetsTypeModified"), null, 'mesgs');
-	}
-	else
-	{
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
+    if ($ret >= 0 && ! count($object->errors))
+    {
+        setEventMessages($langs->trans("AssetsTypeModified"), null, 'mesgs');
+    }
+    else
+    {
+        setEventMessages($object->error, $object->errors, 'errors');
+    }
 
-	header("Location: ".$_SERVER["PHP_SELF"]."?rowid=".$object->id);
-	exit;
+    header("Location: ".$_SERVER["PHP_SELF"]."?rowid=".$object->id);
+    exit;
 }
 
 if ($action == 'confirm_delete' && $user->rights->asset->write)
 {
-	$object->fetch($rowid);
-	$res=$object->delete();
-
-	if ($res > 0)
-	{
-		setEventMessages($langs->trans("AssetsTypeDeleted"), null, 'mesgs');
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		setEventMessages($langs->trans("AssetsTypeCanNotBeDeleted"), null, 'errors');
-		$action='';
-	}
+    $object->fetch($rowid);
+    $res=$object->delete();
+
+    if ($res > 0)
+    {
+        setEventMessages($langs->trans("AssetsTypeDeleted"), null, 'mesgs');
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        setEventMessages($langs->trans("AssetsTypeCanNotBeDeleted"), null, 'errors');
+        $action='';
+    }
 }
 
 
@@ -204,116 +204,116 @@ 
 // List of asset type
 if (! $rowid && $action != 'create' && $action != 'edit')
 {
-	//dol_fiche_head('');
-
-	$sql = "SELECT d.rowid, d.label as label, d.accountancy_code_asset, d.accountancy_code_depreciation_asset, d.accountancy_code_depreciation_expense, d.note";
-	$sql.= " FROM ".MAIN_DB_PREFIX."asset_type as d";
-	$sql.= " WHERE d.entity IN (".getEntity('asset_type').")";
-
-	$result = $db->query($sql);
-	if ($result)
-	{
-		$num = $db->num_rows($result);
-		$nbtotalofrecords = $num;
-
-		$i = 0;
-
-		$param = '';
-
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-		print '<input type="hidden" name="action" value="list">';
-		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-		print '<input type="hidden" name="page" value="'.$page.'">';
-		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-		print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
-
-		$moreforfilter = '';
-
-		print '<div class="div-table-responsive">';
-		print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
-
-		print '<tr class="liste_titre">';
-		print '<th>'.$langs->trans("Ref").'</th>';
-		print '<th>'.$langs->trans("Label").'</th>';
-		print '<th align="center">'.$langs->trans("AccountancyCodeAsset").'</th>';
-		print '<th align="center">'.$langs->trans("AccountancyCodeDepreciationAsset").'</th>';
-		print '<th align="center">'.$langs->trans("AccountancyCodeDepreciationExpense").'</th>';
-		print '<th>&nbsp;</th>';
-		print "</tr>\n";
-
-		$assettype = new AssetType($db);
-
-		while ($i < $num)
-		{
-			$objp = $db->fetch_object($result);
-
-			$assettype->id = $objp->rowid;
-			$assettype->ref = $objp->rowid;
-			$assettype->label = $objp->rowid;
-
-			print '<tr class="oddeven">';
-			print '<td>';
-			print $assettype->getNomUrl(1);
-			//<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>
-			print '</td>';
-			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
-
-			print '<td class="center">';
-			if (! empty($conf->accounting->enabled))
-			{
-				$accountingaccount = new AccountingAccount($db);
-				$accountingaccount->fetch('',$objp->accountancy_code_asset,1);
-
-				print $accountingaccount->getNomUrl(0,0,0,'',0);
-			} else {
-				print $objp->accountancy_code_asset;
-			}
-			print '</td>';
-
-			print '<td class="center">';
-			if (! empty($conf->accounting->enabled))
-			{
-				$accountingaccount2 = new AccountingAccount($db);
-				$accountingaccount2->fetch('',$objp->accountancy_code_depreciation_asset,1);
-
-				print $accountingaccount2->getNomUrl(0,0,0,'',0);
-			} else {
-				print $objp->accountancy_code_depreciation_asset;
-			}
-			print '</td>';
-
-			print '<td class="center">';
-			if (! empty($conf->accounting->enabled))
-			{
-				$accountingaccount3 = new AccountingAccount($db);
-				$accountingaccount3->fetch('',$objp->accountancy_code_depreciation_expense,1);
-
-				print $accountingaccount3->getNomUrl(0,0,0,'',0);
-			} else {
-				print $objp->accountancy_code_depreciation_expense;
-			}
-			print '</td>';
-
-			if ($user->rights->asset->write)
-				print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			else
-				print '<td align="right">&nbsp;</td>';
-			print "</tr>";
-			$i++;
-		}
-		print "</table>";
-		print '</div>';
-
-		print '</form>';
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+    //dol_fiche_head('');
+
+    $sql = "SELECT d.rowid, d.label as label, d.accountancy_code_asset, d.accountancy_code_depreciation_asset, d.accountancy_code_depreciation_expense, d.note";
+    $sql.= " FROM ".MAIN_DB_PREFIX."asset_type as d";
+    $sql.= " WHERE d.entity IN (".getEntity('asset_type').")";
+
+    $result = $db->query($sql);
+    if ($result)
+    {
+        $num = $db->num_rows($result);
+        $nbtotalofrecords = $num;
+
+        $i = 0;
+
+        $param = '';
+
+        print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+        if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+        print '<input type="hidden" name="action" value="list">';
+        print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+        print '<input type="hidden" name="page" value="'.$page.'">';
+        print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+
+        print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, '', '', $limit);
+
+        $moreforfilter = '';
+
+        print '<div class="div-table-responsive">';
+        print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+        print '<tr class="liste_titre">';
+        print '<th>'.$langs->trans("Ref").'</th>';
+        print '<th>'.$langs->trans("Label").'</th>';
+        print '<th align="center">'.$langs->trans("AccountancyCodeAsset").'</th>';
+        print '<th align="center">'.$langs->trans("AccountancyCodeDepreciationAsset").'</th>';
+        print '<th align="center">'.$langs->trans("AccountancyCodeDepreciationExpense").'</th>';
+        print '<th>&nbsp;</th>';
+        print "</tr>\n";
+
+        $assettype = new AssetType($db);
+
+        while ($i < $num)
+        {
+            $objp = $db->fetch_object($result);
+
+            $assettype->id = $objp->rowid;
+            $assettype->ref = $objp->rowid;
+            $assettype->label = $objp->rowid;
+
+            print '<tr class="oddeven">';
+            print '<td>';
+            print $assettype->getNomUrl(1);
+            //<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>
+            print '</td>';
+            print '<td>'.dol_escape_htmltag($objp->label).'</td>';
+
+            print '<td class="center">';
+            if (! empty($conf->accounting->enabled))
+            {
+                $accountingaccount = new AccountingAccount($db);
+                $accountingaccount->fetch('',$objp->accountancy_code_asset,1);
+
+                print $accountingaccount->getNomUrl(0,0,0,'',0);
+            } else {
+                print $objp->accountancy_code_asset;
+            }
+            print '</td>';
+
+            print '<td class="center">';
+            if (! empty($conf->accounting->enabled))
+            {
+                $accountingaccount2 = new AccountingAccount($db);
+                $accountingaccount2->fetch('',$objp->accountancy_code_depreciation_asset,1);
+
+                print $accountingaccount2->getNomUrl(0,0,0,'',0);
+            } else {
+                print $objp->accountancy_code_depreciation_asset;
+            }
+            print '</td>';
+
+            print '<td class="center">';
+            if (! empty($conf->accounting->enabled))
+            {
+                $accountingaccount3 = new AccountingAccount($db);
+                $accountingaccount3->fetch('',$objp->accountancy_code_depreciation_expense,1);
+
+                print $accountingaccount3->getNomUrl(0,0,0,'',0);
+            } else {
+                print $objp->accountancy_code_depreciation_expense;
+            }
+            print '</td>';
+
+            if ($user->rights->asset->write)
+                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
+            else
+                print '<td align="right">&nbsp;</td>';
+            print "</tr>";
+            $i++;
+        }
+        print "</table>";
+        print '</div>';
+
+        print '</form>';
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 
@@ -324,83 +324,83 @@ 
 /* ************************************************************************** */
 if ($action == 'create')
 {
-	$object = new AssetType($db);
-	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
-
-	print load_fiche_titre($langs->trans("NewAssetType"));
-
-	print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="add">';
-
-	dol_fiche_head('');
-
-	print '<table class="border" width="100%">';
-	print '<tbody>';
-
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40"></td></tr>';
-
-	if (! empty($conf->accounting->enabled))
-	{
-		// Accountancy_code_asset
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
-		print '<td>';
-		print $formaccounting->select_account($object->accountancy_code_asset, 'accountancy_code_asset', 1, '', 1, 1);
-		print '</td></tr>';
-
-		// Accountancy_code_depreciation_expense
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
-		print '<td>';
-		print $formaccounting->select_account($object->accountancy_code_depreciation_asset, 'accountancy_code_depreciation_asset', 1, '', 1, 1);
-		print '</td></tr>';
-
-		// Accountancy_code_depreciation_expense
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
-		print '<td>';
-		print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
-		print '</td></tr>';
-	}
-	else // For external software
-	{
-		// Accountancy_code_asset
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
-		print '<td><input name="accountancy_code_asset" class="maxwidth200" value="'.$object->accountancy_code_asset.'">';
-		print '</td></tr>';
-
-		// Accountancy_code_depreciation_asset
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
-		print '<td><input name="accountancy_code_depreciation_asset" class="maxwidth200" value="'.$object->accountancy_code_depreciation_asset.'">';
-		print '</td></tr>';
-
-		// Accountancy_code_depreciation_expense
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
-		print '<td><input name="accountancy_code_depreciation_expense" class="maxwidth200" value="'.$object->accountancy_code_depreciation_expense.'">';
-		print '</td></tr>';
-	}
-
-	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-	print '<textarea name="comment" wrap="soft" class="centpercent" rows="3"></textarea></td></tr>';
-
-	// Other attributes
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
-		print $object->showOptionals($extrafields,'edit');
-	}
-	print '<tbody>';
-	print "</table>\n";
-
-	dol_fiche_end();
-
-	print '<div class="center">';
-	print '<input type="submit" name="button" class="button" value="'.$langs->trans("Add").'">';
-	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-	print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
-	print '</div>';
-
-	print "</form>\n";
+    $object = new AssetType($db);
+    if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+
+    print load_fiche_titre($langs->trans("NewAssetType"));
+
+    print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="add">';
+
+    dol_fiche_head('');
+
+    print '<table class="border" width="100%">';
+    print '<tbody>';
+
+    print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40"></td></tr>';
+
+    if (! empty($conf->accounting->enabled))
+    {
+        // Accountancy_code_asset
+        print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
+        print '<td>';
+        print $formaccounting->select_account($object->accountancy_code_asset, 'accountancy_code_asset', 1, '', 1, 1);
+        print '</td></tr>';
+
+        // Accountancy_code_depreciation_expense
+        print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
+        print '<td>';
+        print $formaccounting->select_account($object->accountancy_code_depreciation_asset, 'accountancy_code_depreciation_asset', 1, '', 1, 1);
+        print '</td></tr>';
+
+        // Accountancy_code_depreciation_expense
+        print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
+        print '<td>';
+        print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
+        print '</td></tr>';
+    }
+    else // For external software
+    {
+        // Accountancy_code_asset
+        print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
+        print '<td><input name="accountancy_code_asset" class="maxwidth200" value="'.$object->accountancy_code_asset.'">';
+        print '</td></tr>';
+
+        // Accountancy_code_depreciation_asset
+        print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
+        print '<td><input name="accountancy_code_depreciation_asset" class="maxwidth200" value="'.$object->accountancy_code_depreciation_asset.'">';
+        print '</td></tr>';
+
+        // Accountancy_code_depreciation_expense
+        print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
+        print '<td><input name="accountancy_code_depreciation_expense" class="maxwidth200" value="'.$object->accountancy_code_depreciation_expense.'">';
+        print '</td></tr>';
+    }
+
+    print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
+    print '<textarea name="comment" wrap="soft" class="centpercent" rows="3"></textarea></td></tr>';
+
+    // Other attributes
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    if (empty($reshook))
+    {
+        print $object->showOptionals($extrafields,'edit');
+    }
+    print '<tbody>';
+    print "</table>\n";
+
+    dol_fiche_end();
+
+    print '<div class="center">';
+    print '<input type="submit" name="button" class="button" value="'.$langs->trans("Add").'">';
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';
+    print '</div>';
+
+    print "</form>\n";
 }
 
 /* ************************************************************************** */
@@ -410,232 +410,232 @@ 
 /* ************************************************************************** */
 if ($rowid > 0)
 {
-	if ($action != 'edit')
-	{
-		$object = new AssetType($db);
-		$object->fetch($rowid);
-		$object->fetch_optionals();
+    if ($action != 'edit')
+    {
+        $object = new AssetType($db);
+        $object->fetch($rowid);
+        $object->fetch_optionals();
 
-		/*
+        /*
 		 * Confirmation suppression
 		 */
-		if ($action == 'delete')
-		{
-			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id,$langs->trans("DeleteAnAssetType"),$langs->trans("ConfirmDeleteAssetType",$object->label),"confirm_delete", '',0,1);
-		}
-
-		$head = asset_type_prepare_head($object);
-
-		dol_fiche_head($head, 'card', $langs->trans("AssetType"), -1, 'setup');
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/asset/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-		$morehtmlref='<div class="refidno">';
-		// Ref asset type
-		$morehtmlref.=$form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', null, null, '', 1);
-		$morehtmlref.='</div>';
-
-		dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
-
-		print '<div class="fichecenter">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border" width="100%">';
-
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("AccountancyCodeAsset");
-		print '</td><td>';
-		if (! empty($conf->accounting->enabled))
-		{
-			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch('',$object->accountancy_code_asset,1);
-
-			print $accountingaccount->getNomUrl(0,1,1,'',1);
-		} else {
-			print $object->accountancy_code_asset;
-		}
-		print '</td>';
-		print '</tr>';
-
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("AccountancyCodeDepreciationAsset");
-		print '</td><td>';
-		if (! empty($conf->accounting->enabled))
-		{
-			$accountingaccount2 = new AccountingAccount($db);
-			$accountingaccount2->fetch('',$object->accountancy_code_depreciation_asset,1);
-
-			print $accountingaccount2->getNomUrl(0,1,1,'',1);
-		} else {
-			print $object->accountancy_code_depreciation_asset;
-		}
-		print '</td>';
-		print '</tr>';
-
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("AccountancyCodeDepreciationExpense");
-		print '</td><td>';
-		if (! empty($conf->accounting->enabled))
-		{
-			$accountingaccount3 = new AccountingAccount($db);
-			$accountingaccount3->fetch('',$object->accountancy_code_depreciation_expense,1);
-
-			print $accountingaccount3->getNomUrl(0,1,1,'',1);
-		} else {
-			print $object->accountancy_code_depreciation_expense;
-		}
-		print '</td>';
-		print '</tr>';
-
-		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-		print nl2br($object->note)."</td></tr>";
-
-		// Other attributes
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
-
-		print '</table>';
-		print '</div>';
-
-		dol_fiche_end();
-
-		/*
+        if ($action == 'delete')
+        {
+            print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id,$langs->trans("DeleteAnAssetType"),$langs->trans("ConfirmDeleteAssetType",$object->label),"confirm_delete", '',0,1);
+        }
+
+        $head = asset_type_prepare_head($object);
+
+        dol_fiche_head($head, 'card', $langs->trans("AssetType"), -1, 'setup');
+
+        $linkback = '<a href="'.DOL_URL_ROOT.'/asset/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+        $morehtmlref='<div class="refidno">';
+        // Ref asset type
+        $morehtmlref.=$form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', 0, 1);
+        $morehtmlref.=$form->editfieldval("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', null, null, '', 1);
+        $morehtmlref.='</div>';
+
+        dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+
+        print '<div class="fichecenter">';
+        print '<div class="underbanner clearboth"></div>';
+
+        print '<table class="border" width="100%">';
+
+        print '<tr>';
+        print '<td class="nowrap">';
+        print $langs->trans("AccountancyCodeAsset");
+        print '</td><td>';
+        if (! empty($conf->accounting->enabled))
+        {
+            $accountingaccount = new AccountingAccount($db);
+            $accountingaccount->fetch('',$object->accountancy_code_asset,1);
+
+            print $accountingaccount->getNomUrl(0,1,1,'',1);
+        } else {
+            print $object->accountancy_code_asset;
+        }
+        print '</td>';
+        print '</tr>';
+
+        print '<tr>';
+        print '<td class="nowrap">';
+        print $langs->trans("AccountancyCodeDepreciationAsset");
+        print '</td><td>';
+        if (! empty($conf->accounting->enabled))
+        {
+            $accountingaccount2 = new AccountingAccount($db);
+            $accountingaccount2->fetch('',$object->accountancy_code_depreciation_asset,1);
+
+            print $accountingaccount2->getNomUrl(0,1,1,'',1);
+        } else {
+            print $object->accountancy_code_depreciation_asset;
+        }
+        print '</td>';
+        print '</tr>';
+
+        print '<tr>';
+        print '<td class="nowrap">';
+        print $langs->trans("AccountancyCodeDepreciationExpense");
+        print '</td><td>';
+        if (! empty($conf->accounting->enabled))
+        {
+            $accountingaccount3 = new AccountingAccount($db);
+            $accountingaccount3->fetch('',$object->accountancy_code_depreciation_expense,1);
+
+            print $accountingaccount3->getNomUrl(0,1,1,'',1);
+        } else {
+            print $object->accountancy_code_depreciation_expense;
+        }
+        print '</td>';
+        print '</tr>';
+
+        print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
+        print nl2br($object->note)."</td></tr>";
+
+        // Other attributes
+        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+        print '</table>';
+        print '</div>';
+
+        dol_fiche_end();
+
+        /*
 		 * Buttons
 		 */
 
-		print '<div class="tabsAction">';
-
-		// Edit
-		if ($user->rights->asset->write)
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
-		}
-
-		// Delete
-		if ($user->rights->asset->write)
-		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
-		}
-
-		print "</div>";
-	}
-
-	/* ************************************************************************** */
-	/*                                                                            */
-	/* Edition mode                                                               */
-	/*                                                                            */
-	/* ************************************************************************** */
-
-	if ($action == 'edit')
-	{
-		$object = new AssetType($db);
-		$object->fetch($rowid);
-		$object->fetch_optionals();
-		if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
-
-		$head = asset_type_prepare_head($object);
-
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		print '<input type="hidden" name="rowid" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="update">';
-
-		dol_fiche_head($head, 'card', $langs->trans("AssetsType"), -1, 'setup');
-
-		print '<table class="border" width="100%">';
-
-		print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->id.'</td></tr>';
-
-		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
-
-		if (! empty($conf->accounting->enabled))
-		{
-			// Accountancy_code_asset
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
-			print '<td>';
-			print $formaccounting->select_account($object->accountancy_code_asset, 'accountancy_code_asset', 1, '', 1, 1);
-			print '</td></tr>';
-
-			// Accountancy_code_depreciation_expense
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
-			print '<td>';
-			print $formaccounting->select_account($object->accountancy_code_depreciation_asset, 'accountancy_code_depreciation_asset', 1, '', 1, 1);
-			print '</td></tr>';
-
-			// Accountancy_code_depreciation_expense
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
-			print '<td>';
-			print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
-			print '</td></tr>';
-		}
-		else // For external software
-		{
-			// Accountancy_code_asset
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
-			print '<td><input name="accountancy_code_asset" class="maxwidth200" value="'.$object->accountancy_code_asset.'">';
-			print '</td></tr>';
-
-			// Accountancy_code_depreciation_asset
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
-			print '<td><input name="accountancy_code_depreciation_asset" class="maxwidth200" value="'.$object->accountancy_code_depreciation_asset.'">';
-			print '</td></tr>';
-
-			// Accountancy_code_depreciation_expense
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
-			print '<td><input name="accountancy_code_depreciation_expense" class="maxwidth200" value="'.$object->accountancy_code_depreciation_expense.'">';
-			print '</td></tr>';
-		}
-
-		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-		print '<textarea name="comment" wrap="soft" class="centpercent" rows="3">'.$object->note.'</textarea></td></tr>';
-
-		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-		if (empty($reshook))
-		{
-			print $object->showOptionals($extrafields,'edit');
-		}
-
-		print '</table>';
-
-		// Extra field
-		if (empty($reshook))
-		{
-			print '<br><br><table class="border" width="100%">';
-			foreach($extrafields->attribute_label as $key=>$label)
-			{
-				if (isset($_POST["options_" . $key])) {
-					if (is_array($_POST["options_" . $key])) {
-						// $_POST["options"] is an array but following code expects a comma separated string
-						$value = implode(",", $_POST["options_" . $key]);
-					} else {
-						$value = $_POST["options_" . $key];
-					}
-				} else {
-					$value = $adht->array_options["options_" . $key];
-				}
-				print '<tr><td width="30%">'.$label.'</td><td>';
-				print $extrafields->showInputField($key,$value);
-				print "</td></tr>\n";
-			}
-			print '</table><br><br>';
-		}
-
-		dol_fiche_end();
-
-		print '<div class="center">';
-		print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
-		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-		print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
-
-		print "</form>";
-	}
+        print '<div class="tabsAction">';
+
+        // Edit
+        if ($user->rights->asset->write)
+        {
+            print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
+        }
+
+        // Delete
+        if ($user->rights->asset->write)
+        {
+            print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
+        }
+
+        print "</div>";
+    }
+
+    /* ************************************************************************** */
+    /*                                                                            */
+    /* Edition mode                                                               */
+    /*                                                                            */
+    /* ************************************************************************** */
+
+    if ($action == 'edit')
+    {
+        $object = new AssetType($db);
+        $object->fetch($rowid);
+        $object->fetch_optionals();
+        if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+
+        $head = asset_type_prepare_head($object);
+
+        print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'">';
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        print '<input type="hidden" name="rowid" value="'.$object->id.'">';
+        print '<input type="hidden" name="action" value="update">';
+
+        dol_fiche_head($head, 'card', $langs->trans("AssetsType"), -1, 'setup');
+
+        print '<table class="border" width="100%">';
+
+        print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->id.'</td></tr>';
+
+        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
+
+        if (! empty($conf->accounting->enabled))
+        {
+            // Accountancy_code_asset
+            print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
+            print '<td>';
+            print $formaccounting->select_account($object->accountancy_code_asset, 'accountancy_code_asset', 1, '', 1, 1);
+            print '</td></tr>';
+
+            // Accountancy_code_depreciation_expense
+            print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
+            print '<td>';
+            print $formaccounting->select_account($object->accountancy_code_depreciation_asset, 'accountancy_code_depreciation_asset', 1, '', 1, 1);
+            print '</td></tr>';
+
+            // Accountancy_code_depreciation_expense
+            print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
+            print '<td>';
+            print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
+            print '</td></tr>';
+        }
+        else // For external software
+        {
+            // Accountancy_code_asset
+            print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
+            print '<td><input name="accountancy_code_asset" class="maxwidth200" value="'.$object->accountancy_code_asset.'">';
+            print '</td></tr>';
+
+            // Accountancy_code_depreciation_asset
+            print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
+            print '<td><input name="accountancy_code_depreciation_asset" class="maxwidth200" value="'.$object->accountancy_code_depreciation_asset.'">';
+            print '</td></tr>';
+
+            // Accountancy_code_depreciation_expense
+            print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
+            print '<td><input name="accountancy_code_depreciation_expense" class="maxwidth200" value="'.$object->accountancy_code_depreciation_expense.'">';
+            print '</td></tr>';
+        }
+
+        print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
+        print '<textarea name="comment" wrap="soft" class="centpercent" rows="3">'.$object->note.'</textarea></td></tr>';
+
+        // Other attributes
+        $parameters=array();
+        $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+        if (empty($reshook))
+        {
+            print $object->showOptionals($extrafields,'edit');
+        }
+
+        print '</table>';
+
+        // Extra field
+        if (empty($reshook))
+        {
+            print '<br><br><table class="border" width="100%">';
+            foreach($extrafields->attribute_label as $key=>$label)
+            {
+                if (isset($_POST["options_" . $key])) {
+                    if (is_array($_POST["options_" . $key])) {
+                        // $_POST["options"] is an array but following code expects a comma separated string
+                        $value = implode(",", $_POST["options_" . $key]);
+                    } else {
+                        $value = $_POST["options_" . $key];
+                    }
+                } else {
+                    $value = $adht->array_options["options_" . $key];
+                }
+                print '<tr><td width="30%">'.$label.'</td><td>';
+                print $extrafields->showInputField($key,$value);
+                print "</td></tr>\n";
+            }
+            print '</table><br><br>';
+        }
+
+        dol_fiche_end();
+
+        print '<div class="center">';
+        print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
+        print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+        print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+        print '</div>';
+
+        print "</form>";
+    }
 }
 
 // End of page

Braces +40 added lines, -29 removed lines

@@ -26,9 +26,15 @@ 
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (! empty($conf->accounting->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+}
+if (! empty($conf->accounting->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
+if (! empty($conf->accounting->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+}
 
 // Load translation files required by the page
 $langs->load("assets");
@@ -67,9 +73,11 @@ 
 // fetch optionals attributes and labels
 $extralabels=$extrafields->fetch_name_optionals_label('asset_type');
 
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','alpha')) {
+    // All tests are required to be compatible with all browsers
 {
 	$type="";
+}
 	$sall="";
 }
 
@@ -103,13 +111,14 @@ 
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-	if ($ret < 0) $error++;
+	if ($ret < 0) {
+	    $error++;
+	}
 
 	if (empty($object->label)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), null, 'errors');
-	}
-	else {
+	} else {
 		$sql = "SELECT label FROM ".MAIN_DB_PREFIX."asset_type WHERE label='".$db->escape($object->label)."'";
 		$result = $db->query($sql);
 		if ($result) {
@@ -129,14 +138,12 @@ 
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		}
-		else
+		} else
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create';
 		}
-	}
-	else
+	} else
 	{
 		$action = 'create';
 	}
@@ -156,15 +163,16 @@ 
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-	if ($ret < 0) $error++;
+	if ($ret < 0) {
+	    $error++;
+	}
 
 	$ret=$object->update($user);
 
 	if ($ret >= 0 && ! count($object->errors))
 	{
 		setEventMessages($langs->trans("AssetsTypeModified"), null, 'mesgs');
-	}
-	else
+	} else
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -183,8 +191,7 @@ 
 		setEventMessages($langs->trans("AssetsTypeDeleted"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("AssetsTypeCanNotBeDeleted"), null, 'errors');
 		$action='';
@@ -221,7 +228,9 @@ 
 		$param = '';
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		if ($optioncss != '') {
+		    print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+		}
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 		print '<input type="hidden" name="action" value="list">';
@@ -298,10 +307,11 @@ 
 			}
 			print '</td>';
 
-			if ($user->rights->asset->write)
-				print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			else
-				print '<td align="right">&nbsp;</td>';
+			if ($user->rights->asset->write) {
+							print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
+			} else {
+							print '<td align="right">&nbsp;</td>';
+			}
 			print "</tr>";
 			$i++;
 		}
@@ -309,8 +319,7 @@ 
 		print '</div>';
 
 		print '</form>';
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -325,7 +334,9 @@ 
 if ($action == 'create')
 {
 	$object = new AssetType($db);
-	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+	if (! empty($conf->accounting->enabled)) {
+	    $formaccounting = new FormAccounting($db);
+	}
 
 	print load_fiche_titre($langs->trans("NewAssetType"));
 
@@ -359,8 +370,7 @@ 
 		print '<td>';
 		print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
 		print '</td></tr>';
-	}
-	else // For external software
+	} else // For external software
 	{
 		// Accountancy_code_asset
 		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
@@ -534,7 +544,9 @@ 
 		$object = new AssetType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
-		if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+		if (! empty($conf->accounting->enabled)) {
+		    $formaccounting = new FormAccounting($db);
+		}
 
 		$head = asset_type_prepare_head($object);
 
@@ -570,8 +582,7 @@ 
 			print '<td>';
 			print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
 			print '</td></tr>';
-		}
-		else // For external software
+		} else // For external software
 		{
 			// Accountancy_code_asset
 			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';

Spacing +97 added lines, -97 removed lines

@@ -24,62 +24,62 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 
 // Load translation files required by the page
 $langs->load("assets");
 
-$rowid  = GETPOST('rowid','int');
-$action = GETPOST('action','alpha');
-$cancel = GETPOST('cancel','alpha');
-$backtopage = GETPOST('backtopage','alpha');
+$rowid  = GETPOST('rowid', 'int');
+$action = GETPOST('action', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
 
-$type = GETPOST('type','alpha');
+$type = GETPOST('type', 'alpha');
 
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
-$offset = $limit * $page ;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) {  $sortorder="DESC"; }
-if (! $sortfield) {  $sortfield="a.label"; }
+if (!$sortorder) {  $sortorder = "DESC"; }
+if (!$sortfield) {  $sortfield = "a.label"; }
 
-$label=GETPOST("label","alpha");
-$accountancy_code_asset=GETPOST('accountancy_code_asset','string');
-$accountancy_code_depreciation_asset=GETPOST('accountancy_code_depreciation_asset','string');
-$accountancy_code_depreciation_expense=GETPOST('accountancy_code_depreciation_expense','string');
-$comment=GETPOST('comment','string');
+$label = GETPOST("label", "alpha");
+$accountancy_code_asset = GETPOST('accountancy_code_asset', 'string');
+$accountancy_code_depreciation_asset = GETPOST('accountancy_code_depreciation_asset', 'string');
+$accountancy_code_depreciation_expense = GETPOST('accountancy_code_depreciation_expense', 'string');
+$comment = GETPOST('comment', 'string');
 
 // Security check
-$result=restrictedArea($user,'asset',$rowid,'asset_type');
+$result = restrictedArea($user, 'asset', $rowid, 'asset_type');
 
 $object = new AssetType($db);
 
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
-$extralabels=$extrafields->fetch_name_optionals_label('asset_type');
+$extralabels = $extrafields->fetch_name_optionals_label('asset_type');
 
-if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-	$type="";
-	$sall="";
+	$type = "";
+	$sall = "";
 }
 
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('assettypecard','globalcard'));
+$hookmanager->initHooks(array('assettypecard', 'globalcard'));
 
 
 /*
@@ -88,9 +88,9 @@ 
 
 if ($cancel) {
 
-	$action='';
+	$action = '';
 
-	if (! empty($backtopage))
+	if (!empty($backtopage))
 	{
 		header("Location: ".$backtopage);
 		exit;
@@ -99,19 +99,19 @@ 
 
 if ($action == 'add' && $user->rights->asset->write)
 {
-	$object->label									= trim($label);
-	$object->accountancy_code_asset					= trim($accountancy_code_asset);
-	$object->accountancy_code_depreciation_asset	= trim($accountancy_code_depreciation_asset);
-	$object->accountancy_code_depreciation_expense	= trim($accountancy_code_depreciation_expense);
-	$object->note									= trim($comment);
+	$object->label = trim($label);
+	$object->accountancy_code_asset = trim($accountancy_code_asset);
+	$object->accountancy_code_depreciation_asset = trim($accountancy_code_depreciation_asset);
+	$object->accountancy_code_depreciation_expense = trim($accountancy_code_depreciation_expense);
+	$object->note = trim($comment);
 
 	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 	if ($ret < 0) $error++;
 
 	if (empty($object->label)) {
 		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentities("Label")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 	}
 	else {
 		$sql = "SELECT label FROM ".MAIN_DB_PREFIX."asset_type WHERE label='".$db->escape($object->label)."'";
@@ -122,13 +122,13 @@ 
 		if ($num) {
 			$error++;
 			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorLabelAlreadyExists",$login), null, 'errors');
+			setEventMessages($langs->trans("ErrorLabelAlreadyExists", $login), null, 'errors');
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$id=$object->create($user);
+		$id = $object->create($user);
 		if ($id > 0)
 		{
 			header("Location: ".$_SERVER["PHP_SELF"]);
@@ -152,19 +152,19 @@ 
 
 	$object->oldcopy = clone $object;
 
-	$object->label									= trim($label);
-	$object->accountancy_code_asset					= trim($accountancy_code_asset);
-	$object->accountancy_code_depreciation_asset	= trim($accountancy_code_depreciation_asset);
-	$object->accountancy_code_depreciation_expense	= trim($accountancy_code_depreciation_expense);
-	$object->note									= trim($comment);
+	$object->label = trim($label);
+	$object->accountancy_code_asset = trim($accountancy_code_asset);
+	$object->accountancy_code_depreciation_asset = trim($accountancy_code_depreciation_asset);
+	$object->accountancy_code_depreciation_expense = trim($accountancy_code_depreciation_expense);
+	$object->note = trim($comment);
 
 	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
+	$ret = $extrafields->setOptionalsFromPost($extralabels, $object);
 	if ($ret < 0) $error++;
 
-	$ret=$object->update($user);
+	$ret = $object->update($user);
 
-	if ($ret >= 0 && ! count($object->errors))
+	if ($ret >= 0 && !count($object->errors))
 	{
 		setEventMessages($langs->trans("AssetsTypeModified"), null, 'mesgs');
 	}
@@ -180,7 +180,7 @@ 
 if ($action == 'confirm_delete' && $user->rights->asset->write)
 {
 	$object->fetch($rowid);
-	$res=$object->delete();
+	$res = $object->delete();
 
 	if ($res > 0)
 	{
@@ -191,7 +191,7 @@ 
 	else
 	{
 		setEventMessages($langs->trans("AssetsTypeCanNotBeDeleted"), null, 'errors');
-		$action='';
+		$action = '';
 	}
 }
 
@@ -200,19 +200,19 @@ 
  * View
  */
 
-$form=new Form($db);
-$helpurl='';
-llxHeader('',$langs->trans("AssetsTypeSetup"),$helpurl);
+$form = new Form($db);
+$helpurl = '';
+llxHeader('', $langs->trans("AssetsTypeSetup"), $helpurl);
 
 
 // List of asset type
-if (! $rowid && $action != 'create' && $action != 'edit')
+if (!$rowid && $action != 'create' && $action != 'edit')
 {
 	//dol_fiche_head('');
 
 	$sql = "SELECT d.rowid, d.label as label, d.accountancy_code_asset, d.accountancy_code_depreciation_asset, d.accountancy_code_depreciation_expense, d.note";
-	$sql.= " FROM ".MAIN_DB_PREFIX."asset_type as d";
-	$sql.= " WHERE d.entity IN (".getEntity('asset_type').")";
+	$sql .= " FROM ".MAIN_DB_PREFIX."asset_type as d";
+	$sql .= " WHERE d.entity IN (".getEntity('asset_type').")";
 
 	$result = $db->query($sql);
 	if ($result)
@@ -238,7 +238,7 @@ 
 		$moreforfilter = '';
 
 		print '<div class="div-table-responsive">';
-		print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+		print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 		print '<tr class="liste_titre">';
 		print '<th>'.$langs->trans("Ref").'</th>';
@@ -267,36 +267,36 @@ 
 			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
 
 			print '<td class="center">';
-			if (! empty($conf->accounting->enabled))
+			if (!empty($conf->accounting->enabled))
 			{
 				$accountingaccount = new AccountingAccount($db);
-				$accountingaccount->fetch('',$objp->accountancy_code_asset,1);
+				$accountingaccount->fetch('', $objp->accountancy_code_asset, 1);
 
-				print $accountingaccount->getNomUrl(0,0,0,'',0);
+				print $accountingaccount->getNomUrl(0, 0, 0, '', 0);
 			} else {
 				print $objp->accountancy_code_asset;
 			}
 			print '</td>';
 
 			print '<td class="center">';
-			if (! empty($conf->accounting->enabled))
+			if (!empty($conf->accounting->enabled))
 			{
 				$accountingaccount2 = new AccountingAccount($db);
-				$accountingaccount2->fetch('',$objp->accountancy_code_depreciation_asset,1);
+				$accountingaccount2->fetch('', $objp->accountancy_code_depreciation_asset, 1);
 
-				print $accountingaccount2->getNomUrl(0,0,0,'',0);
+				print $accountingaccount2->getNomUrl(0, 0, 0, '', 0);
 			} else {
 				print $objp->accountancy_code_depreciation_asset;
 			}
 			print '</td>';
 
 			print '<td class="center">';
-			if (! empty($conf->accounting->enabled))
+			if (!empty($conf->accounting->enabled))
 			{
 				$accountingaccount3 = new AccountingAccount($db);
-				$accountingaccount3->fetch('',$objp->accountancy_code_depreciation_expense,1);
+				$accountingaccount3->fetch('', $objp->accountancy_code_depreciation_expense, 1);
 
-				print $accountingaccount3->getNomUrl(0,0,0,'',0);
+				print $accountingaccount3->getNomUrl(0, 0, 0, '', 0);
 			} else {
 				print $objp->accountancy_code_depreciation_expense;
 			}
@@ -329,7 +329,7 @@ 
 if ($action == 'create')
 {
 	$object = new AssetType($db);
-	if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+	if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 	print load_fiche_titre($langs->trans("NewAssetType"));
 
@@ -344,7 +344,7 @@ 
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40"></td></tr>';
 
-	if (! empty($conf->accounting->enabled))
+	if (!empty($conf->accounting->enabled))
 	{
 		// Accountancy_code_asset
 		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
@@ -386,12 +386,12 @@ 
 	print '<textarea name="comment" wrap="soft" class="centpercent" rows="3"></textarea></td></tr>';
 
 	// Other attributes
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $act, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (empty($reshook))
 	{
-		print $object->showOptionals($extrafields,'edit');
+		print $object->showOptionals($extrafields, 'edit');
 	}
 	print '<tbody>';
 	print "</table>\n";
@@ -425,7 +425,7 @@ 
 		 */
 		if ($action == 'delete')
 		{
-			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id,$langs->trans("DeleteAnAssetType"),$langs->trans("ConfirmDeleteAssetType",$object->label),"confirm_delete", '',0,1);
+			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id, $langs->trans("DeleteAnAssetType"), $langs->trans("ConfirmDeleteAssetType", $object->label), "confirm_delete", '', 0, 1);
 		}
 
 		$head = asset_type_prepare_head($object);
@@ -434,11 +434,11 @@ 
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/asset/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-		$morehtmlref='<div class="refidno">';
+		$morehtmlref = '<div class="refidno">';
 		// Ref asset type
-		$morehtmlref.=$form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', null, null, '', 1);
-		$morehtmlref.='</div>';
+		$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', null, null, '', 1);
+		$morehtmlref .= '</div>';
 
 		dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
@@ -451,12 +451,12 @@ 
 		print '<td class="nowrap">';
 		print $langs->trans("AccountancyCodeAsset");
 		print '</td><td>';
-		if (! empty($conf->accounting->enabled))
+		if (!empty($conf->accounting->enabled))
 		{
 			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch('',$object->accountancy_code_asset,1);
+			$accountingaccount->fetch('', $object->accountancy_code_asset, 1);
 
-			print $accountingaccount->getNomUrl(0,1,1,'',1);
+			print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
 		} else {
 			print $object->accountancy_code_asset;
 		}
@@ -467,12 +467,12 @@ 
 		print '<td class="nowrap">';
 		print $langs->trans("AccountancyCodeDepreciationAsset");
 		print '</td><td>';
-		if (! empty($conf->accounting->enabled))
+		if (!empty($conf->accounting->enabled))
 		{
 			$accountingaccount2 = new AccountingAccount($db);
-			$accountingaccount2->fetch('',$object->accountancy_code_depreciation_asset,1);
+			$accountingaccount2->fetch('', $object->accountancy_code_depreciation_asset, 1);
 
-			print $accountingaccount2->getNomUrl(0,1,1,'',1);
+			print $accountingaccount2->getNomUrl(0, 1, 1, '', 1);
 		} else {
 			print $object->accountancy_code_depreciation_asset;
 		}
@@ -483,12 +483,12 @@ 
 		print '<td class="nowrap">';
 		print $langs->trans("AccountancyCodeDepreciationExpense");
 		print '</td><td>';
-		if (! empty($conf->accounting->enabled))
+		if (!empty($conf->accounting->enabled))
 		{
 			$accountingaccount3 = new AccountingAccount($db);
-			$accountingaccount3->fetch('',$object->accountancy_code_depreciation_expense,1);
+			$accountingaccount3->fetch('', $object->accountancy_code_depreciation_expense, 1);
 
-			print $accountingaccount3->getNomUrl(0,1,1,'',1);
+			print $accountingaccount3->getNomUrl(0, 1, 1, '', 1);
 		} else {
 			print $object->accountancy_code_depreciation_expense;
 		}
@@ -499,7 +499,7 @@ 
 		print nl2br($object->note)."</td></tr>";
 
 		// Other attributes
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
 		print '</div>';
@@ -538,7 +538,7 @@ 
 		$object = new AssetType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
-		if (! empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+		if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
 
 		$head = asset_type_prepare_head($object);
 
@@ -555,7 +555,7 @@ 
 
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
 
-		if (! empty($conf->accounting->enabled))
+		if (!empty($conf->accounting->enabled))
 		{
 			// Accountancy_code_asset
 			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
@@ -597,12 +597,12 @@ 
 		print '<textarea name="comment" wrap="soft" class="centpercent" rows="3">'.$object->note.'</textarea></td></tr>';
 
 		// Other attributes
-		$parameters=array();
-		$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$act,$action);    // Note that $action and $object may have been modified by hook
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $act, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
-			print $object->showOptionals($extrafields,'edit');
+			print $object->showOptionals($extrafields, 'edit');
 		}
 
 		print '</table>';
@@ -611,20 +611,20 @@ 
 		if (empty($reshook))
 		{
 			print '<br><br><table class="border" width="100%">';
-			foreach($extrafields->attribute_label as $key=>$label)
+			foreach ($extrafields->attribute_label as $key=>$label)
 			{
-				if (isset($_POST["options_" . $key])) {
-					if (is_array($_POST["options_" . $key])) {
+				if (isset($_POST["options_".$key])) {
+					if (is_array($_POST["options_".$key])) {
 						// $_POST["options"] is an array but following code expects a comma separated string
-						$value = implode(",", $_POST["options_" . $key]);
+						$value = implode(",", $_POST["options_".$key]);
 					} else {
-						$value = $_POST["options_" . $key];
+						$value = $_POST["options_".$key];
 					}
 				} else {
-					$value = $adht->array_options["options_" . $key];
+					$value = $adht->array_options["options_".$key];
 				}
 				print '<tr><td width="30%">'.$label.'</td><td>';
-				print $extrafields->showInputField($key,$value);
+				print $extrafields->showInputField($key, $value);
 				print "</td></tr>\n";
 			}
 			print '</table><br><br>';

dolibarr/htdocs/asset/admin/assets_type_extrafields.php

Indentation +7 added lines, -7 removed lines

@@ -74,9 +74,9 @@ 
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
-	print "</div>";
+    print '<div class="tabsAction">';
+    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
+    print "</div>";
 }
 
 
@@ -88,8 +88,8 @@ 
 
 if ($action == 'create')
 {
-	print "<br>";
-	print load_fiche_titre($langs->trans('NewAttribute'));
+    print "<br>";
+    print load_fiche_titre($langs->trans('NewAttribute'));
 
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
@@ -101,8 +101,8 @@ 
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-	print "<br>";
-	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+    print "<br>";
+    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
     require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }

Braces +6 added lines, -2 removed lines

@@ -34,13 +34,17 @@
 // List of supported format
 $tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+    $type2label[$key]=$langs->transnoentitiesnoconv($val);
+}
 
 $action=GETPOST('action', 'alpha');
 $attrname=GETPOST('attrname', 'alpha');
 $elementtype='adherent_type'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 /*

Spacing +12 added lines, -12 removed lines

@@ -24,7 +24,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
@@ -35,13 +35,13 @@ 
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='adherent_type'; //Must be the $table_element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'adherent_type'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -58,12 +58,12 @@ 
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("AssetsTypes");
+$textobject = $langs->transnoentitiesnoconv("AssetsTypes");
 
-llxHeader('',$langs->trans("AssetsSetup"));
+llxHeader('', $langs->trans("AssetsSetup"));
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("AssetsSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("AssetsSetup"), $linkback, 'title_setup');
 
 
 $head = asset_admin_prepare_head();
@@ -102,7 +102,7 @@ 
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
 {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));

dolibarr/htdocs/asset/admin/setup.php

Indentation +29 added lines, -29 removed lines

@@ -65,46 +65,46 @@
 
 if ($action == 'edit')
 {
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-	print '<input type="hidden" name="action" value="update">';
+    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+    print '<input type="hidden" name="action" value="update">';
 
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach($arrayofparameters as $key => $val)
-	{
-		print '<tr class="oddeven"><td>';
-		print $form->textwithpicto($langs->trans($key),$langs->trans($key.'Tooltip'));
-		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css'])?'minwidth200':$val['css']).'" value="' . $conf->global->$key . '"></td></tr>';
-	}
+    foreach($arrayofparameters as $key => $val)
+    {
+        print '<tr class="oddeven"><td>';
+        print $form->textwithpicto($langs->trans($key),$langs->trans($key.'Tooltip'));
+        print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css'])?'minwidth200':$val['css']).'" value="' . $conf->global->$key . '"></td></tr>';
+    }
 
-	print '</table>';
+    print '</table>';
 
-	print '<br><div class="center">';
-	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
-	print '</div>';
+    print '<br><div class="center">';
+    print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+    print '</div>';
 
-	print '</form>';
-	print '<br>';
+    print '</form>';
+    print '<br>';
 }
 else
 {
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach($arrayofparameters as $key => $val)
-	{
-		print '<tr class="oddeven"><td>';
-		print $form->textwithpicto($langs->trans($key),$langs->trans($key.'Tooltip'));
-		print '</td><td>' . $conf->global->$key . '</td></tr>';
-	}
+    foreach($arrayofparameters as $key => $val)
+    {
+        print '<tr class="oddeven"><td>';
+        print $form->textwithpicto($langs->trans($key),$langs->trans($key.'Tooltip'));
+        print '</td><td>' . $conf->global->$key . '</td></tr>';
+    }
 
-	print '</table>';
+    print '</table>';
 
-	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
-	print '</div>';
+    print '<div class="tabsAction">';
+    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+    print '</div>';
 }
 
 dol_fiche_end();

Braces +4 added lines, -3 removed lines

@@ -32,7 +32,9 @@ 
 $langs->loadLangs(array("admin", "assets"));
 
 // Access control
-if (! $user->admin) accessforbidden();
+if (! $user->admin) {
+    accessforbidden();
+}
 
 // Parameters
 $action = GETPOST('action', 'alpha');
@@ -87,8 +89,7 @@ 
 
 	print '</form>';
 	print '<br>';
-}
-else
+} else
 {
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';

Spacing +13 added lines, -13 removed lines

@@ -25,9 +25,9 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
-require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 
 global $langs, $user;
 
@@ -35,13 +35,13 @@ 
 $langs->loadLangs(array("admin", "assets"));
 
 // Access control
-if (! $user->admin) accessforbidden();
+if (!$user->admin) accessforbidden();
 
 // Parameters
 $action = GETPOST('action', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$arrayofparameters=array('FIXEDASSETS_MYPARAM1'=>array('css'=>'minwidth200'), 'FIXEDASSETS_MYPARAM2'=>array('css'=>'minwidth500'));
+$arrayofparameters = array('FIXEDASSETS_MYPARAM1'=>array('css'=>'minwidth200'), 'FIXEDASSETS_MYPARAM2'=>array('css'=>'minwidth500'));
 
 
 /*
@@ -55,10 +55,10 @@ 
  * View
  */
 
-llxHeader('',$langs->trans("AssetsSetup"));
+llxHeader('', $langs->trans("AssetsSetup"));
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("AssetsSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("AssetsSetup"), $linkback, 'title_setup');
 
 
 $head = asset_admin_prepare_head();
@@ -75,11 +75,11 @@ 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach($arrayofparameters as $key => $val)
+	foreach ($arrayofparameters as $key => $val)
 	{
 		print '<tr class="oddeven"><td>';
-		print $form->textwithpicto($langs->trans($key),$langs->trans($key.'Tooltip'));
-		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css'])?'minwidth200':$val['css']).'" value="' . $conf->global->$key . '"></td></tr>';
+		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
 	}
 
 	print '</table>';
@@ -96,11 +96,11 @@ 
 	print '<table class="noborder" width="100%">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach($arrayofparameters as $key => $val)
+	foreach ($arrayofparameters as $key => $val)
 	{
 		print '<tr class="oddeven"><td>';
-		print $form->textwithpicto($langs->trans($key),$langs->trans($key.'Tooltip'));
-		print '</td><td>' . $conf->global->$key . '</td></tr>';
+		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
+		print '</td><td>'.$conf->global->$key.'</td></tr>';
 	}
 
 	print '</table>';

dolibarr/htdocs/asset/admin/assets_extrafields.php

Braces +6 added lines, -2 removed lines

@@ -35,13 +35,17 @@
 // List of supported format
 $tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+    $type2label[$key]=$langs->transnoentitiesnoconv($val);
+}
 
 $action=GETPOST('action', 'alpha');
 $attrname=GETPOST('attrname', 'alpha');
 $elementtype='don'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 /*

Spacing +13 added lines, -13 removed lines

@@ -25,24 +25,24 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("assets","admin","companies"));
+$langs->loadLangs(array("assets", "admin", "companies"));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
 
 // List of supported format
-$tmptype2label=ExtraFields::$type2label;
-$type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+$tmptype2label = ExtraFields::$type2label;
+$type2label = array('');
+foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
 
-$action=GETPOST('action', 'alpha');
-$attrname=GETPOST('attrname', 'alpha');
-$elementtype='don'; //Must be the $table_element of the class that manage extrafield
+$action = GETPOST('action', 'alpha');
+$attrname = GETPOST('attrname', 'alpha');
+$elementtype = 'don'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) accessforbidden();
 
@@ -59,12 +59,12 @@ 
  * View
  */
 
-$textobject=$langs->transnoentitiesnoconv("Assets");
+$textobject = $langs->transnoentitiesnoconv("Assets");
 
-llxHeader('',$langs->trans("AssetsSetup"));
+llxHeader('', $langs->trans("AssetsSetup"));
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("AssetsSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("AssetsSetup"), $linkback, 'title_setup');
 
 
 $head = asset_admin_prepare_head();
@@ -104,7 +104,7 @@ 
 /* Edit optional field                                                        */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && ! empty($attrname))
+if ($action == 'edit' && !empty($attrname))
 {
     print "<br>";
     print load_fiche_titre($langs->trans("FieldEdition", $attrname));

dolibarr/htdocs/asset/note.php

Indentation +16 added lines, -16 removed lines

@@ -76,18 +76,18 @@ 
 
 if ($id > 0 || ! empty($ref))
 {
-	$object->fetch_thirdparty();
+    $object->fetch_thirdparty();
 
-	$head = asset_prepare_head($object);
+    $head = asset_prepare_head($object);
 
-	dol_fiche_head($head, 'note', $langs->trans("Asset"), -1, 'generic');
+    dol_fiche_head($head, 'note', $langs->trans("Asset"), -1, 'generic');
 
-	// Object card
-	// ------------------------------------------------------------
-	$linkback = '<a href="' .dol_buildpath('/asset/list.php',1) . '?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+    // Object card
+    // ------------------------------------------------------------
+    $linkback = '<a href="' .dol_buildpath('/asset/list.php',1) . '?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref='<div class="refidno">';
-	/*
+    $morehtmlref='<div class="refidno">';
+    /*
 	// Ref customer
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
 	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
@@ -126,22 +126,22 @@ 
 	        }
 	    }
 	}*/
-	$morehtmlref.='</div>';
+    $morehtmlref.='</div>';
 
 
-	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
+    print '<div class="fichecenter">';
+    print '<div class="underbanner clearboth"></div>';
 
 
-	$cssclass="titlefield";
-	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+    $cssclass="titlefield";
+    include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
-	print '</div>';
+    print '</div>';
 
-	dol_fiche_end();
+    dol_fiche_end();
 }
 
 // End of page

Braces +3 added lines, -1 removed lines

@@ -51,7 +51,9 @@
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || ! empty($ref)) $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id;
+if ($id > 0 || ! empty($ref)) {
+    $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id;
+}
 
 $permissionnote=1;
 //$permissionnote=$user->rights->asset->creer;	// Used by the include of actions_setnotes.inc.php

Spacing +18 added lines, -18 removed lines

@@ -25,26 +25,26 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("asset","companies"));
+$langs->loadLangs(array("asset", "companies"));
 
 // Get parameters
-$id			= GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
 $ref        = GETPOST('ref', 'alpha');
-$action		= GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 // Initialize technical objects
-$object=new Asset($db);
+$object = new Asset($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction=$conf->asset->dir_output . '/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('assetnote'));     // Note that conf->hooks_modules contains array
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetnote')); // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('asset');
 
@@ -54,10 +54,10 @@ 
 //$result = restrictedArea($user, 'asset', $id);
 
 // Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || ! empty($ref)) $upload_dir = $conf->asset->multidir_output[$object->entity] . "/" . $object->id;
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id;
 
-$permissionnote=1;
+$permissionnote = 1;
 //$permissionnote=$user->rights->asset->creer;	// Used by the include of actions_setnotes.inc.php
 
 
@@ -65,7 +65,7 @@ 
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php';	// Must be include, not include_once
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
 
 /*
@@ -75,10 +75,10 @@ 
 $form = new Form($db);
 
 //$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
-$help_url='';
-llxHeader('',$langs->trans('Assets'),$help_url);
+$help_url = '';
+llxHeader('', $langs->trans('Assets'), $help_url);
 
-if ($id > 0 || ! empty($ref))
+if ($id > 0 || !empty($ref))
 {
 	$object->fetch_thirdparty();
 
@@ -88,9 +88,9 @@ 
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' .dol_buildpath('/asset/list.php',1) . '?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.dol_buildpath('/asset/list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref='<div class="refidno">';
+	$morehtmlref = '<div class="refidno">';
 	/*
 	// Ref customer
 	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
@@ -130,7 +130,7 @@ 
 	        }
 	    }
 	}*/
-	$morehtmlref.='</div>';
+	$morehtmlref .= '</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -140,7 +140,7 @@ 
 	print '<div class="underbanner clearboth"></div>';
 
 
-	$cssclass="titlefield";
+	$cssclass = "titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
 	print '</div>';

dolibarr/htdocs/asset/list.php

Indentation +163 added lines, -163 removed lines

@@ -72,8 +72,8 @@ 
 $socid=0;
 if ($user->societe_id > 0)
 {
-	//$socid = $user->societe_id;
-	accessforbidden();
+    //$socid = $user->societe_id;
+    accessforbidden();
 }
 //$result = restrictedArea($user, 'asset', $id,'');
 
@@ -82,30 +82,30 @@ 
 $search=array();
 foreach($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+    if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach($object->fields as $key => $val)
 {
-	if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
+    if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
 }
 
 // Definition of fields for list
 $arrayfields=array();
 foreach($object->fields as $key => $val)
 {
-	// If $val['visible']==0, then we never show the field
-	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+    // If $val['visible']==0, then we never show the field
+    if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
-	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
-	}
+    foreach($extrafields->attribute_label as $key => $val)
+    {
+        if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+    }
 }
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -127,32 +127,32 @@ 
 
 if (empty($reshook))
 {
-	// Selection of new fields
-	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-	// Purge search criteria
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
-	{
-		foreach($object->fields as $key => $val)
-		{
-			$search[$key]='';
-		}
-		$toselect='';
-		$search_array_options=array();
-	}
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-		|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
-	{
-		$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
-	}
-
-	// Mass actions
-	$objectclass='Asset';
-	$objectlabel='Asset';
-	$permtoread = $user->rights->asset->read;
-	$permtodelete = $user->rights->asset->delete;
-	$uploaddir = $conf->asset->dir_output;
-	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+    {
+        foreach($object->fields as $key => $val)
+        {
+            $search[$key]='';
+        }
+        $toselect='';
+        $search_array_options=array();
+    }
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
+        || GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+    {
+        $massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+    }
+
+    // Mass actions
+    $objectclass='Asset';
+    $objectlabel='Asset';
+    $permtoread = $user->rights->asset->read;
+    $permtodelete = $user->rights->asset->delete;
+    $uploaddir = $conf->asset->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -177,7 +177,7 @@ 
 $sql = 'SELECT ';
 foreach($object->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+    $sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
 foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
@@ -192,8 +192,8 @@ 
 else $sql.=" WHERE 1 = 1";
 foreach($search as $key => $val)
 {
-	$mode_search=(($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key]))?1:0);
-	if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
+    $mode_search=(($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key]))?1:0);
+    if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
 }
 if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
@@ -223,13 +223,13 @@ 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
-		$page = 0;
-		$offset = 0;
-	}
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+        $page = 0;
+        $offset = 0;
+    }
 }
 
 $sql.= $db->plimit($limit+1, $offset);
@@ -237,8 +237,8 @@ 
 $resql=$db->query($sql);
 if (! $resql)
 {
-	dol_print_error($db);
-	exit;
+    dol_print_error($db);
+    exit;
 }
 
 $num = $db->num_rows($resql);
@@ -246,10 +246,10 @@ 
 // Direct jump if only one record found
 if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
-	$obj = $db->fetch_object($resql);
-	$id = $obj->rowid;
-	header("Location: ".DOL_URL_ROOT.'/assets/card.php?id='.$id);
-	exit;
+    $obj = $db->fetch_object($resql);
+    $id = $obj->rowid;
+    header("Location: ".DOL_URL_ROOT.'/assets/card.php?id='.$id);
+    exit;
 }
 
 
@@ -280,7 +280,7 @@ 
 if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
 foreach($search as $key => $val)
 {
-	$param.= '&search_'.$key.'='.urlencode($search[$key]);
+    $param.= '&search_'.$key.'='.urlencode($search[$key]);
 }
 if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
@@ -288,8 +288,8 @@ 
 
 // List of mass actions available
 $arrayofmassactions =  array(
-	//'presend'=>$langs->trans("SendByMail"),
-	//'builddoc'=>$langs->trans("PDFMerge"),
+    //'presend'=>$langs->trans("SendByMail"),
+    //'builddoc'=>$langs->trans("PDFMerge"),
 );
 if ($user->rights->asset->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
 if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
@@ -316,8 +316,8 @@ 
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+    foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+    print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
@@ -332,9 +332,9 @@ 
 
 if (! empty($moreforfilter))
 {
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-	print '</div>';
+    print '<div class="liste_titre liste_titre_bydiv centpercent">';
+    print $moreforfilter;
+    print '</div>';
 }
 
 $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
@@ -350,11 +350,11 @@ 
 print '<tr class="liste_titre">';
 foreach($object->fields as $key => $val)
 {
-	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-	if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+    $align='';
+    if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
+    if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
+    if ($key == 'status') $align.=($align?' ':'').'center';
+    if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -376,11 +376,11 @@ 
 print '<tr class="liste_titre">';
 foreach($object->fields as $key => $val)
 {
-	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-	if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+    $align='';
+    if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
+    if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
+    if ($key == 'status') $align.=($align?' ':'').'center';
+    if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -396,7 +396,7 @@ 
 $needToFetchEachLine=0;
 foreach ($extrafields->attribute_computed as $key => $val)
 {
-	if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+    if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
 }
 
 
@@ -406,89 +406,89 @@ 
 $totalarray=array();
 while ($i < min($num, $limit))
 {
-	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break;		// Should not happen
-
-	// Store properties in $object
-	$object->id = $obj->rowid;
-	foreach($object->fields as $key => $val)
-	{
-		if (isset($obj->$key)) $object->$key = $obj->$key;
-	}
-
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach($object->fields as $key => $val)
-	{
-		$align='';
-		if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-		if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-		if ($key == 'status') $align.=($align?' ':'').'center';
-		if (! empty($arrayfields['t.'.$key]['checked']))
-		{
-			print '<td';
-			if ($align) print ' class="'.$align.'"';
-			print '>';
-			print $object->showOutputField($val, $key, $obj->$key, '');
-			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! empty($val['isameasure']))
-			{
-				if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
-				$totalarray['val']['t.'.$key] += $obj->$key;
-			}
-		}
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object);    // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
-	}
-	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
-
-	print '</tr>';
-
-	$i++;
+    $obj = $db->fetch_object($resql);
+    if (empty($obj)) break;		// Should not happen
+
+    // Store properties in $object
+    $object->id = $obj->rowid;
+    foreach($object->fields as $key => $val)
+    {
+        if (isset($obj->$key)) $object->$key = $obj->$key;
+    }
+
+    // Show here line of result
+    print '<tr class="oddeven">';
+    foreach($object->fields as $key => $val)
+    {
+        $align='';
+        if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
+        if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
+        if ($key == 'status') $align.=($align?' ':'').'center';
+        if (! empty($arrayfields['t.'.$key]['checked']))
+        {
+            print '<td';
+            if ($align) print ' class="'.$align.'"';
+            print '>';
+            print $object->showOutputField($val, $key, $obj->$key, '');
+            print '</td>';
+            if (! $i) $totalarray['nbfield']++;
+            if (! empty($val['isameasure']))
+            {
+                if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+                $totalarray['val']['t.'.$key] += $obj->$key;
+            }
+        }
+    }
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+    // Fields from hook
+    $parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+    $reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Action column
+    print '<td class="nowrap" align="center">';
+    if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+    {
+        $selected=0;
+        if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+        print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+    }
+    print '</td>';
+    if (! $i) $totalarray['nbfield']++;
+
+    print '</tr>';
+
+    $i++;
 }
 
 // Show total line
 if (isset($totalarray['pos']))
 {
-	print '<tr class="liste_total">';
-	$i=0;
-	while ($i < $totalarray['nbfield'])
-	{
-		$i++;
-		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-		else
-		{
-			if ($i == 1)
-			{
-				if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-				else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
-			}
-			else print '<td></td>';
-		}
-	}
-	print '</tr>';
+    print '<tr class="liste_total">';
+    $i=0;
+    while ($i < $totalarray['nbfield'])
+    {
+        $i++;
+        if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+        else
+        {
+            if ($i == 1)
+            {
+                if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
+                else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+            }
+            else print '<td></td>';
+        }
+    }
+    print '</tr>';
 }
 
 // If no record found
 if ($num == 0)
 {
-	$colspan=1;
-	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+    $colspan=1;
+    foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 
@@ -505,25 +505,25 @@ 
 
 if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
-	{
-		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-		$formfile = new FormFile($db);
-
-		// Show list of available documents
-		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-		$urlsource.=str_replace('&amp;','&',$param);
-
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->asset->read;
-		$delallowed=$user->rights->asset->create;
-
-		print $formfile->showdocuments('massfilesarea_asset','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
-	{
-		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
-	}
+    if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
+    {
+        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+        $formfile = new FormFile($db);
+
+        // Show list of available documents
+        $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+        $urlsource.=str_replace('&amp;','&',$param);
+
+        $filedir=$diroutputmassaction;
+        $genallowed=$user->rights->asset->read;
+        $delallowed=$user->rights->asset->create;
+
+        print $formfile->showdocuments('massfilesarea_asset','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+    }
+    else
+    {
+        print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
+    }
 }
 
 // End of page

Braces +153 added lines, -57 removed lines

@@ -65,8 +65,13 @@ 
 $search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (! $sortfield) $sortfield="t.".key($object->fields);   // Set here default search field. By default 1st field in definition.
-if (! $sortorder) $sortorder="ASC";
+if (! $sortfield) {
+    $sortfield="t.".key($object->fields);
+}
+// Set here default search field. By default 1st field in definition.
+if (! $sortorder) {
+    $sortorder="ASC";
+}
 
 // Protection if external user
 $socid=0;
@@ -82,29 +87,37 @@ 
 $search=array();
 foreach($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
-}
+	if (GETPOST('search_'.$key,'alpha')) {
+	    $search[$key]=GETPOST('search_'.$key,'alpha');
+	}
+	}
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach($object->fields as $key => $val)
 {
-	if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
-}
+	if ($val['searchall']) {
+	    $fieldstosearchall['t.'.$key]=$val['label'];
+	}
+	}
 
 // Definition of fields for list
 $arrayfields=array();
 foreach($object->fields as $key => $val)
 {
 	// If $val['visible']==0, then we never show the field
-	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
-}
+	if (! empty($val['visible'])) {
+	    $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	}
+	}
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
 	foreach($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (! empty($extrafields->attribute_list[$key])) {
+		    $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		}
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
@@ -123,7 +136,9 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -131,11 +146,13 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) {
+	    // All tests are required to be compatible with all browsers
 	{
 		foreach($object->fields as $key => $val)
 		{
 			$search[$key]='';
+	}
 		}
 		$toselect='';
 		$search_array_options=array();
@@ -180,22 +197,33 @@ 
 	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) {
+    $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+}
 // Add fields from hooks
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/, $/','', $sql);
 $sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."assets_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity('assets').")";
-else $sql.=" WHERE 1 = 1";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
+    $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."assets_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+if ($object->ismultientitymanaged == 1) {
+    $sql.= " WHERE t.entity IN (".getEntity('assets').")";
+} else {
+    $sql.=" WHERE 1 = 1";
+}
 foreach($search as $key => $val)
 {
 	$mode_search=(($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key]))?1:0);
-	if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
+	if ($search[$key] != '') {
+	    $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
+	}
+	}
+if ($search_all) {
+    $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -225,9 +253,11 @@ 
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+	    // if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -276,13 +306,19 @@ 
 $arrayofselected=is_array($toselect)?$toselect:array();
 
 $param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+    $param.='&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+    $param.='&limit='.urlencode($limit);
+}
 foreach($search as $key => $val)
 {
 	$param.= '&search_'.$key.'='.urlencode($search[$key]);
 }
-if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
+if ($optioncss != '') {
+    $param.='&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -291,12 +327,18 @@ 
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->asset->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+if ($user->rights->asset->delete) {
+    $arrayofmassactions['predelete']=$langs->trans("Delete");
+}
+if (in_array($massaction, array('presend','predelete'))) {
+    $arrayofmassactions=array();
+}
 $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+    print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -316,7 +358,9 @@ 
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+	foreach($fieldstosearchall as $key => $val) {
+	    $fieldstosearchall[$key]=$langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
 }
 
@@ -327,8 +371,11 @@ 
 
 $parameters=array();
 $reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object);    // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+    $moreforfilter .= $hookmanager->resPrint;
+} else {
+    $moreforfilter = $hookmanager->resPrint;
+}
 
 if (! empty($moreforfilter))
 {
@@ -351,11 +398,19 @@ 
 foreach($object->fields as $key => $val)
 {
 	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-	if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
-}
+	if (in_array($val['type'], array('date','datetime','timestamp'))) {
+	    $align.=($align?' ':'').'center';
+	}
+	if (in_array($val['type'], array('timestamp'))) {
+	    $align.=($align?' ':'').'nowrap';
+	}
+	if ($key == 'status') {
+	    $align.=($align?' ':'').'center';
+	}
+	if (! empty($arrayfields['t.'.$key]['checked'])) {
+	    print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	}
+	}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
@@ -377,11 +432,19 @@ 
 foreach($object->fields as $key => $val)
 {
 	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-	if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
-}
+	if (in_array($val['type'], array('date','datetime','timestamp'))) {
+	    $align.=($align?' ':'').'center';
+	}
+	if (in_array($val['type'], array('timestamp'))) {
+	    $align.=($align?' ':'').'nowrap';
+	}
+	if ($key == 'status') {
+	    $align.=($align?' ':'').'center';
+	}
+	if (! empty($arrayfields['t.'.$key]['checked'])) {
+	    print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+	}
+	}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
@@ -396,7 +459,10 @@ 
 $needToFetchEachLine=0;
 foreach ($extrafields->attribute_computed as $key => $val)
 {
-	if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+	if (preg_match('/\$object/',$val)) {
+	    $needToFetchEachLine++;
+	}
+	// There is at least one compute field that use $object
 }
 
 
@@ -407,13 +473,18 @@ 
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break;		// Should not happen
+	if (empty($obj)) {
+	    break;
+	}
+	// Should not happen
 
 	// Store properties in $object
 	$object->id = $obj->rowid;
 	foreach($object->fields as $key => $val)
 	{
-		if (isset($obj->$key)) $object->$key = $obj->$key;
+		if (isset($obj->$key)) {
+		    $object->$key = $obj->$key;
+		}
 	}
 
 	// Show here line of result
@@ -421,20 +492,32 @@ 
 	foreach($object->fields as $key => $val)
 	{
 		$align='';
-		if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-		if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-		if ($key == 'status') $align.=($align?' ':'').'center';
+		if (in_array($val['type'], array('date','datetime','timestamp'))) {
+		    $align.=($align?' ':'').'center';
+		}
+		if (in_array($val['type'], array('timestamp'))) {
+		    $align.=($align?' ':'').'nowrap';
+		}
+		if ($key == 'status') {
+		    $align.=($align?' ':'').'center';
+		}
 		if (! empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td';
-			if ($align) print ' class="'.$align.'"';
+			if ($align) {
+			    print ' class="'.$align.'"';
+			}
 			print '>';
 			print $object->showOutputField($val, $key, $obj->$key, '');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
+			if (! $i) {
+			    $totalarray['nbfield']++;
+			}
 			if (! empty($val['isameasure']))
 			{
-				if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+				if (! $i) {
+				    $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+				}
 				$totalarray['val']['t.'.$key] += $obj->$key;
 			}
 		}
@@ -447,14 +530,20 @@ 
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	if ($massactionbutton || $massaction) {
+	    // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
 		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
+	}
+		if (in_array($obj->rowid, $arrayofselected)) {
+		    $selected=1;
+		}
 		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
 	}
 	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
+	if (! $i) {
+	    $totalarray['nbfield']++;
+	}
 
 	print '</tr>';
 
@@ -469,15 +558,20 @@ 
 	while ($i < $totalarray['nbfield'])
 	{
 		$i++;
-		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-		else
+		if (! empty($totalarray['pos'][$i])) {
+		    print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+		} else
 		{
 			if ($i == 1)
 			{
-				if ($num < $limit) print '<td align="left">'.$langs->trans("Total").'</td>';
-				else print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+				if ($num < $limit) {
+				    print '<td align="left">'.$langs->trans("Total").'</td>';
+				} else {
+				    print '<td align="left">'.$langs->trans("Totalforthispage").'</td>';
+				}
+			} else {
+			    print '<td></td>';
 			}
-			else print '<td></td>';
 		}
 	}
 	print '</tr>';
@@ -487,7 +581,10 @@ 
 if ($num == 0)
 {
 	$colspan=1;
-	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) {
+	    $colspan++;
+	}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
@@ -519,8 +616,7 @@ 
 		$delallowed=$user->rights->asset->create;
 
 		print $formfile->showdocuments('massfilesarea_asset','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
-	}
-	else
+	} else
 	{
 		print '<br><a name="show_files"></a><a href="'.$_SERVER["PHP_SELF"].'?show_files=1'.$param.'#show_files">'.$langs->trans("ShowTempMassFilesArea").'</a>';
 	}

Spacing +150 added lines, -150 removed lines

@@ -27,7 +27,7 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -37,43 +37,43 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array("assets"));
 
-$action     = GETPOST('action','alpha')?GETPOST('action','alpha'):'view';				// The action 'add', 'create', 'edit', 'update', 'view', ...
-$massaction = GETPOST('massaction','alpha');											// The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files','int');												// Show files area generated by bulk actions ?
-$confirm    = GETPOST('confirm','alpha');												// Result of a confirmation
-$cancel     = GETPOST('cancel', 'alpha');												// We click on a Cancel button
-$toselect   = GETPOST('toselect', 'array');												// Array of ids of elements selected into a list
-$contextpage= GETPOST('contextpage','aZ')?GETPOST('contextpage','aZ'):'assetslist';   // To manage different context of search
-$backtopage = GETPOST('backtopage','alpha');											// Go back to a dedicated page
-$optioncss  = GETPOST('optioncss','aZ');												// Option for the css output (always '' except when 'print')
+$action     = GETPOST('action', 'alpha') ?GETPOST('action', 'alpha') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'assetslist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-$id			= GETPOST('id','int');
+$id = GETPOST('id', 'int');
 
 // Load variable for pagination
-$limit = GETPOST('limit','int')?GETPOST('limit','int'):$conf->liste_limit;
-$sortfield = GETPOST('sortfield','alpha');
-$sortorder = GETPOST('sortorder','alpha');
-$page = GETPOST('page','int');
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOST('page', 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Initialize technical objects
-$object=new Asset($db);
+$object = new Asset($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction=$conf->asset->dir_output . '/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('assetlist'));     // Note that conf->hooks_modules contains array
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetlist')); // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
 $extralabels = $extrafields->fetch_name_optionals_label('asset');
-$search_array_options=$extrafields->getOptionalsFromPost($object->table_element,'','search_');
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (! $sortfield) $sortfield="t.".key($object->fields);   // Set here default search field. By default 1st field in definition.
-if (! $sortorder) $sortorder="ASC";
+if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+if (!$sortorder) $sortorder = "ASC";
 
 // Protection if external user
-$socid=0;
+$socid = 0;
 if ($user->societe_id > 0)
 {
 	//$socid = $user->societe_id;
@@ -82,33 +82,33 @@ 
 //$result = restrictedArea($user, 'asset', $id,'');
 
 // Initialize array of search criterias
-$search_all=trim(GETPOST("search_all",'alpha'));
-$search=array();
-foreach($object->fields as $key => $val)
+$search_all = trim(GETPOST("search_all", 'alpha'));
+$search = array();
+foreach ($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key,'alpha')) $search[$key]=GETPOST('search_'.$key,'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
-	if ($val['searchall']) $fieldstosearchall['t.'.$key]=$val['label'];
+	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
 }
 
 // Definition of fields for list
-$arrayfields=array();
-foreach($object->fields as $key => $val)
+$arrayfields = array();
+foreach ($object->fields as $key => $val)
 {
 	// If $val['visible']==0, then we never show the field
-	if (! empty($val['visible'])) $arrayfields['t.'.$key]=array('label'=>$val['label'], 'checked'=>(($val['visible']<0)?0:1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
 }
 // Extra fields
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label))
 {
-	foreach($extrafields->attribute_label as $key => $val)
+	foreach ($extrafields->attribute_label as $key => $val)
 	{
-		if (! empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key]=array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key]<0)?0:1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key])!=3 && $extrafields->attribute_perms[$key]));
+		if (!empty($extrafields->attribute_list[$key])) $arrayfields["ef.".$key] = array('label'=>$extrafields->attribute_label[$key], 'checked'=>(($extrafields->attribute_list[$key] < 0) ? 0 : 1), 'position'=>$extrafields->attribute_pos[$key], 'enabled'=>(abs($extrafields->attribute_list[$key]) != 3 && $extrafields->attribute_perms[$key]));
 	}
 }
 $object->fields = dol_sort_array($object->fields, 'position');
@@ -122,11 +122,11 @@ 
  * Put here all code to do according to value of "$action" parameter
  */
 
-if (GETPOST('cancel','alpha')) { $action='list'; $massaction=''; }
-if (! GETPOST('confirmmassaction','alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook))
@@ -135,24 +135,24 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') ||GETPOST('button_removefilter','alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 	{
-		foreach($object->fields as $key => $val)
+		foreach ($object->fields as $key => $val)
 		{
-			$search[$key]='';
+			$search[$key] = '';
 		}
-		$toselect='';
-		$search_array_options=array();
+		$toselect = '';
+		$search_array_options = array();
 	}
-	if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')
-		|| GETPOST('button_search_x','alpha') || GETPOST('button_search.x','alpha') || GETPOST('button_search','alpha'))
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
 	{
-		$massaction='';     // Protection to avoid mass action if we force a new search during a mass action confirmation
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
 	// Mass actions
-	$objectclass='Asset';
-	$objectlabel='Asset';
+	$objectclass = 'Asset';
+	$objectlabel = 'Asset';
 	$permtoread = $user->rights->asset->read;
 	$permtodelete = $user->rights->asset->delete;
 	$uploaddir = $conf->asset->dir_output;
@@ -167,45 +167,45 @@ 
  * Put here all code to render page
  */
 
-$form=new Form($db);
+$form = new Form($db);
 
-$now=dol_now();
+$now = dol_now();
 
 //$help_url="EN:Module_Asset|FR:Module_Asset_FR|ES:Módulo_Asset";
-$help_url='';
+$help_url = '';
 $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Assets"));
 
 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
-	$sql.='t.'.$key.', ';
+	$sql .= 't.'.$key.', ';
 }
 // Add fields from extrafields
-foreach ($extrafields->attribute_label as $key => $val) $sql.=($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+foreach ($extrafields->attribute_label as $key => $val) $sql .= ($extrafields->attribute_type[$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
 // Add fields from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters, $object);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/, $/','', $sql);
-$sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."assets_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity('assets').")";
-else $sql.=" WHERE 1 = 1";
-foreach($search as $key => $val)
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/, $/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."assets_extrafields as ef on (t.rowid = ef.fk_object)";
+if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity('assets').")";
+else $sql .= " WHERE 1 = 1";
+foreach ($search as $key => $val)
 {
-	$mode_search=(($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key]))?1:0);
-	if ($search[$key] != '') $sql.=natural_search($key, $search[$key], (($key == 'status')?2:$mode_search));
+	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 }
-if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
+if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters, $object);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 
 /* If a group by is required
 $sql.= " GROUP BY "
@@ -221,7 +221,7 @@ 
 $sql.=$hookmanager->resPrint;
 */
 
-$sql.=$db->order($sortfield,$sortorder);
+$sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -236,10 +236,10 @@ 
 	}
 }
 
-$sql.= $db->plimit($limit+1, $offset);
+$sql .= $db->plimit($limit + 1, $offset);
 
-$resql=$db->query($sql);
-if (! $resql)
+$resql = $db->query($sql);
+if (!$resql)
 {
 	dol_print_error($db);
 	exit;
@@ -248,7 +248,7 @@ 
 $num = $db->num_rows($resql);
 
 // Direct jump if only one record found
-if ($num == 1 && ! empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
 {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
@@ -277,27 +277,27 @@ 
 });
 </script>';
 
-$arrayofselected=is_array($toselect)?$toselect:array();
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
-$param='';
-if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
-foreach($search as $key => $val)
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+foreach ($search as $key => $val)
 {
-	$param.= '&search_'.$key.'='.urlencode($search[$key]);
+	$param .= '&search_'.$key.'='.urlencode($search[$key]);
 }
-if ($optioncss != '')     $param.='&optioncss='.urlencode($optioncss);
+if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
-$arrayofmassactions =  array(
+$arrayofmassactions = array(
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->asset->delete) $arrayofmassactions['predelete']=$langs->trans("Delete");
-if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-$massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+if ($user->rights->asset->delete) $arrayofmassactions['predelete'] = $langs->trans("Delete");
+if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -312,16 +312,16 @@ 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_companies', 0, '', '', $limit);
 
 // Add code for pre mass action (confirmation or email presend form)
-$topicmail="SendAssetsRef";
-$modelmail="asset";
-$objecttmp=new Asset($db);
-$trackid='xxxx'.$object->id;
+$topicmail = "SendAssetsRef";
+$modelmail = "asset";
+$objecttmp = new Asset($db);
+$trackid = 'xxxx'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall)
 {
-	foreach($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ',$fieldstosearchall).'</div>';
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
@@ -329,47 +329,47 @@ 
 $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
 $moreforfilter.= '</div>';*/
 
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
 else $moreforfilter = $hookmanager->resPrint;
 
-if (! empty($moreforfilter))
+if (!empty($moreforfilter))
 {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
 }
 
-$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
-$selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
-$selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
-print '<div class="div-table-responsive">';		// You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
-	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-	if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align?' '.$align:'').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
+	$align = '';
+	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';
+	if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';
+	if ($key == 'status') $align .= ($align ? ' ' : '').'center';
+	if (!empty($arrayfields['t.'.$key]['checked'])) print '<td class="liste_titre'.($align ? ' '.$align : '').'"><input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'"></td>';
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
-$parameters=array('arrayfields'=>$arrayfields);
-$reshook=$hookmanager->executeHooks('printFieldListOption', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
 print '<td class="liste_titre" align="right">';
-$searchpicto=$form->showFilterButtons();
+$searchpicto = $form->showFilterButtons();
 print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
@@ -378,67 +378,67 @@ 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach($object->fields as $key => $val)
+foreach ($object->fields as $key => $val)
 {
-	$align='';
-	if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-	if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-	if ($key == 'status') $align.=($align?' ':'').'center';
-	if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
+	$align = '';
+	if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';
+	if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';
+	if ($key == 'status') $align .= ($align ? ' ' : '').'center';
+	if (!empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters=array('arrayfields'=>$arrayfields,'param'=>$param,'sortfield'=>$sortfield,'sortorder'=>$sortorder);
-$reshook=$hookmanager->executeHooks('printFieldListTitle', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"],'','','','align="center"',$sortfield,$sortorder,'maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
-$needToFetchEachLine=0;
+$needToFetchEachLine = 0;
 foreach ($extrafields->attribute_computed as $key => $val)
 {
-	if (preg_match('/\$object/',$val)) $needToFetchEachLine++;  // There is at least one compute field that use $object
+	if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
 }
 
 
 // Loop on record
 // --------------------------------------------------------------------
-$i=0;
-$totalarray=array();
+$i = 0;
+$totalarray = array();
 while ($i < min($num, $limit))
 {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break;		// Should not happen
+	if (empty($obj)) break; // Should not happen
 
 	// Store properties in $object
 	$object->id = $obj->rowid;
-	foreach($object->fields as $key => $val)
+	foreach ($object->fields as $key => $val)
 	{
 		if (isset($obj->$key)) $object->$key = $obj->$key;
 	}
 
 	// Show here line of result
 	print '<tr class="oddeven">';
-	foreach($object->fields as $key => $val)
+	foreach ($object->fields as $key => $val)
 	{
-		$align='';
-		if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
-		if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
-		if ($key == 'status') $align.=($align?' ':'').'center';
-		if (! empty($arrayfields['t.'.$key]['checked']))
+		$align = '';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';
+		if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';
+		if ($key == 'status') $align .= ($align ? ' ' : '').'center';
+		if (!empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td';
 			if ($align) print ' class="'.$align.'"';
 			print '>';
 			print $object->showOutputField($val, $key, $obj->$key, '');
 			print '</td>';
-			if (! $i) $totalarray['nbfield']++;
-			if (! empty($val['isameasure']))
+			if (!$i) $totalarray['nbfield']++;
+			if (!empty($val['isameasure']))
 			{
-				if (! $i) $totalarray['pos'][$totalarray['nbfield']]='t.'.$key;
+				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				$totalarray['val']['t.'.$key] += $obj->$key;
 			}
 		}
@@ -446,19 +446,19 @@ 
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 	// Fields from hook
-	$parameters=array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook=$hookmanager->executeHooks('printFieldListValue', $parameters, $object);    // Note that $action and $object may have been modified by hook
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap" align="center">';
 	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
-		$selected=0;
-		if (in_array($obj->rowid, $arrayofselected)) $selected=1;
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected?' checked="checked"':'').'>';
+		$selected = 0;
+		if (in_array($obj->rowid, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (! $i) $totalarray['nbfield']++;
+	if (!$i) $totalarray['nbfield']++;
 
 	print '</tr>';
 
@@ -469,11 +469,11 @@ 
 if (isset($totalarray['pos']))
 {
 	print '<tr class="liste_total">';
-	$i=0;
+	$i = 0;
 	while ($i < $totalarray['nbfield'])
 	{
 		$i++;
-		if (! empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+		if (!empty($totalarray['pos'][$i]))  print '<td align="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
 		else
 		{
 			if ($i == 1)
@@ -490,16 +490,16 @@ 
 // If no record found
 if ($num == 0)
 {
-	$colspan=1;
-	foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 
 $db->free($resql);
 
-$parameters=array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook=$hookmanager->executeHooks('printFieldListFooter', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";
@@ -507,7 +507,7 @@ 
 
 print '</form>'."\n";
 
-if (in_array('builddoc',$arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)
 	{
@@ -515,14 +515,14 @@ 
 		$formfile = new FormFile($db);
 
 		// Show list of available documents
-		$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
-		$urlsource.=str_replace('&amp;','&',$param);
+		$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+		$urlsource .= str_replace('&amp;', '&', $param);
 
-		$filedir=$diroutputmassaction;
-		$genallowed=$user->rights->asset->read;
-		$delallowed=$user->rights->asset->create;
+		$filedir = $diroutputmassaction;
+		$genallowed = $user->rights->asset->read;
+		$delallowed = $user->rights->asset->create;
 
-		print $formfile->showdocuments('massfilesarea_asset','',$filedir,$urlsource,0,$delallowed,'',1,1,0,48,1,$param,$title,'');
+		print $formfile->showdocuments('massfilesarea_asset', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '');
 	}
 	else
 	{

dolibarr/htdocs/takepos/class/actions_takepos.class.php

Indentation +170 added lines, -170 removed lines

@@ -40,180 +40,180 @@
     public $errors = array();
 
 
-	/**
-	 * @var array Hook results. Propagated to $hookmanager->resArray for later reuse
-	 */
-	public $results = array();
-
-	/**
-	 * @var string String displayed by executeHook() immediately after return
-	 */
-	public $resprints;
-
-
-	/**
-	 * Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	public function __construct($db)
-	{
-	    $this->db = $db;
-	}
-
-	/**
-	 * Overloading the doActions function : replacing the parent's function with the one below
-	 *
-	 * @param   array()         $parameters     Hook metadatas (context, etc...)
-	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-	 * @param   string          $action         Current action (if set). Generally create or edit or null
-	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-	 */
-	public function doActions($parameters, &$object, &$action, $hookmanager)
-	{
-		global $conf, $user, $langs;
-
-		$error = 0; // Error counter
+    /**
+     * @var array Hook results. Propagated to $hookmanager->resArray for later reuse
+     */
+    public $results = array();
+
+    /**
+     * @var string String displayed by executeHook() immediately after return
+     */
+    public $resprints;
+
+
+    /**
+     * Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * Overloading the doActions function : replacing the parent's function with the one below
+     *
+     * @param   array()         $parameters     Hook metadatas (context, etc...)
+     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+     * @param   string          $action         Current action (if set). Generally create or edit or null
+     * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+     * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+     */
+    public function doActions($parameters, &$object, &$action, $hookmanager)
+    {
+        global $conf, $user, $langs;
+
+        $error = 0; // Error counter
+
+        /* print_r($parameters); print_r($object); echo "action: " . $action; */
+        if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))	    // do something only for the context 'somecontext1' or 'somecontext2'
+        {
+            // Do what you want here...
+            // You can for example call global vars like $fieldstosearchall to overwrite them, or update database depending on $action and $_POST values.
+        }
+
+        if (! $error) {
+            $this->results = array('myreturn' => 999);
+            $this->resprints = 'A text to show';
+            return 0;                                    // or return 1 to replace standard code
+        } else {
+            $this->errors[] = 'Error message';
+            return -1;
+        }
+    }
+
+
+    /**
+     * Overloading the doActions function : replacing the parent's function with the one below
+     *
+     * @param   array()         $parameters     Hook metadatas (context, etc...)
+     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+     * @param   string          $action         Current action (if set). Generally create or edit or null
+     * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+     * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+     */
+    public function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager)
+    {
+        global $conf, $user, $langs;
+
+        $error = 0; // Error counter
+
+        /* print_r($parameters); print_r($object); echo "action: " . $action; */
+        if (in_array($parameters['currentcontext'], array('invoicecard')))		// do something only for the context 'somecontext1' or 'somecontext2'
+        {
+
+            $receipt_url=DOL_URL_ROOT."/takepos/receipt.php";
+            print '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="' . $receipt_url . '?facid=' . $object->id.'">' . $langs->trans('Ticket') .'</a></div>';
+        }
+
+        if (! $error) {
+            $this->results = array('myreturn' => 999);
+            $this->resprints = 'A text to show';
+            return 0;                                    // or return 1 to replace standard code
+        } else {
+            $this->errors[] = 'Error message';
+            return -1;
+        }
+    }
+
+
+    /**
+     * Overloading the addMoreMassActions function : replacing the parent's function with the one below
+     *
+     * @param   array()         $parameters     Hook metadatas (context, etc...)
+     * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
+     * @param   string          $action         Current action (if set). Generally create or edit or null
+     * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
+     * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
+     */
+    public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
+    {
+        global $conf, $user, $langs;
+
+        $error = 0; // Error counter
 
         /* print_r($parameters); print_r($object); echo "action: " . $action; */
-	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))	    // do something only for the context 'somecontext1' or 'somecontext2'
-	    {
-			// Do what you want here...
-			// You can for example call global vars like $fieldstosearchall to overwrite them, or update database depending on $action and $_POST values.
-		}
-
-		if (! $error) {
-			$this->results = array('myreturn' => 999);
-			$this->resprints = 'A text to show';
-			return 0;                                    // or return 1 to replace standard code
-		} else {
-			$this->errors[] = 'Error message';
-			return -1;
-		}
-	}
-
-
-	/**
-	 * Overloading the doActions function : replacing the parent's function with the one below
-	 *
-	 * @param   array()         $parameters     Hook metadatas (context, etc...)
-	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-	 * @param   string          $action         Current action (if set). Generally create or edit or null
-	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-	 */
-	public function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager)
-	{
-	    global $conf, $user, $langs;
-
-	    $error = 0; // Error counter
+        if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+        {
+            $this->resprints = '<option value="0"'.($disabled?' disabled="disabled"':'').'>'.$langs->trans("TakePosMassAction").'</option>';
+        }
+
+        if (! $error) {
+            return 0;                                    // or return 1 to replace standard code
+        } else {
+            $this->errors[] = 'Error message';
+            return -1;
+        }
+    }
+
+
+
+    /**
+     * Execute action
+     *
+     * @param	array	$parameters		Array of parameters
+     * @param   Object	$object		   	Object output on PDF
+     * @param   string	$action     	'add', 'update', 'view'
+     * @return  int 		        	<0 if KO,
+     *                          		=0 if OK but we want to process standard actions too,
+     *  	                            >0 if OK and we want to replace standard actions.
+     */
+    function beforePDFCreation($parameters, &$object, &$action)
+    {
+        global $langs,$conf;
+        global $hookmanager;
+
+        $outputlangs=$langs;
+
+        $ret=0; $deltemp=array();
+        dol_syslog(get_class($this).'::executeHooks action='.$action);
 
         /* print_r($parameters); print_r($object); echo "action: " . $action; */
-	    if (in_array($parameters['currentcontext'], array('invoicecard')))		// do something only for the context 'somecontext1' or 'somecontext2'
-	    {
-
-			$receipt_url=DOL_URL_ROOT."/takepos/receipt.php";
-	        print '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="' . $receipt_url . '?facid=' . $object->id.'">' . $langs->trans('Ticket') .'</a></div>';
-	    }
-
-	    if (! $error) {
-	        $this->results = array('myreturn' => 999);
-	        $this->resprints = 'A text to show';
-	        return 0;                                    // or return 1 to replace standard code
-	    } else {
-	        $this->errors[] = 'Error message';
-	        return -1;
-	    }
-	}
-
-
-	/**
-	 * Overloading the addMoreMassActions function : replacing the parent's function with the one below
-	 *
-	 * @param   array()         $parameters     Hook metadatas (context, etc...)
-	 * @param   CommonObject    $object         The object to process (an invoice if you are in invoice module, a propale in propale's module, etc...)
-	 * @param   string          $action         Current action (if set). Generally create or edit or null
-	 * @param   HookManager     $hookmanager    Hook manager propagated to allow calling another hook
-	 * @return  int                             < 0 on error, 0 on success, 1 to replace standard code
-	 */
-	public function addMoreMassActions($parameters, &$object, &$action, $hookmanager)
-	{
-	    global $conf, $user, $langs;
-
-	    $error = 0; // Error counter
+        if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+        {
+
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Execute action
+     *
+     * @param	array	$parameters		Array of parameters
+     * @param   Object	$pdfhandler   	PDF builder handler
+     * @param   string	$action     	'add', 'update', 'view'
+     * @return  int 		        	<0 if KO,
+     *                          		=0 if OK but we want to process standard actions too,
+     *  	                            >0 if OK and we want to replace standard actions.
+     */
+    function afterPDFCreation($parameters, &$pdfhandler, &$action)
+    {
+        global $langs,$conf;
+        global $hookmanager;
+
+        $outputlangs=$langs;
+
+        $ret=0; $deltemp=array();
+        dol_syslog(get_class($this).'::executeHooks action='.$action);
 
         /* print_r($parameters); print_r($object); echo "action: " . $action; */
-	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
-	    {
-	        $this->resprints = '<option value="0"'.($disabled?' disabled="disabled"':'').'>'.$langs->trans("TakePosMassAction").'</option>';
-	    }
-
-	    if (! $error) {
-	        return 0;                                    // or return 1 to replace standard code
-	    } else {
-	        $this->errors[] = 'Error message';
-	        return -1;
-	    }
-	}
-
-
-
-	/**
-	 * Execute action
-	 *
-	 * @param	array	$parameters		Array of parameters
-	 * @param   Object	$object		   	Object output on PDF
-	 * @param   string	$action     	'add', 'update', 'view'
-	 * @return  int 		        	<0 if KO,
-	 *                          		=0 if OK but we want to process standard actions too,
-	 *  	                            >0 if OK and we want to replace standard actions.
-	 */
-	function beforePDFCreation($parameters, &$object, &$action)
-	{
-		global $langs,$conf;
-		global $hookmanager;
-
-		$outputlangs=$langs;
-
-		$ret=0; $deltemp=array();
-		dol_syslog(get_class($this).'::executeHooks action='.$action);
-
-		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
-		{
-
-		}
-
-		return $ret;
-	}
-
-	/**
-	 * Execute action
-	 *
-	 * @param	array	$parameters		Array of parameters
-	 * @param   Object	$pdfhandler   	PDF builder handler
-	 * @param   string	$action     	'add', 'update', 'view'
-	 * @return  int 		        	<0 if KO,
-	 *                          		=0 if OK but we want to process standard actions too,
-	 *  	                            >0 if OK and we want to replace standard actions.
-	 */
-	function afterPDFCreation($parameters, &$pdfhandler, &$action)
-	{
-		global $langs,$conf;
-		global $hookmanager;
-
-		$outputlangs=$langs;
-
-		$ret=0; $deltemp=array();
-		dol_syslog(get_class($this).'::executeHooks action='.$action);
-
-		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
-		{
-
-		}
-
-		return $ret;
-	}
+        if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+        {
+
+        }
+
+        return $ret;
+    }
 }

Spacing +19 added lines, -19 removed lines

@@ -77,16 +77,16 @@ 
 		$error = 0; // Error counter
 
         /* print_r($parameters); print_r($object); echo "action: " . $action; */
-	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))	    // do something only for the context 'somecontext1' or 'somecontext2'
+	    if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))	    // do something only for the context 'somecontext1' or 'somecontext2'
 	    {
 			// Do what you want here...
 			// You can for example call global vars like $fieldstosearchall to overwrite them, or update database depending on $action and $_POST values.
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$this->results = array('myreturn' => 999);
 			$this->resprints = 'A text to show';
-			return 0;                                    // or return 1 to replace standard code
+			return 0; // or return 1 to replace standard code
 		} else {
 			$this->errors[] = 'Error message';
 			return -1;
@@ -113,14 +113,14 @@ 
 	    if (in_array($parameters['currentcontext'], array('invoicecard')))		// do something only for the context 'somecontext1' or 'somecontext2'
 	    {
 
-			$receipt_url=DOL_URL_ROOT."/takepos/receipt.php";
-	        print '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="' . $receipt_url . '?facid=' . $object->id.'">' . $langs->trans('Ticket') .'</a></div>';
+			$receipt_url = DOL_URL_ROOT."/takepos/receipt.php";
+	        print '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="'.$receipt_url.'?facid='.$object->id.'">'.$langs->trans('Ticket').'</a></div>';
 	    }
 
-	    if (! $error) {
+	    if (!$error) {
 	        $this->results = array('myreturn' => 999);
 	        $this->resprints = 'A text to show';
-	        return 0;                                    // or return 1 to replace standard code
+	        return 0; // or return 1 to replace standard code
 	    } else {
 	        $this->errors[] = 'Error message';
 	        return -1;
@@ -144,13 +144,13 @@ 
 	    $error = 0; // Error counter
 
         /* print_r($parameters); print_r($object); echo "action: " . $action; */
-	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+	    if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
 	    {
-	        $this->resprints = '<option value="0"'.($disabled?' disabled="disabled"':'').'>'.$langs->trans("TakePosMassAction").'</option>';
+	        $this->resprints = '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>'.$langs->trans("TakePosMassAction").'</option>';
 	    }
 
-	    if (! $error) {
-	        return 0;                                    // or return 1 to replace standard code
+	    if (!$error) {
+	        return 0; // or return 1 to replace standard code
 	    } else {
 	        $this->errors[] = 'Error message';
 	        return -1;
@@ -171,16 +171,16 @@ 
 	 */
 	function beforePDFCreation($parameters, &$object, &$action)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 		global $hookmanager;
 
-		$outputlangs=$langs;
+		$outputlangs = $langs;
 
-		$ret=0; $deltemp=array();
+		$ret = 0; $deltemp = array();
 		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
 		{
 
 		}
@@ -200,16 +200,16 @@ 
 	 */
 	function afterPDFCreation($parameters, &$pdfhandler, &$action)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 		global $hookmanager;
 
-		$outputlangs=$langs;
+		$outputlangs = $langs;
 
-		$ret=0; $deltemp=array();
+		$ret = 0; $deltemp = array();
 		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+		if (in_array($parameters['currentcontext'], array('somecontext1', 'somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
 		{
 
 		}

Braces +15 added lines, -5 removed lines

@@ -77,7 +77,8 @@ 
 		$error = 0; // Error counter
 
         /* print_r($parameters); print_r($object); echo "action: " . $action; */
-	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))	    // do something only for the context 'somecontext1' or 'somecontext2'
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) {
+	        // do something only for the context 'somecontext1' or 'somecontext2'
 	    {
 			// Do what you want here...
 			// You can for example call global vars like $fieldstosearchall to overwrite them, or update database depending on $action and $_POST values.
@@ -85,6 +86,7 @@ 
 
 		if (! $error) {
 			$this->results = array('myreturn' => 999);
+	    }
 			$this->resprints = 'A text to show';
 			return 0;                                    // or return 1 to replace standard code
 		} else {
@@ -110,10 +112,12 @@ 
 	    $error = 0; // Error counter
 
         /* print_r($parameters); print_r($object); echo "action: " . $action; */
-	    if (in_array($parameters['currentcontext'], array('invoicecard')))		// do something only for the context 'somecontext1' or 'somecontext2'
+	    if (in_array($parameters['currentcontext'], array('invoicecard'))) {
+	        // do something only for the context 'somecontext1' or 'somecontext2'
 	    {
 
 			$receipt_url=DOL_URL_ROOT."/takepos/receipt.php";
+	    }
 	        print '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="' . $receipt_url . '?facid=' . $object->id.'">' . $langs->trans('Ticket') .'</a></div>';
 	    }
 
@@ -144,10 +148,12 @@ 
 	    $error = 0; // Error counter
 
         /* print_r($parameters); print_r($object); echo "action: " . $action; */
-	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+	    if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) {
+	        // do something only for the context 'somecontext1' or 'somecontext2'
 	    {
 	        $this->resprints = '<option value="0"'.($disabled?' disabled="disabled"':'').'>'.$langs->trans("TakePosMassAction").'</option>';
 	    }
+	    }
 
 	    if (! $error) {
 	        return 0;                                    // or return 1 to replace standard code
@@ -180,12 +186,14 @@ 
 		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+		if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) {
+		    // do something only for the context 'somecontext1' or 'somecontext2'
 		{
 
 		}
 
 		return $ret;
+		}
 	}
 
 	/**
@@ -209,11 +217,13 @@ 
 		dol_syslog(get_class($this).'::executeHooks action='.$action);
 
 		/* print_r($parameters); print_r($object); echo "action: " . $action; */
-		if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2')))		// do something only for the context 'somecontext1' or 'somecontext2'
+		if (in_array($parameters['currentcontext'], array('somecontext1','somecontext2'))) {
+		    // do something only for the context 'somecontext1' or 'somecontext2'
 		{
 
 		}
 
 		return $ret;
+		}
 	}
 }

dolibarr/htdocs/takepos/lib/takepos.lib.php

Indentation +22 added lines, -22 removed lines

@@ -28,31 +28,31 @@
  */
 function takeposAdminPrepareHead()
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$langs->load("cashdesk");
+    $langs->load("cashdesk");
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = dol_buildpath("/takepos/admin/setup.php", 1);
-	$head[$h][1] = $langs->trans("Settings");
-	$head[$h][2] = 'settings';
-	$h++;
-	$head[$h][0] = dol_buildpath("/takepos/admin/about.php", 1);
-	$head[$h][1] = $langs->trans("About");
-	$head[$h][2] = 'about';
-	$h++;
+    $head[$h][0] = dol_buildpath("/takepos/admin/setup.php", 1);
+    $head[$h][1] = $langs->trans("Settings");
+    $head[$h][2] = 'settings';
+    $h++;
+    $head[$h][0] = dol_buildpath("/takepos/admin/about.php", 1);
+    $head[$h][1] = $langs->trans("About");
+    $head[$h][2] = 'about';
+    $h++;
 
-	// Show more tabs from modules
-	// Entries must be declared in modules descriptor with line
-	//$this->tabs = array(
-	//	'entity:+tabname:Title:@takepos:/takepos/mypage.php?id=__ID__'
-	//); // to add new tab
-	//$this->tabs = array(
-	//	'entity:-tabname:Title:@takepos:/takepos/mypage.php?id=__ID__'
-	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'takepos');
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    //$this->tabs = array(
+    //	'entity:+tabname:Title:@takepos:/takepos/mypage.php?id=__ID__'
+    //); // to add new tab
+    //$this->tabs = array(
+    //	'entity:-tabname:Title:@takepos:/takepos/mypage.php?id=__ID__'
+    //); // to remove a tab
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'takepos');
 
-	return $head;
+    return $head;
 }

dolibarr/htdocs/takepos/invoice.php

Braces +34 added lines, -16 removed lines

@@ -65,23 +65,34 @@ 
 
 if ($action == 'valid' && $user->rights->facture->creer)
 {
-	if ($pay=="cash") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
-	else if ($pay=="card") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CB;
-	else if ($pay=="cheque") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
+	if ($pay=="cash") {
+	    $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
+	} else if ($pay=="card") {
+	    $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CB;
+	} else if ($pay=="cheque") {
+	    $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
+	}
 	$now=dol_now();
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
-	if (! empty($conf->stock->enabled) and $conf->global->CASHDESK_NO_DECREASE_STOCK!="1") $invoice->validate($user, '', $conf->global->CASHDESK_ID_WAREHOUSE);
-	else $invoice->validate($user);
+	if (! empty($conf->stock->enabled) and $conf->global->CASHDESK_NO_DECREASE_STOCK!="1") {
+	    $invoice->validate($user, '', $conf->global->CASHDESK_ID_WAREHOUSE);
+	} else {
+	    $invoice->validate($user);
+	}
 	// Add the payment
 	$payment=new Paiement($db);
 	$payment->datepaye=$now;
 	$payment->bank_account=$bankaccount;
 	$payment->amounts[$invoice->id]=$invoice->total_ttc;
 	
-  if ($pay=="cash") $payment->paiementid=4;
-	else if ($pay=="card") $payment->paiementid=6;
-	else if ($pay=="cheque") $payment->paiementid=7;
+  if ($pay=="cash") {
+      $payment->paiementid=4;
+  } else if ($pay=="card") {
+	    $payment->paiementid=6;
+	} else if ($pay=="cheque") {
+	    $payment->paiementid=7;
+	}
 	$payment->num_paiement=$invoice->ref;
 
   $payment->create($user);
@@ -124,8 +135,7 @@ 
     if ($idline > 0 and $placeid > 0) { //If exist invoice and line, to avoid errors if deleted from other device or no line selected
         $invoice->deleteline($idline);
         $invoice->fetch($placeid);
-    }
-    else
+    } else
     if ($placeid > 0) { //If exist invoice, but no line selected, proced to delete last line
         $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "facturedet where fk_facture='$placeid' order by rowid DESC";
         $resql = $db->query($sql);
@@ -398,15 +408,20 @@ 
 
 print '<p style="font-size:120%;" align="right"><b>'.$langs->trans('TotalTTC');
                                             
-if($conf->global->TAKEPOS_BAR_RESTAURANT) print " ".$langs->trans('Place')." ".$place;
+if($conf->global->TAKEPOS_BAR_RESTAURANT) {
+    print " ".$langs->trans('Place')." ".$place;
+}
 
 print ': '.price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'&nbsp;</b></p>';
 
 if ($invoice->socid != $conf->global->CASHDESK_ID_THIRDPARTY)
 {
     $soc = new Societe($db);
-    if ($invoice->socid > 0) $soc->fetch($invoice->socid);
-    else $soc->fetch($conf->global->CASHDESK_ID_THIRDPARTY);
+    if ($invoice->socid > 0) {
+        $soc->fetch($invoice->socid);
+    } else {
+        $soc->fetch($conf->global->CASHDESK_ID_THIRDPARTY);
+    }
     print '<p style="font-size:120%;" align="right">';
     print $langs->trans("Customer").': '.$soc->name;
     print '</p>';
@@ -414,9 +429,12 @@ 
 if ($action=="valid")
 {
 	print '<p style="font-size:120%;" align="center"><b>'.$invoice->ref." ".$langs->trans('BillShortStatusValidated').'</b></p>';
-	if ($conf->global->TAKEPOSCONNECTOR) print '<center><button type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
-	else print '<center><button type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
-}
+	if ($conf->global->TAKEPOSCONNECTOR) {
+	    print '<center><button type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
+	} else {
+	    print '<center><button type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
+	}
+	}
 
 if ($action == "search")
 {

Indentation +38 added lines, -38 removed lines

@@ -31,7 +31,7 @@ 
 require DOL_BASE_PATH . '/main.inc.php';
 
 
- // Load $user and permissions
+    // Load $user and permissions
 
 require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 
@@ -69,47 +69,47 @@ 
 
 if ($action == 'valid' && $user->rights->facture->creer)
 {
-	if ($pay=="cash") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
-	else if ($pay=="card") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CB;
-	else if ($pay=="cheque") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
-	$now=dol_now();
-	$invoice = new Facture($db);
-	$invoice->fetch($placeid);
-	if (! empty($conf->stock->enabled) and $conf->global->CASHDESK_NO_DECREASE_STOCK!="1") $invoice->validate($user, '', $conf->global->CASHDESK_ID_WAREHOUSE);
-	else $invoice->validate($user);
-	// Add the payment
-	$payment=new Paiement($db);
-	$payment->datepaye=$now;
-	$payment->bank_account=$bankaccount;
-	$payment->amounts[$invoice->id]=$invoice->total_ttc;
+    if ($pay=="cash") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
+    else if ($pay=="card") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CB;
+    else if ($pay=="cheque") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
+    $now=dol_now();
+    $invoice = new Facture($db);
+    $invoice->fetch($placeid);
+    if (! empty($conf->stock->enabled) and $conf->global->CASHDESK_NO_DECREASE_STOCK!="1") $invoice->validate($user, '', $conf->global->CASHDESK_ID_WAREHOUSE);
+    else $invoice->validate($user);
+    // Add the payment
+    $payment=new Paiement($db);
+    $payment->datepaye=$now;
+    $payment->bank_account=$bankaccount;
+    $payment->amounts[$invoice->id]=$invoice->total_ttc;
 	
-  if ($pay=="cash") $payment->paiementid=4;
-	else if ($pay=="card") $payment->paiementid=6;
-	else if ($pay=="cheque") $payment->paiementid=7;
-	$payment->num_paiement=$invoice->ref;
+    if ($pay=="cash") $payment->paiementid=4;
+    else if ($pay=="card") $payment->paiementid=6;
+    else if ($pay=="cheque") $payment->paiementid=7;
+    $payment->num_paiement=$invoice->ref;
 
-  $payment->create($user);
-	$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
+    $payment->create($user);
+    $payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
 	
-  $invoice->set_paid($user);
+    $invoice->set_paid($user);
 }
 
 if (($action=="addline" || $action=="freezone") && $placeid==0)
 {
-	// $place is id of POS, $placeid is id of invoice
-	if ($placeid==0)
-  {
-		$invoice = new Facture($db);
-		$invoice->socid=$conf->global->CASHDESK_ID_THIRDPARTY;
-		$invoice->date=dol_now();
-		$invoice->ref="(PROV-POS)";
-		$invoice->module_source = 'takepos';
-		$invoice->pos_source = (string) (empty($place)?'0':$place);
-
-		$placeid=$invoice->create($user);
-		$sql="UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS-".$place.")' where rowid=".$placeid;
-		$db->query($sql);
-	}
+    // $place is id of POS, $placeid is id of invoice
+    if ($placeid==0)
+    {
+        $invoice = new Facture($db);
+        $invoice->socid=$conf->global->CASHDESK_ID_THIRDPARTY;
+        $invoice->date=dol_now();
+        $invoice->ref="(PROV-POS)";
+        $invoice->module_source = 'takepos';
+        $invoice->pos_source = (string) (empty($place)?'0':$place);
+
+        $placeid=$invoice->create($user);
+        $sql="UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS-".$place.")' where rowid=".$placeid;
+        $db->query($sql);
+    }
 }
 
 if ($action == "addline") {
@@ -417,9 +417,9 @@ 
 }
 if ($action=="valid")
 {
-	print '<p style="font-size:120%;" align="center"><b>'.$invoice->ref." ".$langs->trans('BillShortStatusValidated').'</b></p>';
-	if ($conf->global->TAKEPOSCONNECTOR) print '<center><button type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
-	else print '<center><button type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
+    print '<p style="font-size:120%;" align="center"><b>'.$invoice->ref." ".$langs->trans('BillShortStatusValidated').'</b></p>';
+    if ($conf->global->TAKEPOSCONNECTOR) print '<center><button type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
+    else print '<center><button type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
 }
 
 if ($action == "search")

Spacing +65 added lines, -65 removed lines

@@ -20,22 +20,22 @@ 
 // if (! defined('NOREQUIREDB'))        define('NOREQUIREDB','1');        // Not disabled cause need to load personalized language
 // if (! defined('NOREQUIRESOC'))        define('NOREQUIRESOC','1');
 // if (! defined('NOREQUIRETRAN'))        define('NOREQUIRETRAN','1');
-if (!defined('NOCSRFCHECK'))    { define('NOCSRFCHECK', '1'); }
+if (!defined('NOCSRFCHECK')) { define('NOCSRFCHECK', '1'); }
 if (!defined('NOTOKENRENEWAL')) { define('NOTOKENRENEWAL', '1'); }
-if (!defined('NOREQUIREMENU'))  { define('NOREQUIREMENU', '1'); }
-if (!defined('NOREQUIREHTML'))  { define('NOREQUIREHTML', '1'); }
-if (!defined('NOREQUIREAJAX'))  { define('NOREQUIREAJAX', '1'); }
+if (!defined('NOREQUIREMENU')) { define('NOREQUIREMENU', '1'); }
+if (!defined('NOREQUIREHTML')) { define('NOREQUIREHTML', '1'); }
+if (!defined('NOREQUIREAJAX')) { define('NOREQUIREAJAX', '1'); }
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 
 
  // Load $user and permissions
 
-require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-require_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 $langs->loadLangs(
     array(
@@ -51,7 +51,7 @@ 
 $idline = GETPOST('idline');
 $desc = GETPOST('desc', 'alpha');
 $pay = GETPOST('pay');
-$sql="SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS-".$place.")'";
+$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS-".$place.")'";
 $resql = $db->query($sql);
 $row = $db->fetch_array($resql);
 $placeid = $row[0];
@@ -69,24 +69,24 @@ 
 
 if ($action == 'valid' && $user->rights->facture->creer)
 {
-	if ($pay=="cash") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
-	else if ($pay=="card") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CB;
-	else if ($pay=="cheque") $bankaccount=$conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
-	$now=dol_now();
+	if ($pay == "cash") $bankaccount = $conf->global->CASHDESK_ID_BANKACCOUNT_CASH;
+	else if ($pay == "card") $bankaccount = $conf->global->CASHDESK_ID_BANKACCOUNT_CB;
+	else if ($pay == "cheque") $bankaccount = $conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE;
+	$now = dol_now();
 	$invoice = new Facture($db);
 	$invoice->fetch($placeid);
-	if (! empty($conf->stock->enabled) and $conf->global->CASHDESK_NO_DECREASE_STOCK!="1") $invoice->validate($user, '', $conf->global->CASHDESK_ID_WAREHOUSE);
+	if (!empty($conf->stock->enabled) and $conf->global->CASHDESK_NO_DECREASE_STOCK != "1") $invoice->validate($user, '', $conf->global->CASHDESK_ID_WAREHOUSE);
 	else $invoice->validate($user);
 	// Add the payment
-	$payment=new Paiement($db);
-	$payment->datepaye=$now;
-	$payment->bank_account=$bankaccount;
-	$payment->amounts[$invoice->id]=$invoice->total_ttc;
+	$payment = new Paiement($db);
+	$payment->datepaye = $now;
+	$payment->bank_account = $bankaccount;
+	$payment->amounts[$invoice->id] = $invoice->total_ttc;
 	
-  if ($pay=="cash") $payment->paiementid=4;
-	else if ($pay=="card") $payment->paiementid=6;
-	else if ($pay=="cheque") $payment->paiementid=7;
-	$payment->num_paiement=$invoice->ref;
+  if ($pay == "cash") $payment->paiementid = 4;
+	else if ($pay == "card") $payment->paiementid = 6;
+	else if ($pay == "cheque") $payment->paiementid = 7;
+	$payment->num_paiement = $invoice->ref;
 
   $payment->create($user);
 	$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
@@ -94,20 +94,20 @@ 
   $invoice->set_paid($user);
 }
 
-if (($action=="addline" || $action=="freezone") && $placeid==0)
+if (($action == "addline" || $action == "freezone") && $placeid == 0)
 {
 	// $place is id of POS, $placeid is id of invoice
-	if ($placeid==0)
+	if ($placeid == 0)
   {
 		$invoice = new Facture($db);
-		$invoice->socid=$conf->global->CASHDESK_ID_THIRDPARTY;
-		$invoice->date=dol_now();
-		$invoice->ref="(PROV-POS)";
+		$invoice->socid = $conf->global->CASHDESK_ID_THIRDPARTY;
+		$invoice->date = dol_now();
+		$invoice->ref = "(PROV-POS)";
 		$invoice->module_source = 'takepos';
-		$invoice->pos_source = (string) (empty($place)?'0':$place);
+		$invoice->pos_source = (string) (empty($place) ? '0' : $place);
 
-		$placeid=$invoice->create($user);
-		$sql="UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS-".$place.")' where rowid=".$placeid;
+		$placeid = $invoice->create($user);
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS-".$place.")' where rowid=".$placeid;
 		$db->query($sql);
 	}
 }
@@ -131,7 +131,7 @@ 
     }
     else
     if ($placeid > 0) { //If exist invoice, but no line selected, proced to delete last line
-        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "facturedet where fk_facture='$placeid' order by rowid DESC";
+        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet where fk_facture='$placeid' order by rowid DESC";
         $resql = $db->query($sql);
         $row = $db->fetch_array($resql);
         $deletelineid = $row[0];
@@ -141,7 +141,7 @@ 
 }
 
 if ($action == "updateqty") {
-    foreach($invoice->lines as $line)
+    foreach ($invoice->lines as $line)
     {
         if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
         }
@@ -151,7 +151,7 @@ 
 }
 
 if ($action == "updateprice") {
-    foreach($invoice->lines as $line)
+    foreach ($invoice->lines as $line)
     {
         if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
         }
@@ -161,7 +161,7 @@ 
 }
 
 if ($action == "updatereduction") {
-    foreach($invoice->lines as $line)
+    foreach ($invoice->lines as $line)
     {
         if ($line->id == $idline) { $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
         }
@@ -171,15 +171,15 @@ 
 }
 
 if ($action == "order" and $placeid != 0) {
-    include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-    $headerorder = '<html><br><b>' . $langs->trans('Place') . ' ' . $place . '<br><table width="65%"><thead><tr><th align="left">' . $langs->trans("Label") . '</th><th align="right">' . $langs->trans("Qty") . '</th></tr></thead><tbody>';
-    $footerorder = '</tbody></table>' . dol_print_date(dol_now(), 'dayhour') . '<br></html>';
+    $headerorder = '<html><br><b>'.$langs->trans('Place').' '.$place.'<br><table width="65%"><thead><tr><th align="left">'.$langs->trans("Label").'</th><th align="right">'.$langs->trans("Qty").'</th></tr></thead><tbody>';
+    $footerorder = '</tbody></table>'.dol_print_date(dol_now(), 'dayhour').'<br></html>';
     $order_receipt_printer1 = "";
     $order_receipt_printer2 = "";
     $catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
     $catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
-    foreach($invoice->lines as $line)
+    foreach ($invoice->lines as $line)
     {
         if ($line->special_code == "3") { continue;
         }
@@ -188,13 +188,13 @@ 
         $result = array_intersect($catsprinter1, $existing);
         $count = count($result);
         if ($count > 0) {
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid";
+            $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=$line->rowid";
             $db->query($sql);
-            $order_receipt_printer1.= '<tr>' . $line->product_label . '<td align="right">' . $line->qty . '</td></tr>';
+            $order_receipt_printer1 .= '<tr>'.$line->product_label.'<td align="right">'.$line->qty.'</td></tr>';
         }
     }
 
-    foreach($invoice->lines as $line)
+    foreach ($invoice->lines as $line)
     {
         if ($line->special_code == "3") { continue;
         }
@@ -203,9 +203,9 @@ 
         $result = array_intersect($catsprinter2, $existing);
         $count = count($result);
         if ($count > 0) {
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid";
+            $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=$line->rowid";
             $db->query($sql);
-            $order_receipt_printer2.= '<tr>' . $line->product_label . '<td align="right">' . $line->qty . '</td></tr>';
+            $order_receipt_printer2 .= '<tr>'.$line->product_label.'<td align="right">'.$line->qty.'</td></tr>';
         }
     }
 
@@ -215,7 +215,7 @@ 
 // temporary ticket feature
 
 if ($action == "temp" and $placeid != 0) {
-    include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+    include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
     // issues with special characters with jPosBoxprinting ->javascript, stringCleanCharts() temporarily fix them until to find a more elegant solution.
 
@@ -250,13 +250,13 @@ 
     $mysoczip = stringCleanCharts($mysoc->zip);
     $mysocphone = stringCleanCharts($mysoc->phone);
     $mysocurl = stringCleanCharts($mysoc->url);
-    $header_soc = '<html><center><font size="4"><b>' . $mysocname . '</b><br>' . $mysocaddress . '<br>' . $mysoczip . ' ' . $mysoctown . '</font></center><br>' . $langs->trans("Phone") . ': ' . $mysocphone . '<br>' . $mysocurl;
-    $header_ticket = '<br><br>' . $langs->trans("Temporary ticket") . '<br>' . $langs->trans("date") . ':<br>' . dol_print_date(dol_now(), 'dayhour') . '<br>' . $langs->trans('Place') . ' ' . $place . '<br><br><br><div width="100%" style="border-top-style: double;"></div>';
-    $body_ticket = '<table width="100%"><thead><tr><th align="left">' . $langs->trans("Label") . '</th><th align="left">' . $langs->trans("Qty") . '</th><th align="left">' . $langs->trans("Price") . '</th><th align="left">' . $langs->trans("TotalTTC") . '</th></tr></thead>';
-    $footer_ticket = '<br><br>' . $langs->trans("Cashier") . ': ' . $user->firstname . '<br><center>' . $langs->trans("Thanks for your coming !") . '</center></html>';
+    $header_soc = '<html><center><font size="4"><b>'.$mysocname.'</b><br>'.$mysocaddress.'<br>'.$mysoczip.' '.$mysoctown.'</font></center><br>'.$langs->trans("Phone").': '.$mysocphone.'<br>'.$mysocurl;
+    $header_ticket = '<br><br>'.$langs->trans("Temporary ticket").'<br>'.$langs->trans("date").':<br>'.dol_print_date(dol_now(), 'dayhour').'<br>'.$langs->trans('Place').' '.$place.'<br><br><br><div width="100%" style="border-top-style: double;"></div>';
+    $body_ticket = '<table width="100%"><thead><tr><th align="left">'.$langs->trans("Label").'</th><th align="left">'.$langs->trans("Qty").'</th><th align="left">'.$langs->trans("Price").'</th><th align="left">'.$langs->trans("TotalTTC").'</th></tr></thead>';
+    $footer_ticket = '<br><br>'.$langs->trans("Cashier").': '.$user->firstname.'<br><center>'.$langs->trans("Thanks for your coming !").'</center></html>';
     $ticket_printer1 = "";
     $catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
-    foreach($invoice->lines as $line)
+    foreach ($invoice->lines as $line)
     {
         if ($line->special_code == "3") { continue;
         }
@@ -265,10 +265,10 @@ 
         $result = array_intersect($catsprinter1, $existing);
         $count = count($result);
         if ($count > 0) {
-            $sql = "UPDATE " . MAIN_DB_PREFIX . "facturedet set special_code='3' where rowid=$line->rowid";
+            $sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=$line->rowid";
             $db->query($sql);
-            $ticket_printer1.= '<tbody><tr><td align="left">' . $line->product_label . '</td><td align="left">' . $line->qty . '</td><td align="left">' . $line->total_ttc / $line->qty . '</td><td align="left">' . $line->total_ttc . '</td></tr></tbody>';
-            $ticket_total = '</table><div width="100%" style="border-top-style: double;"></div><table align="right"><tr><th>' . $langs->trans("TotalHT") . ': ' . price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency) . '</th></tr><tr><th>' . $langs->trans("TotalVAT") . ': ' . price($invoice->total_tva, 1, '', 1, -1, -1, $conf->currency) . '</th></tr><tr><th>' . $langs->trans("TotalTTC") . ': ' . price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency) . '</th></tr></tbody></table>';
+            $ticket_printer1 .= '<tbody><tr><td align="left">'.$line->product_label.'</td><td align="left">'.$line->qty.'</td><td align="left">'.$line->total_ttc / $line->qty.'</td><td align="left">'.$line->total_ttc.'</td></tr></tbody>';
+            $ticket_total = '</table><div width="100%" style="border-top-style: double;"></div><table align="right"><tr><th>'.$langs->trans("TotalHT").': '.price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency).'</th></tr><tr><th>'.$langs->trans("TotalVAT").': '.price($invoice->total_tva, 1, '', 1, -1, -1, $conf->currency).'</th></tr><tr><th>'.$langs->trans("TotalTTC").': '.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</th></tr></tbody></table>';
         }
     }
 
@@ -303,7 +303,7 @@ 
         type: "POST",
         url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
         data: '<?php
-        print $headerorder . $order_receipt_printer1 . $footerorder; ?>'
+        print $headerorder.$order_receipt_printer1.$footerorder; ?>'
     });
     <?php
 }
@@ -314,7 +314,7 @@ 
         type: "POST",
         url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print2',
         data: '<?php
-        print $headerorder . $order_receipt_printer2 . $footerorder; ?>'
+        print $headerorder.$order_receipt_printer2.$footerorder; ?>'
     });
     <?php
 }
@@ -344,7 +344,7 @@ 
         type: "POST",
         url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print',
         data: '<?php
-        print $header_soc . $header_ticket . $body_ticket . $ticket_printer1 . $ticket_total . $footer_ticket; ?>'
+        print $header_soc.$header_ticket.$body_ticket.$ticket_printer1.$ticket_total.$footer_ticket; ?>'
     });
     <?php
 }
@@ -379,21 +379,21 @@ 
 print '<div class="div-table-responsive-no-min invoice">';
 print '<table id="tablelines" class="noborder noshadow" width="100%">';
 print '<tr class="liste_titre nodrag nodrop">';
-print '<td class="linecoldescription">' . $langs->trans('Description') . '</td>';
-print '<td class="linecolqty" align="right">' . $langs->trans('Qty') . '</td>';
-print '<td class="linecolht" align="right">' . $langs->trans('TotalHTShort') . '</td>';
+print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
+print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>';
+print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>';
 print "</tr>\n";
 
 if ($placeid > 0) {
-    foreach($invoice->lines as $line)
+    foreach ($invoice->lines as $line)
     {
         print '<tr class="drag drop oddeven';
         if ($line->special_code == "3") { print ' order';
         }
-        print '" id="' . $line->rowid . '">';
-        print '<td>' . $line->product_label . $line->desc . '</td>';
-        print '<td align="right">' . $line->qty . '</td>';
-        print '<td align="right">' . price($line->total_ttc) . '</td>';
+        print '" id="'.$line->rowid.'">';
+        print '<td>'.$line->product_label.$line->desc.'</td>';
+        print '<td align="right">'.$line->qty.'</td>';
+        print '<td align="right">'.price($line->total_ttc).'</td>';
         print '</tr>';
     }
 }
@@ -402,7 +402,7 @@ 
 
 print '<p style="font-size:120%;" align="right"><b>'.$langs->trans('TotalTTC');
                                             
-if($conf->global->TAKEPOS_BAR_RESTAURANT) print " ".$langs->trans('Place')." ".$place;
+if ($conf->global->TAKEPOS_BAR_RESTAURANT) print " ".$langs->trans('Place')." ".$place;
 
 print ': '.price($invoice->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'&nbsp;</b></p>';
 
@@ -415,7 +415,7 @@ 
     print $langs->trans("Customer").': '.$soc->name;
     print '</p>';
 }
-if ($action=="valid")
+if ($action == "valid")
 {
 	print '<p style="font-size:120%;" align="center"><b>'.$invoice->ref." ".$langs->trans('BillShortStatusValidated').'</b></p>';
 	if ($conf->global->TAKEPOSCONNECTOR) print '<center><button type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button><center>';
@@ -425,7 +425,7 @@ 
 if ($action == "search")
 {
     print '<center>
-	<input type="text" id="search" name="search" onkeyup="Search2();" name="search" style="width:80%;font-size: 150%;" placeholder=' . $langs->trans('Search') . '
+	<input type="text" id="search" name="search" onkeyup="Search2();" name="search" style="width:80%;font-size: 150%;" placeholder=' . $langs->trans('Search').'
 	</center>';
 }