Trad: Et encore des traductions (stock, factures)
This commit is contained in:
parent
e104e6f60c
commit
ad107d28e6
@ -1613,7 +1613,7 @@ else
|
|||||||
$soc->fetch($socidp);
|
$soc->fetch($socidp);
|
||||||
}
|
}
|
||||||
|
|
||||||
print_barre_liste("Factures client".($socidp?" $soc->nom":""),$page,"facture.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
|
print_barre_liste($langs->trans("BillsCustomers")." ".($socidp?" $soc->nom":""),$page,"facture.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
|
||||||
|
|
||||||
$i = 0;
|
$i = 0;
|
||||||
print '<table class="noborder" width="100%">';
|
print '<table class="noborder" width="100%">';
|
||||||
@ -1674,7 +1674,7 @@ else
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<td><a href="facture.php?facid='.$objp->facid.'">'.img_file()."</a> \n";
|
print '<td><a href="facture.php?facid='.$objp->facid.'">'.img_object($langs->trans("Bill"),"bill")."</a> ";
|
||||||
print '<a href="facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a>'.$objp->increment."</td>\n";
|
print '<a href="facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a>'.$objp->increment."</td>\n";
|
||||||
|
|
||||||
if ($objp->df > 0 )
|
if ($objp->df > 0 )
|
||||||
|
|||||||
@ -65,6 +65,8 @@ llxHeader('','Factures impay
|
|||||||
$page = $_GET["page"];
|
$page = $_GET["page"];
|
||||||
$sortorder=$_GET["sortorder"];
|
$sortorder=$_GET["sortorder"];
|
||||||
$sortfield=$_GET["sortfield"];
|
$sortfield=$_GET["sortfield"];
|
||||||
|
if (! $sortorder) $sortorder="DESC";
|
||||||
|
if (! $sortfield) $sortfield="f.datef";
|
||||||
|
|
||||||
if ($page == -1)
|
if ($page == -1)
|
||||||
{
|
{
|
||||||
@ -76,11 +78,6 @@ if ($user->rights->facture->lire)
|
|||||||
$limit = $conf->liste_limit;
|
$limit = $conf->liste_limit;
|
||||||
$offset = $limit * $page ;
|
$offset = $limit * $page ;
|
||||||
|
|
||||||
if ($sortorder == "")
|
|
||||||
$sortorder="DESC";
|
|
||||||
|
|
||||||
if ($sortfield == "")
|
|
||||||
$sortfield="f.datef";
|
|
||||||
|
|
||||||
$sql = "SELECT s.nom,s.idp,f.facnumber,f.increment,f.total,f.total_ttc,".$db->pdate("f.datef")." as df, f.paye as paye, f.rowid as facid, f.fk_statut, sum(pf.amount) as am";
|
$sql = "SELECT s.nom,s.idp,f.facnumber,f.increment,f.total,f.total_ttc,".$db->pdate("f.datef")." as df, f.paye as paye, f.rowid as facid, f.fk_statut, sum(pf.amount) as am";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
|
||||||
@ -150,7 +147,7 @@ if ($user->rights->facture->lire)
|
|||||||
$soc->fetch($socidp);
|
$soc->fetch($socidp);
|
||||||
}
|
}
|
||||||
|
|
||||||
print_barre_liste("Factures client".($socidp?" $soc->nom":""),$page,"impayees.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
|
print_barre_liste($langs->trans("BillsCustomersUnpayed")." ".($socidp?" $soc->nom":""),$page,"impayees.php","&socidp=$socidp",$sortfield,$sortorder,'',$num);
|
||||||
$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">';
|
||||||
@ -198,7 +195,7 @@ if ($user->rights->facture->lire)
|
|||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
$class = "impayee";
|
$class = "impayee";
|
||||||
|
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.img_file()."</a> \n";
|
print '<td><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.img_object($langs->trans("ShowBill"),"bill")."</a> ";
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a>'.$objp->increment."</td>\n";
|
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$objp->facid.'">'.$objp->facnumber.'</a>'.$objp->increment."</td>\n";
|
||||||
|
|
||||||
if ($objp->df > 0 )
|
if ($objp->df > 0 )
|
||||||
|
|||||||
@ -41,7 +41,7 @@ if ($user->societe_id > 0)
|
|||||||
|
|
||||||
llxHeader();
|
llxHeader();
|
||||||
|
|
||||||
print_fiche_titre('Statistiques factures', $mesg);
|
print_fiche_titre($langs->trans("BillsStatistics"), $mesg);
|
||||||
|
|
||||||
$stats = new FactureStats($db, $socidp);
|
$stats = new FactureStats($db, $socidp);
|
||||||
$year = strftime("%Y", time());
|
$year = strftime("%Y", time());
|
||||||
@ -72,10 +72,10 @@ if ($db->query($sql))
|
|||||||
{
|
{
|
||||||
$num = $db->num_rows();
|
$num = $db->num_rows();
|
||||||
|
|
||||||
print '<table class="border" width="100%" cellspacing="0" cellpadding="2">';
|
print '<table class="border" width="100%">';
|
||||||
print '<tr><td align="center">'.$langs->trans("Year").'</td><td width="10%">Nb de facture</td><td align="center">Somme des factures</td>';
|
print '<tr><td align="center">'.$langs->trans("Year").'</td><td width="10%" align="center">'.$langs->trans("NumberOfBills").'</td><td align="center">'.$langs->trans("AmountTotal").'</td>';
|
||||||
print '<td align="center" valign="top" rowspan="'.($num + 1).'">';
|
print '<td align="center" valign="top" rowspan="'.($num + 1).'">';
|
||||||
print 'Nombre de factures par mois<br>';
|
print $langs->trans("NumberOfBillsByMonth").'<br>';
|
||||||
if ($mesg) { print $mesg; }
|
if ($mesg) { print $mesg; }
|
||||||
else { print '<img src="'.$fileurl.'" alt="Nombre de factures par mois">'; }
|
else { print '<img src="'.$fileurl.'" alt="Nombre de factures par mois">'; }
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
|
|||||||
@ -1,6 +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>
|
* Copyright (c) 2004-2005 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
|
||||||
@ -30,6 +30,9 @@
|
|||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
|
|
||||||
|
$GRAPHHEIGHT=240;
|
||||||
|
$GRAPHWIDTH=500;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Sécurité accés client
|
* Sécurité accés client
|
||||||
*/
|
*/
|
||||||
@ -47,7 +50,7 @@ $mesg = '<a href="month.php?year='.($year - 1).'">'.img_previous().'</a> ';
|
|||||||
$mesg.= $langs->trans("Year")." $year";
|
$mesg.= $langs->trans("Year")." $year";
|
||||||
$mesg.= ' <a href="month.php?year='.($year + 1).'">'.img_next().'</a>';
|
$mesg.= ' <a href="month.php?year='.($year + 1).'">'.img_next().'</a>';
|
||||||
|
|
||||||
print_fiche_titre('Statistiques des factures '.$year, $mesg);
|
print_fiche_titre($langs->trans("BillsStatistics"), $mesg);
|
||||||
|
|
||||||
$stats = new FactureStats($db, $socidp);
|
$stats = new FactureStats($db, $socidp);
|
||||||
$data = $stats->getNbByMonth($year);
|
$data = $stats->getNbByMonth($year);
|
||||||
@ -61,8 +64,8 @@ $px = new BarGraph($data);
|
|||||||
$mesg = $px->isGraphKo();
|
$mesg = $px->isGraphKo();
|
||||||
if (! $mesg) {
|
if (! $mesg) {
|
||||||
$px->SetMaxValue($px->GetMaxValue());
|
$px->SetMaxValue($px->GetMaxValue());
|
||||||
$px->SetWidth(500);
|
$px->SetWidth($GRAPHWIDTH);
|
||||||
$px->SetHeight(280);
|
$px->SetHeight($GRAPHHEIGHT);
|
||||||
$px->draw($filename, $data, $year);
|
$px->draw($filename, $data, $year);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -83,8 +86,8 @@ $mesg = $px->isGraphKo();
|
|||||||
if (! $mesg) {
|
if (! $mesg) {
|
||||||
$px->SetYLabel($langs->trans("AmountTotal"));
|
$px->SetYLabel($langs->trans("AmountTotal"));
|
||||||
$px->SetMaxValue($px->GetAmountMaxValue());
|
$px->SetMaxValue($px->GetAmountMaxValue());
|
||||||
$px->SetWidth(500);
|
$px->SetWidth($GRAPHWIDTH);
|
||||||
$px->SetHeight(250);
|
$px->SetHeight($GRAPHHEIGHT);
|
||||||
$px->draw($filename_amount, $data, $year);
|
$px->draw($filename_amount, $data, $year);
|
||||||
}
|
}
|
||||||
$res = $stats->getAverageByMonth($year);
|
$res = $stats->getAverageByMonth($year);
|
||||||
@ -104,13 +107,13 @@ $mesg = $px->isGraphKo();
|
|||||||
if (! $mesg) {
|
if (! $mesg) {
|
||||||
$px->SetYLabel($langs->trans("AmountAverage"));
|
$px->SetYLabel($langs->trans("AmountAverage"));
|
||||||
$px->SetMaxValue($px->GetAmountMaxValue());
|
$px->SetMaxValue($px->GetAmountMaxValue());
|
||||||
$px->SetWidth(500);
|
$px->SetWidth($GRAPHWIDTH);
|
||||||
$px->SetHeight(250);
|
$px->SetHeight($GRAPHHEIGHT);
|
||||||
$px->draw($filename_avg, $data, $year);
|
$px->draw($filename_avg, $data, $year);
|
||||||
}
|
}
|
||||||
|
|
||||||
print '<table class="border" width="100%" cellspacing="0" cellpadding="2">';
|
print '<table class="border" width="100%">';
|
||||||
print '<tr><td align="center">Nombre par mois</td>';
|
print '<tr><td align="center">'.$langs->trans("NumberOfBillsByMonth").'</td>';
|
||||||
print '<td align="center">';
|
print '<td align="center">';
|
||||||
if ($mesg) { print $mesg; }
|
if ($mesg) { print $mesg; }
|
||||||
else { print '<img src="'.$fileurl.'">'; }
|
else { print '<img src="'.$fileurl.'">'; }
|
||||||
|
|||||||
@ -1,6 +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>
|
* Copyright (C) 2004-2005 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
|
||||||
@ -20,7 +20,16 @@
|
|||||||
* $Source$
|
* $Source$
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
\file htdocs/compta/paiement/liste.php
|
||||||
|
\ingroup compta
|
||||||
|
\brief Page liste des paiements des factures clients
|
||||||
|
\version $Revision$
|
||||||
|
*/
|
||||||
|
|
||||||
require("./pre.inc.php");
|
require("./pre.inc.php");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Sécurité accés client
|
* Sécurité accés client
|
||||||
*/
|
*/
|
||||||
@ -37,6 +46,8 @@ if ($user->societe_id > 0)
|
|||||||
llxHeader();
|
llxHeader();
|
||||||
|
|
||||||
$page=$_GET["page"];
|
$page=$_GET["page"];
|
||||||
|
$sortorder=$_GET["sortorder"];
|
||||||
|
$sortfield=$_GET["sortfield"];
|
||||||
|
|
||||||
if ($page == -1)
|
if ($page == -1)
|
||||||
$page = 0 ;
|
$page = 0 ;
|
||||||
@ -44,11 +55,8 @@ if ($page == -1)
|
|||||||
$limit = $conf->liste_limit;
|
$limit = $conf->liste_limit;
|
||||||
$offset = $limit * $page ;
|
$offset = $limit * $page ;
|
||||||
|
|
||||||
if ($sortorder == "")
|
if (! $sortorder) $sortorder="DESC";
|
||||||
$sortorder="DESC";
|
if (! $sortfield) $sortfield="p.rowid";
|
||||||
|
|
||||||
if ($sortfield == "")
|
|
||||||
$sortfield="p.rowid";
|
|
||||||
|
|
||||||
$sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount, p.statut";
|
$sql = "SELECT p.rowid,".$db->pdate("p.datep")." as dp, p.amount, p.statut";
|
||||||
$sql .=", c.libelle as paiement_type, p.num_paiement";
|
$sql .=", c.libelle as paiement_type, p.num_paiement";
|
||||||
@ -69,9 +77,10 @@ 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>'.$langs->trans("Date").'</td>';
|
print_liste_field_titre($langs->trans("Ref"),"liste.php","p.rowid","","","",$sortfield);
|
||||||
print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","","");
|
print_liste_field_titre($langs->trans("Date"),"liste.php","dp","","","",$sortfield);
|
||||||
print '<td align="right">'.$langs->trans("Amount").'</td>';
|
print_liste_field_titre($langs->trans("Type"),"liste.php","c.libelle","","","",$sortfield);
|
||||||
|
print '<td align="right">'.$langs->trans("AmountTTC").'</td>';
|
||||||
print "<td> </td>";
|
print "<td> </td>";
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|
||||||
@ -80,9 +89,8 @@ if ($result)
|
|||||||
$objp = $db->fetch_object($result);
|
$objp = $db->fetch_object($result);
|
||||||
$var=!$var;
|
$var=!$var;
|
||||||
print "<tr $bc[$var]>";
|
print "<tr $bc[$var]>";
|
||||||
print '<td><a href="fiche.php?id='.$objp->rowid.'">';
|
print '<td><a href="fiche.php?id='.$objp->rowid.'">'.img_file().' '.$objp->rowid.'</td>';
|
||||||
print img_file();
|
print '<td>'.dolibarr_print_date($objp->dp)."</td>\n";
|
||||||
print "</a> ".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>';
|
print '<td align="right">'.price($objp->amount).'</td>';
|
||||||
print '<td align="center">';
|
print '<td align="center">';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user