Amélioration gestion des charges sociales

This commit is contained in:
Laurent Destailleur 2005-08-11 20:24:58 +00:00
parent 0c120ca5ad
commit 8d8be88daf
3 changed files with 17 additions and 20 deletions

View File

@ -77,7 +77,7 @@ if ($chid > 0)
*/ */
//$head[0][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id; //$head[0][0] = DOL_URL_ROOT.'/comm/propal.php?propalid='.$propal->id;
$head[0][1] = "Charge sociale : No $cha->id"; $head[0][1] = $langs->trans("SocialContribution").": $cha->id";
$h = 1; $h = 1;
$a = 0; $a = 0;
@ -172,7 +172,7 @@ if ($chid > 0)
print "</form>\n"; print "</form>\n";
print '<br></div>'; print '</div>';
if (! $_GET["action"]) { if (! $_GET["action"]) {

View File

@ -227,7 +227,7 @@ if ( $db->query($sql) )
$var = !$var; $var = !$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td width="80">'; print '<td width="60">';
print '<a href="charges.php?id='.$obj->id.'">'.img_file().' '.$obj->id.'</a>'; print '<a href="charges.php?id='.$obj->id.'">'.img_file().' '.$obj->id.'</a>';
print '</td>'; print '</td>';
@ -239,7 +239,7 @@ if ( $db->query($sql) )
print '&nbsp;'; print '&nbsp;';
} }
print '</td>'; print '</td>';
print '<td>'.$obj->type_lib.'</td><td>'.$obj->libelle.'</td>'; print '<td>'.$obj->type_lib.'</td><td>'.dolibarr_trunc($obj->libelle,36).'</td>';
print '<td align="right" width="100">'.price($obj->amount).'</td>'; print '<td align="right" width="100">'.price($obj->amount).'</td>';
if ($obj->paye) if ($obj->paye)

View File

@ -24,22 +24,19 @@ require("../../main.inc.php");
function llxHeader($head = "") function llxHeader($head = "")
{ {
global $user, $conf, $langs; global $user, $conf, $langs;
$langs->load("compta");
$langs->load("propal");
/*
* top_menu($head);
*
*/ $menu = new Menu();
top_menu($head);
$menu->add("../charges/",$langs->trans("Contributions"));
$menu = new Menu(); $menu->add_submenu("index.php",$langs->trans("SocialContributions"));
// $menu->add_submenu("/compta/sociales/conf.php","Conf");
$menu->add("../charges/",$langs->trans("Charges"));
$menu->add_submenu("index.php",$langs->trans("SocialContributions")); left_menu($menu->liste);
// $menu->add_submenu("/compta/sociales/conf.php","Conf");
left_menu($menu->liste);
} }
?> ?>