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

Fix: Misc fix. Bad links. Missing label.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-02-14 12:42:00 +00:00
parent 4a94b454a6
commit e20e67968d
5 changed files with 58 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/chargesociales.class.php
View File

@ -305,12 +305,14 @@ class ChargeSociales extends CommonObject
$result=''; $result='';
if (empty($this->ref)) $this->ref=$this->lib;
$lien = '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$this->id.'">'; $lien = '<a href="'.DOL_URL_ROOT.'/compta/sociales/charges.php?id='.$this->id.'">';
$lienfin='</a>'; $lienfin='</a>';
if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution"),'bill').$lienfin.' '); if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution").': '.$this->lib,'bill').$lienfin.' ');
if ($withpicto && $withpicto != 2) $result.=' '; if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->lib,$maxlen):$this->lib).$lienfin; if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin;
return $result; return $result;
} }

43
htdocs/compta/charges/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -28,6 +28,8 @@
require("./pre.inc.php"); require("./pre.inc.php");
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php"); require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
require_once(DOL_DOCUMENT_ROOT."/chargesociales.class.php"); require_once(DOL_DOCUMENT_ROOT."/chargesociales.class.php");
require_once(DOL_DOCUMENT_ROOT."/compta/tva/tva.class.php");
require_once(DOL_DOCUMENT_ROOT."/lib/date.lib.php");
$langs->load("compta"); $langs->load("compta");
@ -45,6 +47,8 @@ if (! $year) { $year=date("Y", time()); }
* View * View
*/ */
$tva_static = new Tva($db);
llxHeader('',$langs->trans("TaxAndDividendsArea")); llxHeader('',$langs->trans("TaxAndDividendsArea"));
print_fiche_titre($langs->trans("TaxAndDividendsArea"),($year?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":"")); print_fiche_titre($langs->trans("TaxAndDividendsArea"),($year?"<a href='index.php?year=".($year-1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='index.php?year=".($year+1)."'>".img_next()."</a>":""));
@ -62,7 +66,7 @@ print '<td width="120">'.$langs->trans("PeriodEndDate").'</td>';
print '<td>'.$langs->trans("Label").'</td>'; print '<td>'.$langs->trans("Label").'</td>';
print "<td>".$langs->trans("Type")."</td>"; print "<td>".$langs->trans("Type")."</td>";
print "<td align=\"right\">".$langs->trans("Amount")."</td>"; print "<td align=\"right\">".$langs->trans("Amount")."</td>";
print "<td align=\"right\">".$langs->trans("NbOfPayments")."</td>"; print "<td align=\"center\">".$langs->trans("NbOfPayments")."</td>";
print "<td align=\"right\">".$langs->trans("AlreadyPaid")."</td>"; print "<td align=\"right\">".$langs->trans("AlreadyPaid")."</td>";
print "</tr>\n"; print "</tr>\n";
@ -108,11 +112,11 @@ if ($resql)
$socialcontrib=new ChargeSociales($db); $socialcontrib=new ChargeSociales($db);
$socialcontrib->id=$obj->rowid; $socialcontrib->id=$obj->rowid;
$socialcontrib->lib=$obj->libelle; $socialcontrib->lib=$obj->libelle;
print $socialcontrib->getNomUrl(1,'16'); print $socialcontrib->getNomUrl(1,'20');
print '</td>'; print '</td>';
print '<td><a href="../sociales/index.php?filtre=s.fk_type:'.$obj->type.'">'.$obj->lib.'</a></td>'; print '<td><a href="../sociales/index.php?filtre=s.fk_type:'.$obj->type.'">'.$obj->lib.'</a></td>';
print '<td align="right">'.price($obj->total).'</td>'; print '<td align="right">'.price($obj->total).'</td>';
print '<td align="right">'.$obj->nb.'</td>'; print '<td align="center">'.$obj->nb.'</td>';
print '<td align="right">'.price($obj->totalpaye).'</td>'; print '<td align="right">'.price($obj->totalpaye).'</td>';
print '</tr>'; print '</tr>';
$total = $total + $obj->total; $total = $total + $obj->total;
@ -121,9 +125,9 @@ if ($resql)
$i++; $i++;
} }
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").'</td>';
print '<td align="right"><b>'.price($total)."</b></td>"; print '<td align="right" width="10%"><b>'.price($total)."</b></td>";
print '<td align="right"><b>'.$totalnb.'</b></td>'; print '<td align="center" width="15%"><b>'.$totalnb.'</b></td>';
print '<td align="right"><b>'.price($totalpaye)."</b></td>"; print '<td align="right" width="10%"><b>'.price($totalpaye)."</b></td>";
print "</tr>"; print "</tr>";
} }
else else
@ -143,14 +147,14 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
print_titre($langs->trans("VATPayments")); print_titre($langs->trans("VATPayments"));
$sql = "SELECT f.rowid, f.amount, f.label, ".$db->pdate("f.datev")." as dm"; $sql = "SELECT f.rowid, f.amount, f.label, f.datev as dm";
$sql.= " FROM ".MAIN_DB_PREFIX."tva as f "; $sql.= " FROM ".MAIN_DB_PREFIX."tva as f ";
$sql.= " WHERE f.entity = ".$conf->entity; $sql.= " WHERE f.entity = ".$conf->entity;
if ($year > 0) if ($year > 0)
{ {
// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance, // Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
$sql.= " AND date_format(f.datev, '%Y') = ".$year; $sql.= " AND f.datev between '".$db->idate(dol_get_first_day($year,1))."' AND '".$db->idate(dol_get_last_day($year,12))."'";
} }
$sql.= " ORDER BY dm DESC"; $sql.= " ORDER BY dm DESC";
@ -164,22 +168,27 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td width="120" nowrap="nowrap">'.$langs->trans("PeriodEndDate").'</td>'; print '<td width="120" nowrap="nowrap">'.$langs->trans("PeriodEndDate").'</td>';
print "<td>".$langs->trans("Label")."</td>"; print "<td>".$langs->trans("Label")."</td>";
print '<td align="right">'.$langs->trans("Amount")."</td>"; print '<td align="right" width="10%">'.$langs->trans("Amount")."</td>";
print '<td align="center">'.$langs->trans("DatePayment")."</td>"; print '<td align="center" width="15%">'.$langs->trans("DatePayment")."</td>";
print "<td align=\"right\">".$langs->trans("AlreadyPaid")."</td>"; print '<td align="right" width="10%">'.$langs->trans("AlreadyPaid")."</td>";
print "</tr>\n"; print "</tr>\n";
$var=1; $var=1;
while ($i < $num) while ($i < $num)
{ {
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$var=!$var;
print "<tr $bc[$var]>";
print '<td align="left">'.dol_print_date($obj->dm,'day').' ? </td>'."\n";
print "<td>".$obj->label."</td>\n";
$total = $total + $obj->amount; $total = $total + $obj->amount;
$var=!$var;
print "<tr $bc[$var]>";
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').' ? </td>'."\n";
$tva_static->id=$obj->rowid;
$tva_static->ref=$obj->label;
print "<td>".$tva_static->getNomUrl(1)."</td>\n";
print "<td align=\"right\">".price($obj->amount)."</td>"; print "<td align=\"right\">".price($obj->amount)."</td>";
print '<td align="center">'.dol_print_date($obj->dm,'day')."</td>\n"; print '<td align="center">'.dol_print_date($db->jdate($obj->dm),'day')."</td>\n";
print "<td align=\"right\">".price($obj->amount)."</td>"; print "<td align=\"right\">".price($obj->amount)."</td>";
print "</tr>\n"; print "</tr>\n";

6
htdocs/compta/tva/fiche.php
View File

@ -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-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -21,7 +21,7 @@
/** /**
* \file htdocs/compta/tva/fiche.php * \file htdocs/compta/tva/fiche.php
* \ingroup tax * \ingroup tax
* \brief Page des r<EFBFBD>glements de TVA * \brief Page of VAT payments
* \version $Id$ * \version $Id$
*/ */
@ -202,7 +202,7 @@ if ($id)
$head[$h][2] = 'card'; $head[$h][2] = 'card';
$h++; $h++;
dol_fiche_head($head, 'card', $langs->trans("VATPayment")); dol_fiche_head($head, 'card', $langs->trans("VATPayment"), 0, 'payment');
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';

4
htdocs/compta/tva/reglement.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2009 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -21,7 +21,7 @@
/** /**
* \file htdocs/compta/tva/reglement.php * \file htdocs/compta/tva/reglement.php
* \ingroup tax * \ingroup tax
* \brief Liste des r<EFBFBD>glements de TVA effectu<EFBFBD>s * \brief List of VAT payments
* \version $Id$ * \version $Id$
*/ */

2
htdocs/langs/fr_FR/compta.lang
View File

@ -62,7 +62,7 @@ DatePayment=Date de réglement
NewVATPayment=Nouveau réglement de TVA NewVATPayment=Nouveau réglement de TVA
VATPayment=Réglement TVA VATPayment=Réglement TVA
VATPayments=Réglements TVA VATPayments=Réglements TVA
ShowVatPayment=Affiche payment TVA ShowVatPayment=Affiche paiement TVA
TotalToPay=Total à payer TotalToPay=Total à payer
TotalVATReceived=Total TVA perçue TotalVATReceived=Total TVA perçue
CustomerAccountancyCode=Code compta client CustomerAccountancyCode=Code compta client