lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update card.php

Browse Source
This commit is contained in:
Laurent Destailleur 2018-06-22 15:51:26 +02:00 committed by GitHub
parent b9fe6f8624
commit 6f1101a2d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/product/composition/card.php
View File

@ -342,6 +342,7 @@ if ($id > 0 || ! empty($ref))
$class='pair'; $class='pair';
$totalsell=0;
if (count($prods_arbo)) if (count($prods_arbo))
{ {
foreach($prods_arbo as $value) foreach($prods_arbo as $value)
@ -374,7 +375,7 @@ if ($id > 0 || ! empty($ref))
$fourn_remise_percent = (!empty($product_fourn->fourn_remise_percent)?$product_fourn->fourn_remise_percent:0); $fourn_remise_percent = (!empty($product_fourn->fourn_remise_percent)?$product_fourn->fourn_remise_percent:0);
$fourn_remise = (!empty($product_fourn->fourn_remise)?$product_fourn->fourn_remise:0); $fourn_remise = (!empty($product_fourn->fourn_remise)?$product_fourn->fourn_remise:0);
$totalline=price2num($value['nb'] * ($fourn_unitprice * (1 - $fourn_remise_percent/100) - $fourn_remise), 'MT'); $totalline=price2num($value['nb'] * ($fourn_unitprice * (1 - $fourn_remise_percent/100) - $fourn_remise), 'MT');
$total+=$totalline; $total+=$totalline;
print '<td align="right">'; print '<td align="right">';
@ -385,12 +386,17 @@ if ($id > 0 || ! empty($ref))
$pricesell=$productstatic->price; $pricesell=$productstatic->price;
if (! empty($conf->global->PRODUIT_MULTIPRICES)) if (! empty($conf->global->PRODUIT_MULTIPRICES))
{ {
//$pricesell='Variable'; FIXME A non-numeric value encountered $pricesell='Variable';
}
else
{
$totallinesell=price2num($value['nb'] * ($pricesell), 'MT');
$totalsell+=$totallinesell;
} }
$totallinesell=price2num($value['nb'] * ($pricesell), 'MT');
$totalsell+=$totallinesell;
print '<td align="right" colspan="2">'; print '<td align="right" colspan="2">';
print ($notdefined?'':($value['nb']> 1 ? $value['nb'].'x' : '').price($pricesell,'','',0,0,-1,$conf->currency)); 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 '</td>'; print '</td>';
// Stock // Stock