diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 7f52efd6a4f..68a24a20933 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -4324,7 +4324,7 @@ else if ($id > 0 || ! empty($ref)) print $form->textwithpicto($langs->trans("Discount") . ':', $langs->trans("HelpEscompte"), - 1); print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; $resteapayeraffiche = 0; - $cssforamountpaymentcomplete = ''; + $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'badcustomer' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'badcustomer') { @@ -4332,7 +4332,7 @@ else if ($id > 0 || ! empty($ref)) print $form->textwithpicto($langs->trans("Abandoned") . ':', $langs->trans("HelpAbandonBadCustomer"), - 1); print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; // $resteapayeraffiche=0; - $cssforamountpaymentcomplete = ''; + $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'product_returned' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'product_returned') { @@ -4340,7 +4340,7 @@ else if ($id > 0 || ! empty($ref)) print $form->textwithpicto($langs->trans("ProductReturned") . ':', $langs->trans("HelpAbandonProductReturned"), - 1); print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; $resteapayeraffiche = 0; - $cssforamountpaymentcomplete = ''; + $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'abandon' if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'abandon') { @@ -4351,7 +4351,7 @@ else if ($id > 0 || ! empty($ref)) print $form->textwithpicto($langs->trans("Abandoned") . ':', $text, - 1); print '' . price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')) . ' '; $resteapayeraffiche = 0; - $cssforamountpaymentcomplete = ''; + $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Billed diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index f171aa272ff..d409ba35b86 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2838,7 +2838,7 @@ else print $form->textwithpicto($langs->trans("Discount") . ':', $langs->trans("HelpEscompte"), - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; $resteapayeraffiche = 0; - $cssforamountpaymentcomplete = ''; + $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'badsupplier' if (($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'badsupplier') { @@ -2846,7 +2846,7 @@ else print $form->textwithpicto($langs->trans("Abandoned") . ':', $langs->trans("HelpAbandonBadCustomer"), - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; // $resteapayeraffiche=0; - $cssforamountpaymentcomplete = ''; + $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'product_returned' if (($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'product_returned') { @@ -2854,7 +2854,7 @@ else print $form->textwithpicto($langs->trans("ProductReturned") . ':', $langs->trans("HelpAbandonProductReturned"), - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; $resteapayeraffiche = 0; - $cssforamountpaymentcomplete = ''; + $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Paye partiellement ou Abandon 'abandon' if (($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'abandon') { @@ -2865,7 +2865,7 @@ else print $form->textwithpicto($langs->trans("Abandoned") . ':', $text, - 1); print '' . price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye) . ' '; $resteapayeraffiche = 0; - $cssforamountpaymentcomplete = ''; + $cssforamountpaymentcomplete = 'amountpaymentneutral'; } // Billed @@ -2878,12 +2878,12 @@ else else print $langs->trans('ExcessPaid'); print ' :'; - print '' . price($resteapayeraffiche) . ''; + print '' . price($resteapayeraffiche) . ''; print ' '; } else // Credit note { - $cssforamountpaymentcomplete=''; + $cssforamountpaymentcomplete='amountpaymentneutral'; // Total already paid back print ''; @@ -2900,7 +2900,7 @@ else else print $langs->trans('ExcessPaydBack'); print ' :'; - print '' . price($sign * $resteapayeraffiche) . ''; + print '' . price($sign * $resteapayeraffiche) . ''; print ' '; // Sold credit note diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 51108766369..b68013fd40d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -201,8 +201,8 @@ $nbtopmenuentries=$menumanager->showmenu('topnb'); $minwidthtmenu=66; /* minimum width for one top menu entry */ -$heightmenu=46; /* height of top menu, part with image */ -$heightmenu2=48; /* height of top menu, part with login */ +$heightmenu=48; /* height of top menu, part with image */ +$heightmenu2=49; /* height of top menu, part with login */ $disableimages = 0; $maxwidthloginblock = 130; if (! empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu=0; } @@ -816,6 +816,10 @@ select.flat.selectlimit { font-weight: bold; font-size: 1.4em; } +.amountpaymentneutral { + font-weight: bold; + font-size: 1.4em; +} .savingdocmask { margin-top: 6px; margin-bottom: 12px; @@ -2403,7 +2407,7 @@ span.butAction, span.butActionDelete { } .butAction { - background: rgb(230, 238, 230) + background: rgb(230, 236, 230) /* background: rgb(230, 232, 239); */ } .butActionRefused, .butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index fce36df5b2b..8c5f819d855 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -807,6 +807,10 @@ select.flat.selectlimit { .amountremaintopayback { font-weight: bold; } +.amountpaymentneutral { + font-weight: bold; + font-size: 1.4em; +} .savingdocmask { margin-top: 6px; margin-bottom: 12px;