diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index 67abdce1df6..cbcaed453bd 100644 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur - * Copyright (C) 2005-2010 Regis Houssin + * Copyright (C) 2005-2011 Regis Houssin * * 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 @@ -151,7 +151,7 @@ if ($conf->fournisseur->enabled) print ""; print ''; print "rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.""; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).''; $i++; } } @@ -272,7 +272,7 @@ if ($resql) print ''; - print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; + print ''.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.''; print ''.dol_print_date($db->jdate($obj->datec)).''; print ''.$commandestatic->LibStatut($obj->fk_statut,5).''; print ''; diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index 565d17b63db..88ba9c25132 100755 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2010-2011 Regis Houssin * * 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 @@ -24,13 +24,10 @@ linkedObjectBlock; -$objectid = $GLOBALS['object']->objectid; -$num = count($objectid); $langs->load("orders"); -if ($somethingshown) { echo '
'; } +echo '
'; print_titre($langs->trans('RelatedOrders')); ?> @@ -42,19 +39,18 @@ print_titre($langs->trans('RelatedOrders')); fetch($objectid[$i]); $var=!$var; ?> > - - - + trans("ShowOrder"),"order").' '.$object->ref; ?> + + + total_ht; +$total = $total + $object->total_ht; } ?> diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index 8f3a0eb998b..afa4d150875 100755 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2010-2011 Regis Houssin * * 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 @@ -24,13 +24,10 @@ linkedObjectBlock; -$objectid = $GLOBALS['object']->objectid; -$num = count($objectid); $langs->load("bills"); -if ($somethingshown) { echo '
'; } +echo '
'; if ($num > 1) print_titre($langs->trans("RelatedBills")); else print_titre($langs->trans("RelatedBill")); ?> @@ -43,19 +40,18 @@ else print_titre($langs->trans("RelatedBill")); fetch($objectid[$i]); $var=!$var; ?>
> - - - + trans("ShowBill"),"bill").' '.$object->ref; ?> + + + total_ht; +$total = $total + $object->total_ht; } ?>
- trans("ShowOrder"),"order").' '.$linkedObjectBlock->ref; ?>date,'day'); ?>total_ht); ?>getLibStatut(3); ?>date,'day'); ?>total_ht); ?>getLibStatut(3); ?>
- trans("ShowBill"),"bill").' '.$linkedObjectBlock->ref; ?>date,'day'); ?>total_ht); ?>getLibStatut(3); ?>date,'day'); ?>total_ht); ?>getLibStatut(3); ?>