diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 4e6b19047fc..010d8aad094 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2020,7 +2020,7 @@ else $head = facture_prepare_head($fac); - dol_fiche_head($head, 'compta', $langs->trans('InvoiceCustomer')); + dol_fiche_head($head, 'compta', $langs->trans('InvoiceCustomer'), 0, 'bill'); // Confirmation de la conversion de l'avoir en reduc if ($_GET['action'] == 'converttoreduc') @@ -3787,7 +3787,7 @@ else print ''; - print ''; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 74dd9f8a7b3..3352f2bd390 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -79,7 +79,7 @@ if ($_GET["facid"] > 0) } $head = facture_prepare_head($fac); - dol_fiche_head($head, 'preview', $langs->trans("InvoiceCustomer")); + dol_fiche_head($head, 'preview', $langs->trans("InvoiceCustomer"), 0, 'bill'); /* diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php index 6ca4fcd6418..b3ab1770840 100644 --- a/htdocs/compta/facture/contact.php +++ b/htdocs/compta/facture/contact.php @@ -165,7 +165,7 @@ if ($id > 0) $head = facture_prepare_head($facture); - dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer')); + dol_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), 0, 'bill'); /* * Facture synthese pour rappel diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php index 39f0c2f04ba..bff24e396e1 100644 --- a/htdocs/compta/facture/document.php +++ b/htdocs/compta/facture/document.php @@ -125,7 +125,7 @@ if ($facid > 0) $societe->fetch($facture->socid); $head = facture_prepare_head($facture); - dol_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer')); + dol_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), 0, 'bill'); // Construit liste des fichiers diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php index 18db296696b..f181ea60961 100644 --- a/htdocs/compta/facture/info.php +++ b/htdocs/compta/facture/info.php @@ -30,14 +30,13 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php'); $langs->load("bills"); -llxHeader(); - /* - * Visualisation de la fiche - * + * View */ +llxHeader(); + $fac = new Facture($db); $fac->fetch($_GET["facid"]); $fac->info($_GET["facid"]); @@ -46,7 +45,7 @@ $soc = new Societe($db, $fac->socid); $soc->fetch($fac->socid); $head = facture_prepare_head($fac); -dol_fiche_head($head, 'info', $langs->trans("InvoiceCustomer")); +dol_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"), 0, 'bill'); print '
'; + print ''; print $facturestatic->getNomUrl(1); print $objp->increment; print '
'; diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php index 461c3c54ecc..6f3a6ca831a 100644 --- a/htdocs/compta/facture/note.php +++ b/htdocs/compta/facture/note.php @@ -35,8 +35,8 @@ if (!$user->rights->facture->lire) $langs->load("companies"); $langs->load("bills"); -// Sécurité accés -if ($user->societe_id > 0) +// S�curit� acc�s +if ($user->societe_id > 0) { unset($_GET["action"]); $socid = $user->societe_id; @@ -54,7 +54,7 @@ $fac->fetch($_GET["facid"]); if ($_POST["action"] == 'update_public' && $user->rights->facture->creer) { $db->begin(); - + $res=$fac->update_note_public($_POST["note_public"],$user); if ($res < 0) { @@ -70,7 +70,7 @@ if ($_POST["action"] == 'update_public' && $user->rights->facture->creer) if ($_POST["action"] == 'update' && $user->rights->facture->creer) { $db->begin(); - + $res=$fac->update_note($_POST["note"],$user); if ($res < 0) { @@ -99,7 +99,7 @@ if ($_GET["facid"]) $soc->fetch($fac->socid); $head = facture_prepare_head($fac); - dol_fiche_head($head, 'note', $langs->trans("InvoiceCustomer")); + dol_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), 0, 'bill'); print ''; @@ -107,7 +107,7 @@ if ($_GET["facid"]) // Reference print ''; - // Société + // Soci�t� print ''; print ''; @@ -129,7 +129,7 @@ if ($_GET["facid"]) } print ""; - // Note privée + // Note priv�e if (! $user->societe_id) { print ''; @@ -149,7 +149,7 @@ if ($_GET["facid"]) } print ""; } - + print "
'.$langs->trans('Ref').''.$fac->ref.'
'.$langs->trans("Company").''.$soc->getNomUrl(1,'compta').'
'.$langs->trans("NotePrivate").' :
"; diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index a2116c5ee22..a47463d1285 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -109,7 +109,7 @@ if ($_REQUEST['action'] == 'confirm_valide' && $_REQUEST['confirm'] == 'yes' && /* - * Visualisation de la fiche + * View */ llxHeader(); @@ -136,7 +136,7 @@ $head[$h][1] = $langs->trans("Info"); $h++; -dol_fiche_head($head, $hselected, $langs->trans("PaymentCustomerInvoice")); +dol_fiche_head($head, $hselected, $langs->trans("PaymentCustomerInvoice"), 0, 'payment'); /* * Confirmation de la suppression du paiement diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php index d28bcb26d58..541bcb934c8 100644 --- a/htdocs/compta/paiement/info.php +++ b/htdocs/compta/paiement/info.php @@ -18,11 +18,11 @@ */ /** - \file htdocs/compta/paiement/info.php - \ingroup facture - \brief Onglet info d'un paiement - \version $Id$ -*/ + * \file htdocs/compta/paiement/info.php + * \ingroup facture + * \brief Onglet info d'un paiement + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); @@ -55,7 +55,7 @@ $hselected = $h; $h++; -dol_fiche_head($head, $hselected, $langs->trans("PaymentCustomerInvoice")); +dol_fiche_head($head, $hselected, $langs->trans("PaymentCustomerInvoice"), 0, 'payment'); print ''; diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index ffaefb2fad4..dc85ce5b37e 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -175,7 +175,7 @@ if ($id > 0) $hselected=1; - dol_fiche_head($head, $hselected, $langs->trans("Contract")); + dol_fiche_head($head, $hselected, $langs->trans("Contract"), 0, 'contract'); /* * Contrat diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php index 2acc56f6975..5e14606438a 100644 --- a/htdocs/contrat/document.php +++ b/htdocs/contrat/document.php @@ -122,7 +122,7 @@ if ($contrat->id) $head=contract_prepare_head($contrat, $user); - dol_fiche_head($head, 'documents', $langs->trans("Contract")); + dol_fiche_head($head, 'documents', $langs->trans("Contract"), 0, 'contract'); // Construit liste des fichiers diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 0512b69036c..b2ae1a7ae62 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -441,7 +441,7 @@ $contratlignestatic=new ContratLigne($db); *********************************************************************/ if ($_GET["action"] == 'create') { - dol_fiche_head($head, $a, $langs->trans("AddContract")); + dol_fiche_head($head, $a, $langs->trans("AddContract"), 0, 'contract'); if ($mesg) print $mesg; @@ -647,7 +647,7 @@ else $hselected = 0; - dol_fiche_head($head, $hselected, $langs->trans("Contract")); + dol_fiche_head($head, $hselected, $langs->trans("Contract"), 0, 'contract'); /* diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php index 0c6804b1804..b7942dd1633 100644 --- a/htdocs/contrat/info.php +++ b/htdocs/contrat/info.php @@ -48,7 +48,7 @@ $contrat->info($_GET["id"]); $head = contract_prepare_head($contrat); -dol_fiche_head($head, 'info', $langs->trans("Contract")); +dol_fiche_head($head, 'info', $langs->trans("Contract"), 0, 'contract'); print '
'; diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 9ff5046f423..5b47ffef578 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -53,7 +53,7 @@ $contrat->fetch($_GET["id"]); if ($_POST["action"] == 'update_public' && $user->rights->contrat->creer) { $db->begin(); - + $res=$contrat->update_note_public($_POST["note_public"],$user); if ($res < 0) { @@ -69,7 +69,7 @@ if ($_POST["action"] == 'update_public' && $user->rights->contrat->creer) if ($_POST["action"] == 'update' && $user->rights->contrat->creer) { $db->begin(); - + $res=$contrat->update_note($_POST["note"],$user); if ($res < 0) { @@ -95,7 +95,7 @@ $html = new Form($db); if ($_GET["id"]) { if ($mesg) print $mesg; - + $soc = new Societe($db, $contrat->societe->id); $soc->fetch($contrat->societe->id); @@ -103,7 +103,7 @@ if ($_GET["id"]) $hselected = 2; - dol_fiche_head($head, 'note', $langs->trans("Contract")); + dol_fiche_head($head, 'note', $langs->trans("Contract"), 0, 'contract'); print ''; @@ -144,7 +144,7 @@ if ($_GET["id"]) } print ""; - // Note privée + // Note priv�e if (! $user->societe_id) { print ''; diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php index 82a768acf32..33576f22590 100644 --- a/htdocs/fourn/paiement/fiche.php +++ b/htdocs/fourn/paiement/fiche.php @@ -19,11 +19,11 @@ */ /** - \file htdocs/fourn/paiement/fiche.php - \ingroup facture, fournisseur - \brief Onglet paiement d'un paiement fournisseur - \remarks Fichier presque identique a compta/paiement/fiche.php - \version $Id$ + * \file htdocs/fourn/paiement/fiche.php + * \ingroup facture, fournisseur + * \brief Onglet paiement d'un paiement fournisseur + * \remarks Fichier presque identique a compta/paiement/fiche.php + * \version $Id$ */ @@ -85,7 +85,7 @@ if ($_POST['action'] == 'confirm_valide' && $_POST['confirm'] == 'yes' && $user- /* - * Visualisation de la fiche + * View */ llxHeader(); @@ -107,7 +107,7 @@ $head[$h][1] = $langs->trans('Info'); $h++; -dol_fiche_head($head, $hselected, $langs->trans('SupplierPayment')); +dol_fiche_head($head, $hselected, $langs->trans('SupplierPayment'), 0, 'payment'); /* * Confirmation de la suppression du paiement @@ -160,7 +160,7 @@ if ($conf->banque->enabled) { if ($paiement->bank_account) { - // Si compte renseigné, on affiche libelle + // Si compte renseign�, on affiche libelle $bank=new Account($db); $bank->fetch($paiement->bank_account); diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php index 56ca6178754..9a3cf81089f 100644 --- a/htdocs/fourn/paiement/info.php +++ b/htdocs/fourn/paiement/info.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2005 Laurent Destailleur + * Copyright (C) 2004-2009 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ */ /** - \file htdocs/fourn/paiement/info.php - \ingroup facture - \brief Onglet info d'un paiement fournisseur - \version $Id$ -*/ + * \file htdocs/fourn/paiement/info.php + * \ingroup facture + * \brief Onglet info d'un paiement fournisseur + * \version $Id$ + */ require("./pre.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); @@ -32,6 +32,11 @@ $langs->load("bills"); $langs->load("suppliers"); $langs->load("companies"); + +/* + * View + */ + llxHeader(); $h=0; @@ -44,14 +49,9 @@ $head[$h][1] = $langs->trans("Info"); $hselected = $h; $h++; -dol_fiche_head($head, $hselected, $langs->trans("SupplierPayment")); +dol_fiche_head($head, $hselected, $langs->trans("SupplierPayment"), 0, 'payment'); -/* - * Visualisation de la fiche - * - */ - $paiement = new PaiementFourn($db); $paiement->fetch($_GET["id"], $user); $paiement->info($_GET["id"]);
'.$langs->trans("NotePrivate").' :