mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-23 09:51:33 +01:00
Qual: Uniformisation des noms de boutons actions en butAction et butActionDelete. Suppression des tabAction et butDelete qui faisait double emploi et compliqu les feuilles de styles.
This commit is contained in:
@@ -611,12 +611,12 @@ if ($account > 0)
|
||||
|
||||
if ($user->rights->banque->modifier && $acct->type != 2 && $acct->rappro) // Si non compte cash et rapprochable
|
||||
{
|
||||
print '<a class="tabAction" href="rappro.php?account='.$acct->id.'">'.$langs->trans("Conciliate").'</a>';
|
||||
print '<a class="butAction" href="rappro.php?account='.$acct->id.'">'.$langs->trans("Conciliate").'</a>';
|
||||
}
|
||||
|
||||
if ($user->rights->banque->modifier)
|
||||
{
|
||||
print '<a class="tabAction" href="account.php?action=addline&account='.$acct->id.'&page='.$page.'">'.$langs->trans("AddBankRecord").'</a>';
|
||||
print '<a class="butAction" href="account.php?action=addline&account='.$acct->id.'&page='.$page.'">'.$langs->trans("AddBankRecord").'</a>';
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
|
||||
@@ -219,8 +219,8 @@ print "</table>";
|
||||
*/
|
||||
print "<br><div class=\"tabsAction\">\n";
|
||||
if ($user->rights->banque->configurer) {
|
||||
print '<a class="tabAction" href="fiche.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>';
|
||||
print '<a class="tabAction" href="categ.php">'.$langs->trans("Categories").'</a>';
|
||||
print '<a class="butAction" href="fiche.php?action=create">'.$langs->trans("NewFinancialAccount").'</a>';
|
||||
print '<a class="butAction" href="categ.php">'.$langs->trans("Categories").'</a>';
|
||||
}
|
||||
print "</div>";
|
||||
|
||||
|
||||
@@ -467,7 +467,7 @@ if ($orig_account)
|
||||
{
|
||||
$acct=new Account($db,$orig_account);
|
||||
$acct->fetch($orig_account);
|
||||
print '<a class="tabAction" href="rappro.php?account='.$orig_account.'">'.$langs->trans("BackToConciliate",$acct->label).'</a>';
|
||||
print '<a class="butAction" href="rappro.php?account='.$orig_account.'">'.$langs->trans("BackToConciliate",$acct->label).'</a>';
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
|
||||
@@ -233,8 +233,8 @@ print '<div class="tabsAction">';
|
||||
|
||||
if ($_GET["action"] != 'create' && $_GET["action"] != 'edit')
|
||||
{
|
||||
print '<a class="tabAction" href="fiche.php?action=edit&id='.$id.'">'.$langs->trans('Edit').'</a>';
|
||||
print '<a class="butDelete" href="fiche.php?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
|
||||
print '<a class="butAction" href="fiche.php?action=edit&id='.$id.'">'.$langs->trans('Edit').'</a>';
|
||||
print '<a class="butActionDelete" href="fiche.php?action=delete&id='.$id.'">'.$langs->trans('Delete').'</a>';
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
|
||||
@@ -167,7 +167,7 @@ if ($_GET["facid"])
|
||||
|
||||
if ($user->rights->facture->creer && $_GET["action"] <> 'edit')
|
||||
{
|
||||
print "<a class=\"tabAction\" href=\"note.php?facid=$fac->id&action=edit\">".$langs->trans('Edit')."</a>";
|
||||
print "<a class=\"butAction\" href=\"note.php?facid=$fac->id&action=edit\">".$langs->trans('Edit')."</a>";
|
||||
}
|
||||
|
||||
print "</div>";
|
||||
|
||||
@@ -358,12 +358,12 @@ if ($socid > 0)
|
||||
// Si soci<63>t<EFBFBD> cliente ou prospect, on affiche bouton "Cr<43>er facture client"
|
||||
if ($societe->client != 0 && $conf->facture->enabled && $user->rights->facture->creer) {
|
||||
$langs->load("bills");
|
||||
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT."/compta/facture.php?action=create&socid=$societe->id\">".$langs->trans("AddBill")."</a>";
|
||||
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/facture.php?action=create&socid=$societe->id\">".$langs->trans("AddBill")."</a>";
|
||||
}
|
||||
|
||||
if ($conf->deplacement->enabled) {
|
||||
$langs->load("trips");
|
||||
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT."/compta/deplacement/fiche.php?socid=$societe->id&action=create\">".$langs->trans("AddTrip")."</a>";
|
||||
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/deplacement/fiche.php?socid=$societe->id&action=create\">".$langs->trans("AddTrip")."</a>";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -371,7 +371,7 @@ if ($socid > 0)
|
||||
|
||||
if ($user->rights->societe->contact->creer)
|
||||
{
|
||||
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&action=create\">".$langs->trans("AddContact")."</a>";
|
||||
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT.'/contact/fiche.php?socid='.$socid."&action=create\">".$langs->trans("AddContact")."</a>";
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
|
||||
@@ -263,7 +263,7 @@ if ($_GET['action'] == 'new')
|
||||
print "</table>";
|
||||
|
||||
print '<div class="tabsAction">';
|
||||
print '<a class="tabAction" href="fiche.php?action=create&accountid='.$bid.'">';
|
||||
print '<a class="butAction" href="fiche.php?action=create&accountid='.$bid.'">';
|
||||
print $langs->trans('NewCheckDepositOn',$account_label);
|
||||
print '</a>';
|
||||
print '</div><br />';
|
||||
@@ -402,17 +402,17 @@ print '<div class="tabsAction">';
|
||||
|
||||
if ($user->societe_id == 0 && sizeof($accounts) == 1 && $_GET['action'] == 'new')
|
||||
{
|
||||
print '<a class="tabAction" href="fiche.php?action=create&accountid='.$account_id.'">'.$langs->trans('NewCheckReceipt').'</a>';
|
||||
print '<a class="butAction" href="fiche.php?action=create&accountid='.$account_id.'">'.$langs->trans('NewCheckReceipt').'</a>';
|
||||
}
|
||||
|
||||
if ($user->societe_id == 0 && $remisecheque->statut == 0 && $_GET['action'] == '')
|
||||
{
|
||||
print '<a class="tabAction" href="fiche.php?id='.$_GET['id'].'&facid='.$objp->facid.'&action=valide">'.$langs->trans('Valid').'</a>';
|
||||
print '<a class="butAction" href="fiche.php?id='.$_GET['id'].'&facid='.$objp->facid.'&action=valide">'.$langs->trans('Valid').'</a>';
|
||||
}
|
||||
|
||||
if ($user->societe_id == 0 && $remisecheque->statut == 0 && $_GET['action'] == '')
|
||||
{
|
||||
print '<a class="butDelete" href="fiche.php?id='.$_GET['id'].'&action=delete">'.$langs->trans('Delete').'</a>';
|
||||
print '<a class="butActionDelete" href="fiche.php?id='.$_GET['id'].'&action=delete">'.$langs->trans('Delete').'</a>';
|
||||
|
||||
}
|
||||
print '</div>';
|
||||
|
||||
@@ -95,9 +95,9 @@ if ($nb)
|
||||
{
|
||||
print "<div class=\"tabsAction\">\n";
|
||||
|
||||
if ($nb) print '<a class="tabAction" href="create.php?action=create">'.$langs->trans("Create")."</a>\n";
|
||||
if ($nb1) print '<a class="tabAction" href="create.php?action=create&banque=1&guichet=1">'.$langs->trans("CreateGuichet")."</a>\n";
|
||||
if ($nb11) print '<a class="tabAction" href="create.php?action=create&banque=1">'.$langs->trans("CreateBanque")."</a>\n";
|
||||
if ($nb) print '<a class="butAction" href="create.php?action=create">'.$langs->trans("Create")."</a>\n";
|
||||
if ($nb1) print '<a class="butAction" href="create.php?action=create&banque=1&guichet=1">'.$langs->trans("CreateGuichet")."</a>\n";
|
||||
if ($nb11) print '<a class="butAction" href="create.php?action=create&banque=1">'.$langs->trans("CreateBanque")."</a>\n";
|
||||
|
||||
print "</div>\n";
|
||||
}
|
||||
|
||||
@@ -239,7 +239,7 @@ if ($_GET["action"] == '')
|
||||
|
||||
if ($bon->credite == 0)
|
||||
{
|
||||
print "<a class=\"tabAction\" href=\"fiche.php?action=credite&id=$bon->id\">".$langs->trans("Classer cr<EFBFBD>dit<EFBFBD>")."</a>";
|
||||
print "<a class=\"butAction\" href=\"fiche.php?action=credite&id=$bon->id\">".$langs->trans("Classer cr<EFBFBD>dit<EFBFBD>")."</a>";
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -282,7 +282,7 @@ if ($_GET["id"])
|
||||
|
||||
if ($bon->credite == 1 && $lipre->statut == 2)
|
||||
{
|
||||
print "<a class=\"tabAction\" href=\"ligne.php?action=rejet&id=$lipre->id\">".$langs->trans("Emmetre un rejet")."</a>";
|
||||
print "<a class=\"butAction\" href=\"ligne.php?action=rejet&id=$lipre->id\">".$langs->trans("Emmetre un rejet")."</a>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -250,25 +250,25 @@ if ($chid > 0)
|
||||
// Editer
|
||||
if ($cha->paye == 0 && $user->rights->tax->charges->creer)
|
||||
{
|
||||
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$cha->id&action=edit\">".$langs->trans("Edit")."</a>";
|
||||
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$cha->id&action=edit\">".$langs->trans("Edit")."</a>";
|
||||
}
|
||||
|
||||
// Emettre paiement
|
||||
if ($cha->paye == 0 && round($resteapayer) > 0 && $user->rights->tax->charges->creer)
|
||||
{
|
||||
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT."/compta/paiement_charge.php?id=$cha->id&action=create\">".$langs->trans("DoPayment")."</a>";
|
||||
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/paiement_charge.php?id=$cha->id&action=create\">".$langs->trans("DoPayment")."</a>";
|
||||
}
|
||||
|
||||
// Classer 'pay<61>'
|
||||
if ($cha->paye == 0 && round($resteapayer) <=0 && $user->rights->tax->charges->creer)
|
||||
{
|
||||
print "<a class=\"tabAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$cha->id&action=payed\">".$langs->trans("ClassifyPayed")."</a>";
|
||||
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$cha->id&action=payed\">".$langs->trans("ClassifyPayed")."</a>";
|
||||
}
|
||||
|
||||
// Supprimer
|
||||
if ($cha->paye == 0 && $totalpaye <=0 && $user->rights->tax->charges->supprimer)
|
||||
{
|
||||
print "<a class=\"butDelete\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$cha->id&action=delete\">".$langs->trans("Delete")."</a>";
|
||||
print "<a class=\"butActionDelete\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$cha->id&action=delete\">".$langs->trans("Delete")."</a>";
|
||||
}
|
||||
|
||||
print "</div>";
|
||||
|
||||
Reference in New Issue
Block a user