From 14abf357e71d5690a106f0b882b3c71a3bf12774 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 15 Mar 2019 09:53:06 +0100 Subject: [PATCH] update with html5 compliant code --- htdocs/product/composition/card.php | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index fdf11eb1c9e..f27aac68eb4 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -333,11 +333,11 @@ if ($id > 0 || ! empty($ref)) print ''; print ''.$langs->trans('ComposedProduct').''; print ''.$langs->trans('Label').''; - print ''.$langs->trans('MinSupplierPrice').''; - print ''.$langs->trans('MinCustomerPrice').''; - if (! empty($conf->stock->enabled)) print ''.$langs->trans('Stock').''; - print ''.$langs->trans('Qty').''; - print ''.$langs->trans('ComposedProductIncDecStock').''; + print ''.$langs->trans('MinSupplierPrice').''; + print ''.$langs->trans('MinCustomerPrice').''; + if (! empty($conf->stock->enabled)) print ''.$langs->trans('Stock').''; + print ''.$langs->trans('Qty').''; + print ''.$langs->trans('ComposedProductIncDecStock').''; print ''."\n"; $class='pair'; @@ -361,7 +361,7 @@ if ($id > 0 || ! empty($ref)) print ''.$productstatic->label.''; // Best buying price - print ''; + print ''; if ($product_fourn->find_min_price_product_fournisseur($productstatic->id) > 0) { print $langs->trans("BuyingPriceMinShort").': '; @@ -378,7 +378,7 @@ if ($id > 0 || ! empty($ref)) $totalline=price2num($value['nb'] * ($fourn_unitprice * (1 - $fourn_remise_percent/100) - $fourn_remise), 'MT'); $total+=$totalline; - print ''; + print ''; print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '').price($fourn_unitprice, '', '', 0, 0, -1, $conf->currency)); print ''; @@ -393,20 +393,20 @@ if ($id > 0 || ! empty($ref)) $totallinesell=price2num($value['nb'] * ($pricesell), 'MT'); $totalsell+=$totallinesell; } - print ''; + print ''; print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '')); if (is_numeric($pricesell)) print price($pricesell, '', '', 0, 0, -1, $conf->currency); else print $langs->trans($pricesell); print ''; // Stock - if (! empty($conf->stock->enabled)) print ''.$value['stock'].''; // Real stock + if (! empty($conf->stock->enabled)) print ''.$value['stock'].''; // Real stock // Qty + IncDec if ($user->rights->produit->creer || $user->rights->service->creer) { - print ''; - print ''; + print ''; + print ''; } else{ print ''.$nb_of_subproduct.''; @@ -438,7 +438,7 @@ if ($id > 0 || ! empty($ref)) print ' '; if (! empty($conf->stock->enabled)) print ''; // Real stock - print ''.$value['nb'].''; + print ''.$value['nb'].''; print ' '; print ''."\n"; @@ -450,29 +450,29 @@ if ($id > 0 || ! empty($ref)) print ''; // Minimum buying price - print ''; + print ''; print $langs->trans("TotalBuyingPriceMinShort"); print ''; - print ''; + print ''; if ($atleastonenotdefined) print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')'; print ($atleastonenotdefined?'':price($total, '', '', 0, 0, -1, $conf->currency)); print ''; // Minimum selling price - print ''; + print ''; print $langs->trans("TotalSellingPriceMinShort"); print ''; - print ''; + print ''; if ($atleastonenotdefined) print $langs->trans("Unknown").' ('.$langs->trans("SomeSubProductHaveNoPrices").')'; print ($atleastonenotdefined?'':price($totalsell, '', '', 0, 0, -1, $conf->currency)); print ''; // Stock - if (! empty($conf->stock->enabled)) print ' '; + if (! empty($conf->stock->enabled)) print ' '; - print ''; + print ''; if ($user->rights->produit->creer || $user->rights->service->creer) { print ''; @@ -542,9 +542,9 @@ if ($id > 0 || ! empty($ref)) print ''; print ''.$langs->trans("ComposedProduct").''; print ''.$langs->trans("Label").''; - //print ''.$langs->trans("IsInPackage").''; - print ''.$langs->trans("Qty").''; - print ''.$langs->trans('ComposedProductIncDecStock').''; + //print ''.$langs->trans("IsInPackage").''; + print ''.$langs->trans("Qty").''; + print ''.$langs->trans('ComposedProductIncDecStock').''; print ''; if ($resql) { @@ -613,13 +613,13 @@ if ($id > 0 || ! empty($ref)) $incdec=0; } // Contained into package - /*print ''; + /*print ''; print '';*/ // Qty - print ''; + print ''; // Inc Dec - print ''; + print ''; if ($qty) print ''; else {