diff --git a/htdocs/product/composition/fiche.php b/htdocs/product/composition/fiche.php index f94f831cc63..574aa1024e3 100644 --- a/htdocs/product/composition/fiche.php +++ b/htdocs/product/composition/fiche.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani @@ -289,7 +289,7 @@ if ($id > 0 || ! empty($ref)) print ''; if (empty($conf->global->PRODUIT_MULTIPRICES)) - { + { // Price print ''.$langs->trans("SellingPrice").''; if ($object->price_base_type == 'TTC') @@ -301,7 +301,7 @@ if ($id > 0 || ! empty($ref)) print price($object->price).' '.$langs->trans($object->price_base_type); } print ''; - + // Price minimum print ''.$langs->trans("MinPrice").''; if ($object->price_base_type == 'TTC') @@ -341,6 +341,7 @@ if ($id > 0 || ! empty($ref)) print ''; if ($value['level'] <= 1) { + $notdefined=0; $productstatic->ref=$value['fullpath']; print ''.$productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')  '; print ''; @@ -348,12 +349,12 @@ if ($id > 0 || ! empty($ref)) { print $langs->trans("BuyingPriceMinShort").': '; if ($product_fourn->product_fourn_price_id > 0) print $product_fourn->display_price_product_fournisseur(0,0); - else print $langs->trans("NotDefined"); + else { print $langs->trans("NotDefined"); $notdefined=1; } } print ''; $totalline=price2num($value['nb'] * $product_fourn->fourn_unitprice, 'MT'); $total+=$totalline; - print ''.price($totalline,'','',0,0,-1,$conf->currency).''; + print ''.($notdefined?'':price($totalline,'','',0,0,-1,$conf->currency)).''; if (! empty($conf->stock->enabled)) print ''.$langs->trans("Stock").': '.$value['stock'].''; // Real stock } else { @@ -361,16 +362,16 @@ if ($id > 0 || ! empty($ref)) print ''; for ($i=0; $i < $value['level']; $i++) { - print '       '; + print '     '; } print $productstatic->getNomUrl(1,'composition').' ('.$value['nb'].')  '; - print ''; - print ''; + print ''; + print ''; if (! empty($conf->stock->enabled)) print ''; // Real stock } print ''; } - print ''; + print ''; print ''.$langs->trans("BuyingPriceMin").': '.price($total,'','',0,0,-1,$conf->currency).''; print ''; if (! empty($conf->stock->enabled)) print ' '; @@ -544,26 +545,6 @@ if ($id > 0 || ! empty($ref)) } - -/* ************************************************************************** */ -/* */ -/* Barre d'action */ -/* */ -/* ************************************************************************** */ -/* -print "\n
\n"; - -if ($action == '') -{ - if ($user->rights->produit->creer || $user->rights->service->creer) - { - print ''.$langs->trans("EditAssociate").''; - } -} - -print "\n
\n"; -*/ - llxFooter(); $db->close();