Cosmetic : align column VAT + display j_text

This commit is contained in:
Dany De Bontridder 2011-12-18 20:08:33 +00:00
parent a1d71f2c63
commit bb04e6837e
6 changed files with 32 additions and 14 deletions

View file

@ -194,10 +194,13 @@ echo '</tr>';
echo tr($row);
}
$row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"');
if ($owner->MY_TVA_USE=='Y')
$row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;widtg:auto" colspan="6"');
else
$row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;widtg:auto" colspan="6"');
$row.=td(nbm($total_htva),'class="num" style="font-style:italic;font-weight: bolder;"');
if ($owner->MY_TVA_USE=='Y')
$row.=td(nbm($total_tvac),'class="num" style="font-style:italic;font-weight: bolder;"');
$row.=td("").td(nbm($total_tvac),'class="num" style="font-style:italic;font-weight: bolder;"');
echo tr($row);
?>
</table>

View file

@ -123,6 +123,7 @@ echo '</tr>';
$q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']);
$row.=td($view_history);
if ( $q[$e]['j_qcode'] !=''){
$fiche=new Fiche($cn);
$fiche->get_by_qcode($q[$e]['j_qcode']);
@ -132,6 +133,10 @@ echo '</tr>';
else
$view_history='';
$row.=td($view_history);
if ( $q[$e]['j_text']!='')
{
$row.=td(h(strip_tags($q[$e]['j_text'])));
}else
if ( $q[$e]['j_qcode'] !='') {
// nom de la fiche
$ff=new Fiche($cn);

View file

@ -105,6 +105,7 @@ echo '</tr>';
$q[$e]['j_poste'], $gDossier, $q[$e]['j_poste']);
$row.=td($view_history);
if ( $q[$e]['j_qcode'] !='') {
$fiche=new Fiche($cn);
$fiche->get_by_qcode($q[$e]['j_qcode']);
@ -114,7 +115,10 @@ echo '</tr>';
else
$view_history='';
$row.=td($view_history);
if ( $q[$e]['j_text']!='')
{
$row.=td(h(strip_tags($q[$e]['j_text'])));
}else
if ( $q[$e]['j_qcode'] !='') {
// nom de la fiche
$ff=new Fiche($cn);

View file

@ -185,10 +185,13 @@ echo '</tr>';
echo tr($row);
}
$row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"');
if ($owner->MY_TVA_USE=='Y')
$row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"');
else
$row= td(_('Total'),' style="font-style:italic;text-align:right;font-weight: bolder;" colspan="5"');
$row.=td(nbm($total_htva),'class="num" style="font-style:italic;font-weight: bolder;"');
if ($owner->MY_TVA_USE=='Y')
$row.=td(nbm($total_tvac),'class="num" style="font-style:italic;font-weight: bolder;"');
$row.=td("").td(nbm($total_tvac),'class="num" style="font-style:italic;font-weight: bolder;"');
echo tr($row);
?>
</table>