lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test: removal of the tab "accountancy card"

Browse Source
This commit is contained in:
Regis Houssin 2010-09-10 16:25:12 +00:00
parent 156a1e6b29
commit 0d7693ca50
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/commande/fiche.php
View File

@ -261,6 +261,12 @@ if ($_POST['action'] == 'add' && $user->rights->commande->creer)
} }
if ($_GET["action"] == 'classifybilled')
{
$commande->fetch($comid);
$commande->classer_facturee();
}
// Positionne ref commande client // Positionne ref commande client
if ($_POST['action'] == 'set_ref_client' && $user->rights->commande->creer) if ($_POST['action'] == 'set_ref_client' && $user->rights->commande->creer)
{ {
@ -1760,6 +1766,19 @@ else
} }
} }
} }
if ($conf->facture->enabled && $commande->statut > 0 && ! $commande->facturee)
{
if ($user->rights->facture->creer)
{
print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&amp;origin='.$commande->element.'&amp;originid='.$commande->id.'&amp;socid='.$commande->socid.'">'.$langs->trans("CreateBill").'</a>';
}
if ($user->rights->commande->creer)
{
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$commande->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
}
}
// Close // Close
if ($commande->statut == 1 || $commande->statut == 2) if ($commande->statut == 1 || $commande->statut == 2)

4
htdocs/lib/order.lib.php
View File

@ -54,7 +54,7 @@ function commande_prepare_head($commande)
$head[$h][2] = 'shipping'; $head[$h][2] = 'shipping';
$h++; $h++;
} }
/*
// Commande a facturer // Commande a facturer
if ($conf->facture->enabled) if ($conf->facture->enabled)
{ {
@ -63,7 +63,7 @@ function commande_prepare_head($commande)
$head[$h][2] = 'accountancy'; $head[$h][2] = 'accountancy';
$h++; $h++;
} }
*/
if ($conf->use_preview_tabs) if ($conf->use_preview_tabs)
{ {
$head[$h][0] = DOL_URL_ROOT.'/commande/apercu.php?id='.$commande->id; $head[$h][0] = DOL_URL_ROOT.'/commande/apercu.php?id='.$commande->id;