diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index a5e6e6af6e9..d2c9a1bca76 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -91,9 +91,7 @@ if ($id > 0 || !empty($ref)) { llxHeader('', $title, $help_url); - /* - * En mode visu - */ + // View mode if ($result > 0) { $head = product_prepare_head($object); $titre = $langs->trans("CardProduct".$object->type); @@ -108,23 +106,23 @@ if ($id > 0 || !empty($ref)) { print '
| '.$langs->trans("TotalMargin").' | '; - print ''; // set by jquery (see below) + print ' | ||||||||||||||||
| '.$langs->trans("TotalMargin").' | '; + print ''; // set by jquery (see below) print ' | ||||||||||||||||
| '.$langs->trans("MarginRate").' | '; + print ' | ||||||||||||||||
| '.$langs->trans("MarginRate").' | '; print ''; // set by jquery (see below) print ' | ||||||||||||||||
| '.$langs->trans("MarkRate").' | '; + print ' | ||||||||||||||||
| '.$langs->trans("MarkRate").' | '; print ''; // set by jquery (see below) print ' | '.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($objp->name, 44).' | '; print "".$objp->code_client." | \n"; - print ""; + print ' | '; print dol_print_date($db->jdate($objp->datef), 'day')." | "; - print "".price(price2num($objp->selling_price, 'MT'))." | \n"; - print "".price(price2num($objp->buying_price, 'MT'))." | \n"; - print "".price(price2num($objp->qty, 'MT'))." | \n"; - print "".price(price2num($objp->marge, 'MT'))." | \n"; + print ''.price(price2num($objp->selling_price, 'MT'))." | \n"; + print ''.price(price2num($objp->buying_price, 'MT'))." | \n"; + print ''.price(price2num($objp->qty, 'MT'))." | \n"; + print ''.price(price2num($objp->marge, 'MT'))." | \n"; if (!empty($conf->global->DISPLAY_MARGIN_RATES)) { print "".(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")." | \n"; } @@ -260,10 +258,10 @@ if ($id > 0 || !empty($ref)) { } print '|||
| '.$langs->trans('TotalMargin')." | "; - print ''.price(price2num($cumul_vente, 'MT'))." | \n"; - print ''.price(price2num($cumul_achat, 'MT'))." | \n"; + print ''.price(price2num($cumul_vente, 'MT'))." | \n"; + print ''.price(price2num($cumul_achat, 'MT'))." | \n"; print ''.price(price2num($cumul_qty, 'MT'))." | \n"; - print ''.price(price2num($totalMargin, 'MT'))." | \n"; + print ''.price(price2num($totalMargin, 'MT'))." | \n"; if (!empty($conf->global->DISPLAY_MARGIN_RATES)) { print ''.(($marginRate === '') ? 'n/a' : price(price2num($marginRate, 'MT'))."%")." | \n"; } diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 8b2a792b872..1234deef497 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -382,7 +382,7 @@ if ($id > 0 || $ref) { echo $formconfirm; } - if ($action <> 'edit' && $action <> 're-edit') { + if ($action != 'edit' && $action != 're-edit') { $head = product_prepare_head($object); $titre = $langs->trans("CardProduct".$object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); @@ -835,12 +835,13 @@ END; print ''; print ''; - print ''; + print ''."\n"; } + // Actions buttons - print "\n'.$productfourn->getSocNomUrl(1, 'supplier').' | '; + print ''.$productfourn->getSocNomUrl(1, 'supplier').' | '; } // Supplier ref if ($usercancreate) { // change required right here - print ''.$productfourn->getNomUrl().' | '; + print ''.$productfourn->getNomUrl().' | '; } else { - print ''.$productfourn->fourn_ref.' | '; + print ''.$productfourn->fourn_ref.' | '; } // Availability|||