Nettoyage du code suite au test de la tache 4984
This commit is contained in:
parent
5c21250f3c
commit
986d669d1f
@ -1098,38 +1098,6 @@ else
|
|||||||
$author->id = $fac->user_author;
|
$author->id = $fac->user_author;
|
||||||
$author->fetch();
|
$author->fetch();
|
||||||
|
|
||||||
/* // modification tache 4984, je laisse en commentaire pour test
|
|
||||||
$h = 0;
|
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans('CardBill');
|
|
||||||
$hselected = $h;
|
|
||||||
$h++;
|
|
||||||
|
|
||||||
if ($conf->use_preview_tabs)
|
|
||||||
{
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/apercu.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans('Preview');
|
|
||||||
$h++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($fac->mode_reglement_code == 'PRE')
|
|
||||||
{
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans('StandingOrders');
|
|
||||||
$h++;
|
|
||||||
}
|
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans('Note');
|
|
||||||
$h++;
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/info.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans('Info');
|
|
||||||
$h++;
|
|
||||||
|
|
||||||
dolibarr_fiche_head($head, $hselected, $langs->trans('Bill').' : '.$fac->ref);
|
|
||||||
*/
|
|
||||||
|
|
||||||
$head = facture_prepare_head($fac);
|
$head = facture_prepare_head($fac);
|
||||||
|
|
||||||
dolibarr_fiche_head($head, 0, $langs->trans('Bill').' : '.$fac->ref);
|
dolibarr_fiche_head($head, 0, $langs->trans('Bill').' : '.$fac->ref);
|
||||||
|
|||||||
@ -68,37 +68,6 @@ if ($_GET["facid"] > 0)
|
|||||||
$author = new User($db);
|
$author = new User($db);
|
||||||
$author->id = $fac->user_author;
|
$author->id = $fac->user_author;
|
||||||
$author->fetch();
|
$author->fetch();
|
||||||
|
|
||||||
/* //modif tache 4984 laissé en commentaire pour test
|
|
||||||
$h = 0;
|
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("CardBill");
|
|
||||||
$h++;
|
|
||||||
|
|
||||||
if ($conf->use_preview_tabs)
|
|
||||||
{
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/apercu.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("Preview");
|
|
||||||
$hselected = $h;
|
|
||||||
$h++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($fac->mode_reglement_code == 'PRE')
|
|
||||||
{
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("StandingOrders");
|
|
||||||
$h++;
|
|
||||||
}
|
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("Note");
|
|
||||||
$h++;
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/info.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("Info");
|
|
||||||
$h++;
|
|
||||||
*/
|
|
||||||
|
|
||||||
$head = facture_prepare_head($fac);
|
$head = facture_prepare_head($fac);
|
||||||
$hselected = $conf->use_preview_tabs ? 2 : false;
|
$hselected = $conf->use_preview_tabs ? 2 : false;
|
||||||
dolibarr_fiche_head($head, $hselected, $langs->trans("Bill")." : $fac->ref");
|
dolibarr_fiche_head($head, $hselected, $langs->trans("Bill")." : $fac->ref");
|
||||||
|
|||||||
@ -44,38 +44,6 @@ $fac->fetch($_GET["facid"]);
|
|||||||
$fac->info($_GET["facid"]);
|
$fac->info($_GET["facid"]);
|
||||||
$soc = new Societe($db, $fac->socidp);
|
$soc = new Societe($db, $fac->socidp);
|
||||||
$soc->fetch($fac->socidp);
|
$soc->fetch($fac->socidp);
|
||||||
|
|
||||||
/* //laissé pour test tache 4984
|
|
||||||
$h = 0;
|
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("CardBill");
|
|
||||||
$h++;
|
|
||||||
|
|
||||||
if ($conf->use_preview_tabs)
|
|
||||||
{
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/apercu.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("Preview");
|
|
||||||
$h++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($fac->mode_reglement_code == 'PRE')
|
|
||||||
{
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("StandingOrders");
|
|
||||||
$h++;
|
|
||||||
}
|
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("Note");
|
|
||||||
$h++;
|
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/info.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("Info");
|
|
||||||
$hselected = $h;
|
|
||||||
$h++;
|
|
||||||
*/
|
|
||||||
|
|
||||||
$head = facture_prepare_head($fac);
|
$head = facture_prepare_head($fac);
|
||||||
$hselected = 3;
|
$hselected = 3;
|
||||||
if ($conf->use_preview_tabs) $hselected++;
|
if ($conf->use_preview_tabs) $hselected++;
|
||||||
|
|||||||
@ -74,38 +74,7 @@ if ($_GET["facid"])
|
|||||||
{
|
{
|
||||||
$soc = new Societe($db, $fac->socidp);
|
$soc = new Societe($db, $fac->socidp);
|
||||||
$soc->fetch($fac->socidp);
|
$soc->fetch($fac->socidp);
|
||||||
|
$head = facture_prepare_head($fac);
|
||||||
/* //laissé en commentaire pour test tache 4984
|
|
||||||
$h=0;
|
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("CardBill");
|
|
||||||
$h++;
|
|
||||||
|
|
||||||
if ($conf->use_preview_tabs)
|
|
||||||
{
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/apercu.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("Preview");
|
|
||||||
$h++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($fac->mode_reglement_code == 'PRE')
|
|
||||||
{
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("StandingOrders");
|
|
||||||
$h++;
|
|
||||||
}
|
|
||||||
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("Note");
|
|
||||||
$hselected = $h;
|
|
||||||
$h++;
|
|
||||||
$head[$h][0] = DOL_URL_ROOT.'/compta/facture/info.php?facid='.$fac->id;
|
|
||||||
$head[$h][1] = $langs->trans("Info");
|
|
||||||
$h++;
|
|
||||||
*/
|
|
||||||
|
|
||||||
$head = facture_prepare_head($fac);
|
|
||||||
$hselected = 2;
|
$hselected = 2;
|
||||||
if ($conf->use_preview_tabs) $hselected++;
|
if ($conf->use_preview_tabs) $hselected++;
|
||||||
if ($fac->mode_reglement_code == 'PRE') $hselected++;
|
if ($fac->mode_reglement_code == 'PRE') $hselected++;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user