diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 7187c5771d9..b48c95edfb6 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3069,7 +3069,8 @@ if ($action == 'create') print ''; // Margin Infos - if (! empty($conf->margin->enabled)) { + if (! empty($conf->margin->enabled)) + { print '
'; $object->displayMarginInfos($object->statut > 0); } diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 22db24d2920..0bee62d4f12 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -1099,18 +1099,14 @@ else */ $productstatic=new Product($db); + + $usemargins=0; + if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1; + // Title line for service - //print ''; // Array with (n*2)+1 lines $cursorline=1; while ($cursorline <= $nbofservices) { - //print ''; - //print ''; - - // print '
'; - //print $langs->trans("ServiceNb",$cursorline).''; - - print '
'; print ''; print ''; @@ -1119,7 +1115,7 @@ else print ''; // Area with common detail of line - print ''; + print '
'; $sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.description, cd.price_ht, cd.qty,"; $sql.= " cd.tva_tx, cd.remise_percent, cd.info_bits, cd.subprice,"; @@ -1289,10 +1285,10 @@ else print ''; print ''; print ''; - if ($conf->margin->enabled) { + if (! empty($usemargins)) + { print ''; } print ' - margin->enabled)) { ?> + rights->margins->creer) { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index ee5688073ed..63eea66a591 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1839,6 +1839,9 @@ tr.liste_total td, form.liste_total div { color: #202020; } +.tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair { + background: none; +} /* Disable shadows */ .noshadow {
%'; - if ($objp->fk_product) - print ''; + if ($objp->fk_product) print ''; print ''; @@ -1389,7 +1385,7 @@ else // Area with status and activation info of line if ($object->statut > 0) { - print ''; + print '
'; print ''; print ''; @@ -1447,8 +1443,7 @@ else print ''; print ''; - print '
'.$langs->trans("ServiceStatus").': '.$object->lines[$cursorline-1]->getLibStatut(4).'
'; - //print ''; + print '
'.$langs->trans("Status").'
'; // Definie date debut et fin par defaut $dateactstart = $objp->date_debut; @@ -1540,15 +1535,8 @@ else print ''; } - /* print ''; // End td if line is 1 - - print ''; - print '';*/ - $cursorline++; } - //print '
 
'; - // Form to add new line if ($user->rights->contrat->creer && ($object->statut >= 0)) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index f2c9ae0fc8a..f6e5e2e815e 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3208,7 +3208,7 @@ abstract class CommonObject } /** - * displayMarginInfos + * Show the array with all margin infos * * @param string $force_price Force price * @return void @@ -3225,7 +3225,7 @@ abstract class CommonObject $marginInfo = $this->getMarginInfos($force_price); - print ''; + print '
'; print ''; print ''; print ''; @@ -3246,9 +3246,9 @@ abstract class CommonObject print ''; print ''; if (! empty($conf->global->DISPLAY_MARGIN_RATES)) - print ''; + print ''; if (! empty($conf->global->DISPLAY_MARK_RATES)) - print ''; + print ''; print ''; print ''; print ''; @@ -3256,9 +3256,9 @@ abstract class CommonObject print ''; print ''; if (! empty($conf->global->DISPLAY_MARGIN_RATES)) - print ''; + print ''; if (! empty($conf->global->DISPLAY_MARK_RATES)) - print ''; + print ''; print ''; //} print ''; @@ -3267,9 +3267,9 @@ abstract class CommonObject print ''; print ''; if (! empty($conf->global->DISPLAY_MARGIN_RATES)) - print ''; + print ''; if (! empty($conf->global->DISPLAY_MARK_RATES)) - print ''; + print ''; print ''; print '
'.$langs->trans('Margins').''.$langs->trans('SellingPrice').''.price($marginInfo['pa_products'], null, null, null, null, $rounding).''.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).''.(($marginInfo['margin_rate_products'] == '')?'n/a':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').''.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').''.(($marginInfo['mark_rate_products'] == '')?'n/a':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').''.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'
'.$langs->trans('MarginOnServices').''.price($marginInfo['pa_services'], null, null, null, null, $rounding).''.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).''.(($marginInfo['margin_rate_services'] == '')?'n/a':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').''.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').''.(($marginInfo['mark_rate_services'] == '')?'n/a':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').''.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'
'.price($marginInfo['pa_total'], null, null, null, null, $rounding).''.price($marginInfo['total_margin'], null, null, null, null, $rounding).''.(($marginInfo['total_margin_rate'] == '')?'n/a':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').''.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').''.(($marginInfo['total_mark_rate'] == '')?'n/a':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').''.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'
'; } diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 09517a5281c..54348b2d646 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -121,9 +121,16 @@ $coldisplay=-1; // We remove first td 		- + + product->enabled) || ! empty($conf->service->enabled)) { ?> + + +