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

Qual: Uniformisation du code en passant tous les tableaux qui utilisaient print_liste_field_titre et print_liste_field_titre_new sur le modle de print_liste_field_titre_new (plus complet, l'autre fonction a t supprime).

Browse Source 
Trad: Et encore de la traduction
This commit is contained in:
Laurent Destailleur 2004-10-31 13:00:04 +00:00
parent 2a4f9ce870
commit dafa165943
26 changed files with 140 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/admin/dict.php
View File

@ -48,6 +48,9 @@ $active = 1;
// Cette page est une page d'édition générique des dictionnaires de données // Cette page est une page d'édition générique des dictionnaires de données
// Mettre ici tous les caractéristiques des dictionnaires // Mettre ici tous les caractéristiques des dictionnaires
// Ordres d'affichage des dictionnaires (0 pour espace)
$taborder=array(4,3,2,0,1,0,5,0,6,0,7);
// Nom des tables des dictionnaires // Nom des tables des dictionnaires
$tabname[1] = MAIN_DB_PREFIX."c_forme_juridique"; $tabname[1] = MAIN_DB_PREFIX."c_forme_juridique";
$tabname[2] = MAIN_DB_PREFIX."c_departements"; $tabname[2] = MAIN_DB_PREFIX."c_departements";
@ -114,6 +117,9 @@ $tabrowid[7] = "id";
$msg=''; $msg='';
$sortfield=$_GET["sortfield"];
/* /*
* Actions ajout d'une entrée dans un dictionnaire de donnée * Actions ajout d'une entrée dans un dictionnaire de donnée
*/ */
@ -244,6 +250,9 @@ if ($_GET["action"] == $acts[1]) // disable
llxHeader(); llxHeader();
/*
* Affichage d'un dictionnaire particulier
*/
if ($_GET["id"]) if ($_GET["id"])
{ {
print_titre($langs->trans("DictionnarySetup")); print_titre($langs->trans("DictionnarySetup"));
@ -356,13 +365,9 @@ if ($_GET["id"])
if ($fieldlist[$field]=='libelle') $valuetoshow=$langs->trans("Label")."*"; if ($fieldlist[$field]=='libelle') $valuetoshow=$langs->trans("Label")."*";
if ($fieldlist[$field]=='pays') $valuetoshow=$langs->trans("Country"); if ($fieldlist[$field]=='pays') $valuetoshow=$langs->trans("Country");
// Affiche nom du champ // Affiche nom du champ
print '<td>'; print_liste_field_titre($valuetoshow,"dict.php",$fieldlist[$field],"&id=".$_GET["id"],"","",$sortfield);
print_liste_field_titre($valuetoshow,"dict.php",$fieldlist[$field],"&id=".$_GET["id"]);
print '</td>';
} }
print '<td>'; print_liste_field_titre($langs->trans("Activate")."/".$langs->trans("Disable"),"dict.php","active","&id=".$_GET["id"],"","",$sortfield);
print_liste_field_titre($langs->trans("Activate")."/".$langs->trans("Disable"),"dict.php","active","&id=".$_GET["id"]);
print '</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print '</tr>'; print '</tr>';
@ -413,12 +418,23 @@ if ($_GET["id"])
} }
else else
{ {
/*
* Affichage de la liste des dictionnaires
*/
print_titre($langs->trans("DictionnarySetup")); print_titre($langs->trans("DictionnarySetup"));
print '<br>'; print '<br>';
foreach ($tabname as $i => $value) { foreach ($taborder as $i) {
if ($i) {
$value=$tabname[$i];
print '<a href="dict.php?id='.$i.'">'.$tablib[$i].'</a> (Table '.$tabname[$i].')<br>'; print '<a href="dict.php?id='.$i.'">'.$tablib[$i].'</a> (Table '.$tabname[$i].')<br>';
} }
else
{
print '<br>';
}
}
} }
print '<br>'; print '<br>';

4
htdocs/boutique/auteur/index.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 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
@ -47,9 +48,8 @@ if ( $db->query($sql) ) {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\"><td>"; print "<tr class=\"liste_titre\">";
print_liste_field_titre("Nom","index.php", "e.nom"); print_liste_field_titre("Nom","index.php", "e.nom");
print "</td>";
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
while ($i < $num) { while ($i < $num) {

14
htdocs/boutique/client/index.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 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
@ -50,11 +51,10 @@ if ( $db->query($sql) )
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\"><td>"; print "<tr class=\"liste_titre\">";
print_liste_field_titre($langs->trans("Firstname"),"index.php", "c.customers_firstname"); print_liste_field_titre($langs->trans("Firstname"),"index.php", "c.customers_firstname");
print "</td><td>";
print_liste_field_titre($langs->trans("Lastname"),"index.php", "c.customers_lastname"); print_liste_field_titre($langs->trans("Lastname"),"index.php", "c.customers_lastname");
print '</td><td>'.$langs->trans("EMail").'</td><td align="center">Newsletter</td>'; print '<td>'.$langs->trans("EMail").'</td><td align="center">'.$langs->trans("Newsletter").'</td>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
while ($i < $num) while ($i < $num)
@ -62,10 +62,10 @@ if ( $db->query($sql) )
$objp = $db->fetch_object(); $objp = $db->fetch_object();
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_firstname."</a></TD>\n"; print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_firstname."</a></td>\n";
print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_lastname."</a></TD>\n"; print '<td><a href="fiche.php?id='.$objp->customers_id.'">'.$objp->customers_lastname."</a></td>\n";
print "<td>$objp->customers_email_address</TD>\n"; print "<td>$objp->customers_email_address</td>\n";
print "<td align=\"center\">$objp->customers_newsletter</TD>\n"; print "<td align=\"center\">$objp->customers_newsletter</td>\n";
print "</tr>\n"; print "</tr>\n";
$i++; $i++;
} }

8
htdocs/boutique/commande/index.php
View File

@ -51,10 +51,12 @@ if ( $db->query($sql) )
{ {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"3\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\"><td>Numéro</td><td>".$langs->trans("Date")."</td><td>"; print "<tr class=\"liste_titre\">";
print "<td>".$langs->trans("Ref")."</td>";
print "<td>".$langs->trans("Date")."</td>";
print_liste_field_titre("Client","commande.php", "customers_name"); print_liste_field_titre("Client","commande.php", "customers_name");
print '</td><td align="right">'.$langs->trans("Total").'</td>'; print '<td align="right">'.$langs->trans("Total").'</td>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
while ($i < $num) while ($i < $num)

6
htdocs/boutique/editeur/index.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 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
@ -47,9 +48,8 @@ if ( $db->query($sql) ) {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\"><td>"; print "<tr class=\"liste_titre\">";
print_liste_field_titre("Nom","index.php", "e.nom"); print_liste_field_titre($langs->trans("Name"),"index.php", "e.nom");
print "</td>";
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
while ($i < $num) { while ($i < $num) {

6
htdocs/boutique/livre/index.php
View File

@ -62,11 +62,9 @@ if ( $db->query($sql) )
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\"><td>"; print "<tr class=\"liste_titre\">";
print_liste_field_titre($langs->trans("Ref"),"index.php", "l.ref"); print_liste_field_titre($langs->trans("Ref"),"index.php", "l.ref");
print "</td><td>"; print_liste_field_titre($langs->trans("Title"),"index.php", "l.title");
print_liste_field_titre("Titre","index.php", "l.title");
print "</td>";
print '<td colspan="3">&nbsp;</td>'; print '<td colspan="3">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;

7
htdocs/boutique/livre/vignettes.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 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
@ -61,11 +62,9 @@ if ( $db->query($sql) )
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\"><td>"; print "<tr class=\"liste_titre\">";
print_liste_field_titre($langs->trans("Ref"),"vignettes.php", "l.ref"); print_liste_field_titre($langs->trans("Ref"),"vignettes.php", "l.ref");
print "</td><td>"; print_liste_field_titre($langs->trans("Title"),"vignettes.php", "l.title");
print_liste_field_titre("Titre","vignettes.php", "l.title");
print "</td>";
print '<td colspan="3">&nbsp;</td>'; print '<td colspan="3">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;

6
htdocs/boutique/newsletter/index.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 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
@ -48,9 +49,8 @@ if ( $db->query($sql) )
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\"><td>"; print "<tr class=\"liste_titre\">";
print_liste_field_titre("Sujet","index.php", "email_subject"); print_liste_field_titre($langs->trans("Subject"),"index.php", "email_subject");
print "</td>";
print '<td align="center">'.$langs->trans("Status").'</td>'; print '<td align="center">'.$langs->trans("Status").'</td>';
print '<td align="center">Nb envois</td>'; print '<td align="center">Nb envois</td>';
print "</tr>\n"; print "</tr>\n";

8
htdocs/boutique/notification/index.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Éric Seigne <erics@rycks.com> * Copyright (C) 2003 Éric Seigne <erics@rycks.com>
* Copyright (C) 2004 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
@ -23,6 +24,8 @@
require("./pre.inc.php"); require("./pre.inc.php");
$langs->load("products");
llxHeader(); llxHeader();
if ($sortfield == "") { if ($sortfield == "") {
@ -52,10 +55,9 @@ if ( $db->query($sql) )
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print "<table class=\noborder\" width=\"100%\">"; print "<table class=\noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\"><td>"; print "<tr class=\"liste_titre\">";
print_liste_field_titre("Client","index.php", "c.customers_lastname"); print_liste_field_titre("Client","index.php", "c.customers_lastname");
print "</td>"; print '<td>'.$langs->trans("Product").'</td>';
print "<td>Produit</td>";
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;
while ($i < $num) while ($i < $num)

11
htdocs/comm/clients.php
View File

@ -116,16 +116,11 @@ if ($result)
$i = 0; $i = 0;
$addu = "&amp;page=$page&amp;begin=$begin&amp;search_nom=".$_GET["search_nom"];
print '<table class="liste">'; print '<table class="liste">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print "<td valign=\"right\">"; print_liste_field_titre($langs->trans("Companies"),"clients.php","s.nom",$addu,"",'valign="right"');
print_liste_field_titre($langs->trans("Town"),"clients.php","s.ville",$addu);
$addu = "&amp;page=$page&amp;begin=$begin&amp;search_nom=".$_GET["search_nom"];
print_liste_field_titre("Société","clients.php","s.nom",$addu);
print "</td><td>";
print_liste_field_titre("Ville","clients.php","s.ville",$addu);
print "</td>";
print "</tr>\n"; print "</tr>\n";
print '<form method="get" action="clients.php">'; print '<form method="get" action="clients.php">';

6
htdocs/comm/contact.php
View File

@ -160,13 +160,11 @@ if ($result)
} }
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">'; print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre"><td>'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Lastname"),"contact.php","lower(p.name)", $begin,"&amp;type=$type"); print_liste_field_titre($langs->trans("Lastname"),"contact.php","lower(p.name)", $begin,"&amp;type=$type");
print "</td><td>";
print_liste_field_titre($langs->trans("Firstname"),"contact.php","lower(p.firstname)", $begin,"&amp;type=$type"); print_liste_field_titre($langs->trans("Firstname"),"contact.php","lower(p.firstname)", $begin,"&amp;type=$type");
print "</td><td>";
print_liste_field_titre($langs->trans("Company"),"contact.php","lower(s.nom)", $begin,"&amp;type=$type"); print_liste_field_titre($langs->trans("Company"),"contact.php","lower(s.nom)", $begin,"&amp;type=$type");
print '</td><td>'.$langs->trans("Lastname").'</td>'; print '<td>'.$langs->trans("Lastname").'</td>';
print '<td>'.$langs->trans("Phone").'</td>'; print '<td>'.$langs->trans("Phone").'</td>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;

16
htdocs/comm/propal.php
View File

@ -879,18 +879,14 @@ else
$i = 0; $i = 0;
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),"propal.php","p.ref","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut",'width="15%"',$sortfield);
print_liste_field_titre_new ($langs->trans("Ref"),"propal.php","p.ref","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut",'width="15%"',$sortfield); print_liste_field_titre($langs->trans("Company"),"propal.php","s.nom","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut",'width="30%"',$sortfield);
print_liste_field_titre($langs->trans("Date"),"propal.php","p.datep","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut", 'width="25%" align="right" colspan="2"',$sortfield);
print_liste_field_titre_new ("Société","propal.php","s.nom","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut",'width="30%"',$sortfield); print_liste_field_titre($langs->trans("Price"),"propal.php","p.price","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut", ' width="20%" align="right"',$sortfield);
print_liste_field_titre($langs->trans("Status"),"propal.php","p.fk_statut","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut",'width="10%" align="center"',$sortfield);
print_liste_field_titre_new ($langs->trans("Date"),"propal.php","p.datep","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut", 'width="25%" align="right" colspan="2"',$sortfield);
print_liste_field_titre_new ($langs->trans("Price"),"propal.php","p.price","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut", ' width="20%" align="right"',$sortfield);
print_liste_field_titre_new ($langs->trans("Status"),"propal.php","p.fk_statut","","&amp;socidp=$socidp&amp;viewstatut=$viewstatut",'width="10%" align="center"',$sortfield);
print "</tr>\n"; print "</tr>\n";
$var=true; $var=true;

12
htdocs/comm/prospect/prospects.php
View File

@ -145,18 +145,12 @@ if ($result)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print "<td valign=\"center\">"; print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom","","","valign=\"center\">");
print_liste_field_titre($langs->trans("Company"),"prospects.php","s.nom");
print "</td><td>";
print_liste_field_titre($langs->trans("Town"),"prospects.php","s.ville"); print_liste_field_titre($langs->trans("Town"),"prospects.php","s.ville");
print "</td>"; print_liste_field_titre("Département","prospects.php","s.fk_departement","","","align=\"center\"");
print "<td align=\"center\">";
print_liste_field_titre("Département","prospects.php","s.fk_departement");
print "</td><td>";
print_liste_field_titre($langs->trans("Status"),"prospects.php","s.fk_stcomm"); print_liste_field_titre($langs->trans("Status"),"prospects.php","s.fk_stcomm");
print "</td><td>";
print_liste_field_titre("Insertion","prospects.php","s.datec"); print_liste_field_titre("Insertion","prospects.php","s.datec");
print '</td><td colspan="4">&nbsp;</td>'; print '<td colspan="4">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
$var=true; $var=true;

16
htdocs/commande/liste.php
View File

@ -89,18 +89,12 @@ if ( $db->query($sql) )
print_barre_liste($langs->trans("Orders"), $_GET["page"], "liste.php","&amp;socidp=$socidp",$sortfield,$sortorder,'',$num); print_barre_liste($langs->trans("Orders"), $_GET["page"], "liste.php","&amp;socidp=$socidp",$sortfield,$sortorder,'',$num);
$i = 0; $i = 0;
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Ref"),"liste.php","c.ref","","&amp;socidp=$socidp",'width="15%"',$sortfield);
print_liste_field_titre_new ($langs->trans("Ref"),"liste.php","c.ref","","&amp;socidp=$socidp",'width="15%"',$sortfield); print_liste_field_titre($langs->trans("Company"),"liste.php","s.nom","","&amp;socidp=$socidp",'width="30%"',$sortfield);
print_liste_field_titre($langs->trans("Date"),"liste.php","c.date_commande","","&amp;socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield);
print_liste_field_titre_new ($langs->trans("Company"),"liste.php","s.nom","","&amp;socidp=$socidp",'width="30%"',$sortfield); print_liste_field_titre($langs->trans("Status"),"liste.php","c.fk_statut","","&amp;socidp=$socidp",'width="10%" align="center"',$sortfield);
print_liste_field_titre_new ($langs->trans("Date"),"liste.php","c.date_commande","","&amp;socidp=$socidp", 'width="25%" align="right" colspan="2"',$sortfield);
print_liste_field_titre_new ($langs->trans("Status"),"liste.php","c.fk_statut","","&amp;socidp=$socidp",'width="10%" align="center"',$sortfield);
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;

8
htdocs/compta/clients.php
View File

@ -36,6 +36,8 @@ if ($conf->webcal->enabled) {
require("../lib/webcal.class.php"); require("../lib/webcal.class.php");
} }
$langs->laod("companies");
llxHeader(); llxHeader();
/* /*
@ -226,9 +228,9 @@ if ($result)
$sortorder="DESC"; $sortorder="DESC";
} }
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td valign="center">'; print '<tr class="liste_titre">';
print_liste_field_titre("Société","clients.php","s.nom"); print_liste_field_titre($langs->trans("Company"),"clients.php","s.nom","","",'valign="center"');
print "</td><td>Ville</td>"; print '<td>'.$langs->trans("Company").'</td>';
print "<td align=\"center\">Préfix</td><td colspan=\"2\">&nbsp;</td></tr>\n"; print "<td align=\"center\">Préfix</td><td colspan=\"2\">&nbsp;</td></tr>\n";
$var=True; $var=True;

7
htdocs/compta/config.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* $Id$ * $Id$
* $Source$ * $Source$
@ -57,11 +58,11 @@ if ($action == 'create') {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"3\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print "<td>Num&eacute;ro</td><td>"; print "<td>Num&eacute;ro</td>";
print_liste_field_titre($langs->trans("Label"),"config.php","label"); print_liste_field_titre($langs->trans("Label"),"config.php","label");
print "</td></tr>\n"; print "</tr>\n";
if ($num > 0) { if ($num > 0) {
$var=True; $var=True;

8
htdocs/compta/deplacement/index.php
View File

@ -66,11 +66,11 @@ if ( $db->query($sql) )
print_barre_liste("Liste des déplacements", $page, "index.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); print_barre_liste("Liste des déplacements", $page, "index.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
$i = 0; $i = 0;
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print_liste_field_titre_new ("Date","index.php","d.dated","","&socidp=$socidp",'',$sortfield); print_liste_field_titre($langs->trans("Date"),"index.php","d.dated","","&socidp=$socidp",'',$sortfield);
print_liste_field_titre_new ("Société","index.php","s.nom","","&socidp=$socidp",'',$sortfield); print_liste_field_titre($langs->trans("Company"),"index.php","s.nom","","&socidp=$socidp",'',$sortfield);
print '<td align="center">Utilisateur</TD>'; print_liste_field_titre($langs->trans("User"),"index.php","u.name","","&socidp=$socidp",'',$sortfield);
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;

19
htdocs/compta/dons/liste.php
View File

@ -74,18 +74,13 @@ if ($result)
print "<table class=\"noborder\" width=\"100%\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print "<td>"; print_liste_field_titre($langs->trans("Firstname"),"liste.php","d.prenom","&page=$page&statut=$statut");
print_liste_field_titre("Prénom","liste.php","d.prenom","&page=$page&statut=$statut"); print_liste_field_titre($langs->trans("Name"),"liste.php","d.nom","&page=$page&statut=$statut");
print "</td><td>"; print_liste_field_titre($langs->trans("Company"),"liste.php","d.societe","&page=$page&statut=$statut");
print_liste_field_titre("Nom","liste.php","d.nom","&page=$page&statut=$statut"); print_liste_field_titre($langs->trans("Date"),"liste.php","d.datedon","&page=$page&statut=$statut");
print "</td><td>"; print_liste_field_titre($langs->trans("Project"),"liste.php","","&page=$page&statut=$statut");
print_liste_field_titre("Société","liste.php","d.societe","&page=$page&statut=$statut"); print_liste_field_titre($langs->trans("Amount"),"liste.php","d.amount","&page=$page&statut=$statut","",'align="right"');
print "</td><td>"; print '<td>&nbsp;</td>';
print_liste_field_titre("Date","liste.php","d.datedon","&page=$page&statut=$statut");
print "</td><td>Projet</td>";
print "<td align=\"right\">";
print_liste_field_titre("Montant","liste.php","d.amount","&page=$page&statut=$statut");
print '</td><td>&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";
$var=True; $var=True;

18
htdocs/compta/facture.php
View File

@ -1497,21 +1497,13 @@ else
$i = 0; $i = 0;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>';
print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","","&amp;socidp=$socidp"); print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"f.facnumber","","&amp;socidp=$socidp");
print '</td><td align="center">'; print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","","&amp;socidp=$socidp",'align="center"');
print_liste_field_titre($langs->trans("Date"),$_SERVER["PHP_SELF"],"f.datef","","&amp;socidp=$socidp");
print '</td><td>';
print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&amp;socidp=$socidp"); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","","&amp;socidp=$socidp");
print '</td><td align="right">'; print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&amp;socidp=$socidp",'align="right"');
print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"f.total","","&amp;socidp=$socidp"); print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","","&amp;socidp=$socidp",'align="right"');
print '</td><td align="right">'; print_liste_field_titre($langs->trans("Received"),$_SERVER["PHP_SELF"],"am","","&amp;socidp=$socidp",'align="right"');
print_liste_field_titre($langs->trans("AmountTTC"),$_SERVER["PHP_SELF"],"f.total_ttc","","&amp;socidp=$socidp"); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","","&amp;socidp=$socidp",'align="right"');
print '</td><td align="right">';
print_liste_field_titre("Reçu",$_SERVER["PHP_SELF"],"am","","&amp;socidp=$socidp");
print '</td><td align="center">';
print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"fk_statut,paye","","&amp;socidp=$socidp");
print '</td>';
print "</tr>\n"; print "</tr>\n";
if ($num > 0) if ($num > 0)

24
htdocs/compta/facture/fiche-rec.php
View File

@ -420,15 +420,13 @@ else
print_barre_liste("Factures",$page,"fiche-rec.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); print_barre_liste("Factures",$page,"fiche-rec.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
$i = 0; $i = 0;
print "<TABLE border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<TR class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>Titre</td>'; print '<td>'.$langs->trans("Ref").'</td>';
print '<td>'; print_liste_field_titre($langs->trans("Company"),"fiche-rec.php","s.nom","","&socidp=$socidp");
print_liste_field_titre("Société","fiche-rec.php","s.nom","","&socidp=$socidp"); print '</td><td align="right">'.$langs->trans("Amount").'</td>';
print '</td><TD align="right">Montant</TD>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
print "</TR>\n"; print "</td>\n";
if ($num > 0) if ($num > 0)
{ {
@ -443,10 +441,10 @@ else
$class = "normal"; $class = "normal";
print '<td><a class="'.$class.'" href="fiche-rec.php?facid='.$objp->facid.'">' . $objp->titre; print '<td><a class="'.$class.'" href="fiche-rec.php?facid='.$objp->facid.'">' . $objp->titre;
print "</a></TD>\n"; print "</a></td>\n";
print '<TD><a class="'.$class.'" href="../fiche.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>'; print '<td><a class="'.$class.'" href="../fiche.php?socid='.$objp->idp.'">'.$objp->nom.'</a></td>';
print "<TD align=\"right\">".price($objp->total)."</TD>\n"; print "<td align=\"right\">".price($objp->total)."</td>\n";
if (! $objp->paye) if (! $objp->paye)
{ {
@ -464,7 +462,7 @@ else
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
} }
print "</TR>\n"; print "</tr>\n";
$i++; $i++;
} }
} }
@ -474,7 +472,7 @@ else
} }
else else
{ {
print $db->error() . "<br>" . $sql; dolibarr_print_error($db);
} }
} }

10
htdocs/compta/ligne.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* $Id$ * $Id$
* $Source$ * $Source$
@ -69,15 +70,13 @@ if ($action == 'create') {
*/ */
print_barre_liste("Comptes comptable",$page,"ligne.php"); print_barre_liste("Comptes comptable",$page,"ligne.php");
print "<table class=\"noborder\" width=\"100%\">";
print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"3\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print "<td>Num&eacute;ro</TD><td>"; print_liste_field_titre($langs->trans("Ref"),"ligne.php","id");
print_liste_field_titre($langs->trans("Label"),"ligne.php","label"); print_liste_field_titre($langs->trans("Label"),"ligne.php","label");
print "</td><td>Montant</TD>"; print '<td>'.$langs->trans("Amount").'</td>';
print "</tr>\n"; print "</tr>\n";
print '<form action="ligne.php" method="post">'; print '<form action="ligne.php" method="post">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
print '<tr><td><select name="number">'.$options.'</select></td>'; print '<tr><td><select name="number">'.$options.'</select></td>';
@ -87,7 +86,6 @@ if ($action == 'create') {
print '</tr>'; print '</tr>';
print '</form>'; print '</form>';
$sql = "SELECT ca.number, c.label, c.amount"; $sql = "SELECT ca.number, c.label, c.amount";
$sql .= " FROM ".MAIN_DB_PREFIX."compta_account as ca, ".MAIN_DB_PREFIX."compta as c WHERE c.fk_compta_account = ca.rowid"; $sql .= " FROM ".MAIN_DB_PREFIX."compta_account as ca, ".MAIN_DB_PREFIX."compta as c WHERE c.fk_compta_account = ca.rowid";
$sql .= " ORDER BY ca.number"; $sql .= " ORDER BY ca.number";

21
htdocs/compta/paiement.php
View File

@ -363,25 +363,24 @@ if ($action == '')
print_barre_liste("Paiements", $page, "paiement.php","",$sortfield,$sortorder,'',$num); print_barre_liste("Paiements", $page, "paiement.php","",$sortfield,$sortorder,'',$num);
print '<TABLE border="0" width="100%">'; print '<table class="noborder" width="100%">';
print '<TR class="liste_titre">'; print '<tr class="liste_titre">';
print "<td>Facture</td>"; print "<td>Facture</td>";
print "<td>Date</td>"; print "<td>Date</td>";
print "<td>"; print_liste_field_titre($langs->trans("Type"),"paiement.php","c.libelle","","");
print_liste_field_titre("Type","paiement.php","c.libelle","",""); print_liste_field_titre($langs->trans("Amount"),"paiement.php","c.libelle","","",'align="right"');
print '</td><td align="right">Montant</TD>';
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
print "</TR>\n"; print "</tr>\n";
while ($i < min($num,$limit)) while ($i < min($num,$limit))
{ {
$objp = $db->fetch_object(); $objp = $db->fetch_object();
$var=!$var; $var=!$var;
print "<TR $bc[$var]>"; print "<tr $bc[$var]>";
print "<TD><a href=\"facture.php?facid=$objp->facid\">$objp->facnumber</a></TD>\n"; print "<td><a href=\"facture.php?facid=$objp->facid\">$objp->facnumber</a></td>\n";
print "<TD>".strftime("%d %B %Y",$objp->dp)."</TD>\n"; print "<td>".strftime("%d %B %Y",$objp->dp)."</td>\n";
print "<TD>$objp->paiement_type $objp->num_paiement</TD>\n"; print "<td>$objp->paiement_type $objp->num_paiement</td>\n";
print '<TD align="right">'.price($objp->amount).'</TD><td>&nbsp;</td>'; print '<td align="right">'.price($objp->amount).'</td><td>&nbsp;</td>';
print "</tr>"; print "</tr>";
$i++; $i++;
} }

5
htdocs/compta/paiement/liste.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 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
@ -67,9 +68,9 @@ if ($result)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>Date</td><td>'; print '<td>'.$langs->trans("Date").'</td>';
print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","",""); print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","","");
print '</td><td align="right">'.$langs->trans("Amount").'</td>'; print '<td align="right">'.$langs->trans("Amount").'</td>';
print "<td>&nbsp;</td>"; print "<td>&nbsp;</td>";
print "</tr>\n"; print "</tr>\n";

12
htdocs/compta/propal.php
View File

@ -463,13 +463,13 @@ if ($_GET["propalid"])
print_barre_liste("Propositions commerciales", $page, "propal.php","&socidp=$socidp",$sortfield,$sortorder,'',$num); print_barre_liste("Propositions commerciales", $page, "propal.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
$i = 0; $i = 0;
print "<table class=\"noborder\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\">"; print "<table class=\"noborder\" width=\"100%\">";
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre_new ($langs->trans("Ref"),"propal.php","p.ref","","&year=$year&viewstatut=$viewstatut",'',$sortfield); print_liste_field_titre($langs->trans("Ref"),"propal.php","p.ref","","&year=$year&viewstatut=$viewstatut",'',$sortfield);
print_liste_field_titre_new ("Société","propal.php","s.nom","&viewstatut=$viewstatut","",'',$sortfield); print_liste_field_titre($langs->trans("Company"),"propal.php","s.nom","&viewstatut=$viewstatut","",'',$sortfield);
print_liste_field_titre_new ("Date","propal.php","p.datep","&viewstatut=$viewstatut","",'align="right" colspan="2"',$sortfield); print_liste_field_titre($langs->trans("Date"),"propal.php","p.datep","&viewstatut=$viewstatut","",'align="right" colspan="2"',$sortfield);
print_liste_field_titre_new ($langs->trans("Price"),"propal.php","p.price","&viewstatut=$viewstatut","",'align="right"',$sortfield); print_liste_field_titre($langs->trans("Price"),"propal.php","p.price","&viewstatut=$viewstatut","",'align="right"',$sortfield);
print_liste_field_titre_new ($langs->trans("Status"),"propal.php","p.fk_statut","&viewstatut=$viewstatut","",'align="center"',$sortfield); print_liste_field_titre($langs->trans("Status"),"propal.php","p.fk_statut","&viewstatut=$viewstatut","",'align="center"',$sortfield);
print "</tr>\n"; print "</tr>\n";
while ($i < min($num, $limit)) while ($i < min($num, $limit))

16
htdocs/compta/sociales/index.php
View File

@ -161,21 +161,13 @@ if ($user->rights->compta->charges->creer) {
} }
print "<tr class=\"liste_titre\">"; print "<tr class=\"liste_titre\">";
print '<td>';
print_liste_field_titre($langs->trans("Ref"),"index.php","id"); print_liste_field_titre($langs->trans("Ref"),"index.php","id");
print '</td><td>';
print_liste_field_titre($langs->trans("DateDue"),"index.php","de"); print_liste_field_titre($langs->trans("DateDue"),"index.php","de");
print '</td><td>';
print_liste_field_titre($langs->trans("Period"),"index.php","periode"); print_liste_field_titre($langs->trans("Period"),"index.php","periode");
print '</td><td align="left">'; print_liste_field_titre($langs->trans("Type"),"index.php","type","","",'align="left"');
print_liste_field_titre($langs->trans("Type"),"index.php","type"); print_liste_field_titre($langs->trans("Label"),"index.php","s.libelle","","",'align="left"');
print '</td><td align="left">'; print_liste_field_titre($langs->trans("Amount"),"index.php","s.amount","","",'align="right"');
print_liste_field_titre($langs->trans("Label"),"index.php","s.libelle"); print_liste_field_titre($langs->trans("Status"),"index.php","s.paye","","",'align="center"');
print '</td><td align="right">';
print_liste_field_titre($langs->trans("Amount"),"index.php","s.amount");
print '</td><td align="center">';
print_liste_field_titre($langs->trans("Status"),"index.php","s.paye");
print '</td>';
print "</tr>\n"; print "</tr>\n";

9
htdocs/contact/index.php
View File

@ -128,15 +128,12 @@ if ($result)
print_barre_liste($titre ,$page, "index.php", '&amp;begin='.$_GET["begin"].'&amp;view='.$_GET["view"].'&amp;userid='.$_GET["userid"], $sortfield, $sortorder,'',$num); print_barre_liste($titre ,$page, "index.php", '&amp;begin='.$_GET["begin"].'&amp;view='.$_GET["view"].'&amp;userid='.$_GET["userid"], $sortfield, $sortorder,'',$num);
print '<p><table class="noborder" width="100%" cellspacing="0" cellpadding="4">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Lastname"),"index.php","lower(p.name)", $begin); print_liste_field_titre($langs->trans("Lastname"),"index.php","lower(p.name)", $begin);
print "</td><td>";
print_liste_field_titre($langs->trans("Firstname"),"index.php","lower(p.firstname)", $begin); print_liste_field_titre($langs->trans("Firstname"),"index.php","lower(p.firstname)", $begin);
print "</td><td>";
print_liste_field_titre($langs->trans("Company"),"index.php","lower(s.nom)", $begin); print_liste_field_titre($langs->trans("Company"),"index.php","lower(s.nom)", $begin);
print '</td>';
print '<td>'.$langs->trans("Phone").'</td>'; print '<td>'.$langs->trans("Phone").'</td>';
@ -152,8 +149,6 @@ if ($result)
print "</tr>\n"; print "</tr>\n";
print '<form method="get" action="index.php">'; print '<form method="get" action="index.php">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td valign="right">'; print '<td valign="right">';