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

Qual: Uniformise gui

Browse Source
This commit is contained in:
Laurent Destailleur 2010-02-14 13:12:05 +00:00
parent e20e67968d
commit 82cbed8dc1
4 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/chargesociales.class.php
View File

@ -767,6 +767,29 @@ class PaiementCharge extends CommonObject
return 0; return 0;
} }
} }
/**
* \brief Renvoie nom clicable (avec eventuellement le picto)
* \param withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
* \param maxlen Longueur max libelle
* \return string Chaine avec URL
*/
function getNomUrl($withpicto=0,$maxlen=0)
{
global $langs;
$result='';
if (empty($this->ref)) $this->ref=$this->lib;
$lien = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$this->id.'">';
$lienfin='</a>';
if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$lienfin.' ');
if ($withpicto && $withpicto != 2) $result.=' ';
if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin;
return $result;
}
} }

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

@ -48,6 +48,8 @@ if (! $year) { $year=date("Y", time()); }
*/ */
$tva_static = new Tva($db); $tva_static = new Tva($db);
$socialcontrib=new ChargeSociales($db);
$payment_sc_static=new PaiementCharge($db);
llxHeader('',$langs->trans("TaxAndDividendsArea")); llxHeader('',$langs->trans("TaxAndDividendsArea"));
@ -65,13 +67,15 @@ print "<tr class=\"liste_titre\">";
print '<td width="120">'.$langs->trans("PeriodEndDate").'</td>'; 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" width="10%">'.$langs->trans("ExpectedToPay")."</td>";
print "<td align=\"center\">".$langs->trans("NbOfPayments")."</td>"; print '<td align="right" width="10%">'.$langs->trans("RefPayment")."</td>";
print "<td align=\"right\">".$langs->trans("AlreadyPaid")."</td>"; print '<td align="center" width="15%">'.$langs->trans("DatePayment")."</td>";
print '<td align="right" width="10%">'.$langs->trans("PayedByThisPayment")."</td>";
print "</tr>\n"; print "</tr>\n";
$sql = "SELECT c.id, c.libelle as lib, s.rowid, s.libelle, s.fk_type as type, s.periode, s.date_ech,"; $sql = "SELECT c.id, c.libelle as lib,";
$sql.= " count(s.rowid) as nb, sum(s.amount) as total, sum(pc.amount) as totalpaye"; $sql.= " s.rowid, s.libelle, s.fk_type as type, s.periode, s.date_ech, s.amount as total,";
$sql.= " pc.rowid as pid, pc.datep, pc.amount as totalpaye";
$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,"; $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
$sql.= " ".MAIN_DB_PREFIX."chargesociales as s"; $sql.= " ".MAIN_DB_PREFIX."chargesociales as s";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = s.rowid"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = s.rowid";
@ -109,14 +113,17 @@ if ($resql)
if (empty($date)) $date=$obj->date_ech; if (empty($date)) $date=$obj->date_ech;
print '<td>'.dol_print_date($date,'day').'</td>'; print '<td>'.dol_print_date($date,'day').'</td>';
print '<td align="left">'; print '<td align="left">';
$socialcontrib=new ChargeSociales($db);
$socialcontrib->id=$obj->rowid; $socialcontrib->id=$obj->rowid;
$socialcontrib->lib=$obj->libelle; $socialcontrib->lib=$obj->libelle;
print $socialcontrib->getNomUrl(1,'20'); 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="center">'.$obj->nb.'</td>';
$payment_sc_static->id=$obj->pid;
$payment_sc_static->ref=$obj->pid;
print '<td align="right">'.$payment_sc_static->getNomUrl(1)."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($obj->datep),'day').'</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;
@ -125,9 +132,10 @@ 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" width="10%"><b>'.price($total)."</b></td>"; print '<td align="right">'.price($total)."</td>";
print '<td align="center" width="15%"><b>'.$totalnb.'</b></td>'; print '<td align="center">&nbsp;</td>';
print '<td align="right" width="10%"><b>'.price($totalpaye)."</b></td>"; print '<td align="center">&nbsp;</td>';
print '<td align="right">'.price($totalpaye)."</td>";
print "</tr>"; print "</tr>";
} }
else else
@ -168,9 +176,10 @@ 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" width="10%">'.$langs->trans("Amount")."</td>"; print '<td align="right" width="10%">'.$langs->trans("ExpectedToPay")."</td>";
print '<td align="right" width="10%">'.$langs->trans("RefPayment")."</td>";
print '<td align="center" width="15%">'.$langs->trans("DatePayment")."</td>"; print '<td align="center" width="15%">'.$langs->trans("DatePayment")."</td>";
print '<td align="right" width="10%">'.$langs->trans("AlreadyPaid")."</td>"; print '<td align="right" width="10%">'.$langs->trans("PayedByThisPayment")."</td>";
print "</tr>\n"; print "</tr>\n";
$var=1; $var=1;
while ($i < $num) while ($i < $num)
@ -183,11 +192,14 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').' ? </td>'."\n"; print '<td align="left">'.dol_print_date($db->jdate($obj->dm),'day').' ? </td>'."\n";
$tva_static->id=$obj->rowid; print "<td>".$obj->label."</td>\n";
$tva_static->ref=$obj->label;
print "<td>".$tva_static->getNomUrl(1)."</td>\n"; print '<td align="right">'.price($obj->amount)."</td>";
$tva_static->id=$obj->rowid;
$tva_static->ref=$obj->rowid;
print '<td align="right">'.$tva_static->getNomUrl(1)."</td>\n";
print "<td align=\"right\">".price($obj->amount)."</td>";
print '<td align="center">'.dol_print_date($db->jdate($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";
@ -195,9 +207,10 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly')
$i++; $i++;
} }
print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>'; print '<tr class="liste_total"><td align="right" colspan="2">'.$langs->trans("Total").'</td>';
print '<td align="right"><b>'.price($total)."</b></td>"; print '<td align="right">'.price($total)."</td>";
print '<td>&nbsp;</td>'; print '<td align="center">&nbsp;</td>';
print '<td align="right"><b>'.price($total)."</b></td>"; print '<td align="center">&nbsp;</td>';
print '<td align="right">'.price($total)."</td>";
print "</tr>"; print "</tr>";
print "</table>"; print "</table>";

2
htdocs/compta/paiement/fiche.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-2008 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com> * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
* *

5
htdocs/compta/sociales/charges.php
View File

@ -322,7 +322,8 @@ if ($chid > 0)
} }
print "</td>"; print "</td>";
print '<td rowspan="4" valign="top">'; $rowspan=5;
print '<td rowspan="'.$rowspan.'" valign="top">';
/* /*
* Paiements * Paiements
@ -399,6 +400,8 @@ if ($chid > 0)
print '<tr><td>'.$langs->trans("Status").'</td><td>'.$cha->getLibStatut(4).'</td></tr>'; print '<tr><td>'.$langs->trans("Status").'</td><td>'.$cha->getLibStatut(4).'</td></tr>';
print '<tr><td coslpan="2">&nbsp;</td></tr>';
if ($_GET['action'] == 'edit') if ($_GET['action'] == 'edit')
{ {
print '<tr><td colspan="3" align="center">'; print '<tr><td colspan="3" align="center">';