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

New: Add picto on tab titles

Browse Source
This commit is contained in:
Laurent Destailleur 2009-08-05 18:22:40 +00:00
parent 8abeed13b7
commit 06b9e9cd24
15 changed files with 55 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/compta/facture.php
View File

@ -2020,7 +2020,7 @@ else
$head = facture_prepare_head($fac); $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 // Confirmation de la conversion de l'avoir en reduc
if ($_GET['action'] == 'converttoreduc') if ($_GET['action'] == 'converttoreduc')
@ -3787,7 +3787,7 @@ else
print '<table class="nobordernopadding"><tr class="nocellnopadd">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">';
print '<td width="90" class="nobordernopadding" nowrap="nowrap">'; print '<td class="nobordernopadding" nowrap="nowrap">';
print $facturestatic->getNomUrl(1); print $facturestatic->getNomUrl(1);
print $objp->increment; print $objp->increment;
print '</td>'; print '</td>';

2
htdocs/compta/facture/apercu.php
View File

@ -79,7 +79,7 @@ if ($_GET["facid"] > 0)
} }
$head = facture_prepare_head($fac); $head = facture_prepare_head($fac);
dol_fiche_head($head, 'preview', $langs->trans("InvoiceCustomer")); dol_fiche_head($head, 'preview', $langs->trans("InvoiceCustomer"), 0, 'bill');
/* /*

2
htdocs/compta/facture/contact.php
View File

@ -165,7 +165,7 @@ if ($id > 0)
$head = facture_prepare_head($facture); $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 * Facture synthese pour rappel

2
htdocs/compta/facture/document.php
View File

@ -125,7 +125,7 @@ if ($facid > 0)
$societe->fetch($facture->socid); $societe->fetch($facture->socid);
$head = facture_prepare_head($facture); $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 // Construit liste des fichiers

9
htdocs/compta/facture/info.php
View File

@ -30,14 +30,13 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
$langs->load("bills"); $langs->load("bills");
llxHeader();
/* /*
* Visualisation de la fiche * View
*
*/ */
llxHeader();
$fac = new Facture($db); $fac = new Facture($db);
$fac->fetch($_GET["facid"]); $fac->fetch($_GET["facid"]);
$fac->info($_GET["facid"]); $fac->info($_GET["facid"]);
@ -46,7 +45,7 @@ $soc = new Societe($db, $fac->socid);
$soc->fetch($fac->socid); $soc->fetch($fac->socid);
$head = facture_prepare_head($fac); $head = facture_prepare_head($fac);
dol_fiche_head($head, 'info', $langs->trans("InvoiceCustomer")); dol_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"), 0, 'bill');
print '<table width="100%"><tr><td>'; print '<table width="100%"><tr><td>';

16
htdocs/compta/facture/note.php
View File

@ -35,8 +35,8 @@ if (!$user->rights->facture->lire)
$langs->load("companies"); $langs->load("companies");
$langs->load("bills"); $langs->load("bills");
// Sécurité accés // S<EFBFBD>curit<EFBFBD> acc<63>s
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
unset($_GET["action"]); unset($_GET["action"]);
$socid = $user->societe_id; $socid = $user->societe_id;
@ -54,7 +54,7 @@ $fac->fetch($_GET["facid"]);
if ($_POST["action"] == 'update_public' && $user->rights->facture->creer) if ($_POST["action"] == 'update_public' && $user->rights->facture->creer)
{ {
$db->begin(); $db->begin();
$res=$fac->update_note_public($_POST["note_public"],$user); $res=$fac->update_note_public($_POST["note_public"],$user);
if ($res < 0) if ($res < 0)
{ {
@ -70,7 +70,7 @@ if ($_POST["action"] == 'update_public' && $user->rights->facture->creer)
if ($_POST["action"] == 'update' && $user->rights->facture->creer) if ($_POST["action"] == 'update' && $user->rights->facture->creer)
{ {
$db->begin(); $db->begin();
$res=$fac->update_note($_POST["note"],$user); $res=$fac->update_note($_POST["note"],$user);
if ($res < 0) if ($res < 0)
{ {
@ -99,7 +99,7 @@ if ($_GET["facid"])
$soc->fetch($fac->socid); $soc->fetch($fac->socid);
$head = facture_prepare_head($fac); $head = facture_prepare_head($fac);
dol_fiche_head($head, 'note', $langs->trans("InvoiceCustomer")); dol_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), 0, 'bill');
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -107,7 +107,7 @@ if ($_GET["facid"])
// Reference // Reference
print '<tr><td width="20%">'.$langs->trans('Ref').'</td><td colspan="3">'.$fac->ref.'</td></tr>'; print '<tr><td width="20%">'.$langs->trans('Ref').'</td><td colspan="3">'.$fac->ref.'</td></tr>';
// Société // Soci<EFBFBD>t<EFBFBD>
print '<tr><td>'.$langs->trans("Company").'</td>'; print '<tr><td>'.$langs->trans("Company").'</td>';
print '<td colspan="3">'.$soc->getNomUrl(1,'compta').'</td>'; print '<td colspan="3">'.$soc->getNomUrl(1,'compta').'</td>';
@ -129,7 +129,7 @@ if ($_GET["facid"])
} }
print "</td></tr>"; print "</td></tr>";
// Note privée // Note priv<EFBFBD>e
if (! $user->societe_id) if (! $user->societe_id)
{ {
print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';
@ -149,7 +149,7 @@ if ($_GET["facid"])
} }
print "</td></tr>"; print "</td></tr>";
} }
print "</table>"; print "</table>";

4
htdocs/compta/paiement/fiche.php
View File

@ -109,7 +109,7 @@ if ($_REQUEST['action'] == 'confirm_valide' && $_REQUEST['confirm'] == 'yes' &&
/* /*
* Visualisation de la fiche * View
*/ */
llxHeader(); llxHeader();
@ -136,7 +136,7 @@ $head[$h][1] = $langs->trans("Info");
$h++; $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 * Confirmation de la suppression du paiement

12
htdocs/compta/paiement/info.php
View File

@ -18,11 +18,11 @@
*/ */
/** /**
\file htdocs/compta/paiement/info.php * \file htdocs/compta/paiement/info.php
\ingroup facture * \ingroup facture
\brief Onglet info d'un paiement * \brief Onglet info d'un paiement
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
@ -55,7 +55,7 @@ $hselected = $h;
$h++; $h++;
dol_fiche_head($head, $hselected, $langs->trans("PaymentCustomerInvoice")); dol_fiche_head($head, $hselected, $langs->trans("PaymentCustomerInvoice"), 0, 'payment');
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';

2
htdocs/contrat/contact.php
View File

@ -175,7 +175,7 @@ if ($id > 0)
$hselected=1; $hselected=1;
dol_fiche_head($head, $hselected, $langs->trans("Contract")); dol_fiche_head($head, $hselected, $langs->trans("Contract"), 0, 'contract');
/* /*
* Contrat * Contrat

2
htdocs/contrat/document.php
View File

@ -122,7 +122,7 @@ if ($contrat->id)
$head=contract_prepare_head($contrat, $user); $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 // Construit liste des fichiers

4
htdocs/contrat/fiche.php
View File

@ -441,7 +441,7 @@ $contratlignestatic=new ContratLigne($db);
*********************************************************************/ *********************************************************************/
if ($_GET["action"] == 'create') 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; if ($mesg) print $mesg;
@ -647,7 +647,7 @@ else
$hselected = 0; $hselected = 0;
dol_fiche_head($head, $hselected, $langs->trans("Contract")); dol_fiche_head($head, $hselected, $langs->trans("Contract"), 0, 'contract');
/* /*

2
htdocs/contrat/info.php
View File

@ -48,7 +48,7 @@ $contrat->info($_GET["id"]);
$head = contract_prepare_head($contrat); $head = contract_prepare_head($contrat);
dol_fiche_head($head, 'info', $langs->trans("Contract")); dol_fiche_head($head, 'info', $langs->trans("Contract"), 0, 'contract');
print '<table width="100%"><tr><td>'; print '<table width="100%"><tr><td>';

10
htdocs/contrat/note.php
View File

@ -53,7 +53,7 @@ $contrat->fetch($_GET["id"]);
if ($_POST["action"] == 'update_public' && $user->rights->contrat->creer) if ($_POST["action"] == 'update_public' && $user->rights->contrat->creer)
{ {
$db->begin(); $db->begin();
$res=$contrat->update_note_public($_POST["note_public"],$user); $res=$contrat->update_note_public($_POST["note_public"],$user);
if ($res < 0) if ($res < 0)
{ {
@ -69,7 +69,7 @@ if ($_POST["action"] == 'update_public' && $user->rights->contrat->creer)
if ($_POST["action"] == 'update' && $user->rights->contrat->creer) if ($_POST["action"] == 'update' && $user->rights->contrat->creer)
{ {
$db->begin(); $db->begin();
$res=$contrat->update_note($_POST["note"],$user); $res=$contrat->update_note($_POST["note"],$user);
if ($res < 0) if ($res < 0)
{ {
@ -95,7 +95,7 @@ $html = new Form($db);
if ($_GET["id"]) if ($_GET["id"])
{ {
if ($mesg) print $mesg; if ($mesg) print $mesg;
$soc = new Societe($db, $contrat->societe->id); $soc = new Societe($db, $contrat->societe->id);
$soc->fetch($contrat->societe->id); $soc->fetch($contrat->societe->id);
@ -103,7 +103,7 @@ if ($_GET["id"])
$hselected = 2; $hselected = 2;
dol_fiche_head($head, 'note', $langs->trans("Contract")); dol_fiche_head($head, 'note', $langs->trans("Contract"), 0, 'contract');
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -144,7 +144,7 @@ if ($_GET["id"])
} }
print "</td></tr>"; print "</td></tr>";
// Note privée // Note priv<EFBFBD>e
if (! $user->societe_id) if (! $user->societe_id)
{ {
print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").' :</td>';

16
htdocs/fourn/paiement/fiche.php
View File

@ -19,11 +19,11 @@
*/ */
/** /**
\file htdocs/fourn/paiement/fiche.php * \file htdocs/fourn/paiement/fiche.php
\ingroup facture, fournisseur * \ingroup facture, fournisseur
\brief Onglet paiement d'un paiement fournisseur * \brief Onglet paiement d'un paiement fournisseur
\remarks Fichier presque identique a compta/paiement/fiche.php * \remarks Fichier presque identique a compta/paiement/fiche.php
\version $Id$ * \version $Id$
*/ */
@ -85,7 +85,7 @@ if ($_POST['action'] == 'confirm_valide' && $_POST['confirm'] == 'yes' && $user-
/* /*
* Visualisation de la fiche * View
*/ */
llxHeader(); llxHeader();
@ -107,7 +107,7 @@ $head[$h][1] = $langs->trans('Info');
$h++; $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 * Confirmation de la suppression du paiement
@ -160,7 +160,7 @@ if ($conf->banque->enabled)
{ {
if ($paiement->bank_account) if ($paiement->bank_account)
{ {
// Si compte renseigné, on affiche libelle // Si compte renseign<EFBFBD>, on affiche libelle
$bank=new Account($db); $bank=new Account($db);
$bank->fetch($paiement->bank_account); $bank->fetch($paiement->bank_account);

24
htdocs/fourn/paiement/info.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -18,11 +18,11 @@
*/ */
/** /**
\file htdocs/fourn/paiement/info.php * \file htdocs/fourn/paiement/info.php
\ingroup facture * \ingroup facture
\brief Onglet info d'un paiement fournisseur * \brief Onglet info d'un paiement fournisseur
\version $Id$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
@ -32,6 +32,11 @@ $langs->load("bills");
$langs->load("suppliers"); $langs->load("suppliers");
$langs->load("companies"); $langs->load("companies");
/*
* View
*/
llxHeader(); llxHeader();
$h=0; $h=0;
@ -44,14 +49,9 @@ $head[$h][1] = $langs->trans("Info");
$hselected = $h; $hselected = $h;
$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 = new PaiementFourn($db);
$paiement->fetch($_GET["id"], $user); $paiement->fetch($_GET["id"], $user);
$paiement->info($_GET["id"]); $paiement->info($_GET["id"]);