diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 05fa2048e8f..81e8b396963 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -406,9 +406,15 @@ if ($id > 0) $limit_field_type = (! empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount'; print $form->editfieldval("OutstandingBill",'outstanding_limit',$object->outstanding_limit,$object,$user->rights->societe->creer,$limit_field_type,($object->outstanding_limit != '' ? price($object->outstanding_limit) : '')); // display amount and link to unpaid bill - $outstandigBills = $object->get_OutstandingBill(); - if ($outstandigBills != 0) - print " (".$langs->trans("CurrentOutstandingBill")." ".price($outstandigBills, '', $langs, 0, 0, -1, $conf->currency).')'; + $outstandingBills = $object->get_OutstandingBill(); + if ($outstandingBills != 0) { + print ' ('.$langs->trans("CurrentOutstandingBill"); + print ' '; + print price($outstandingBills, '', $langs, 0, -1, -1, $conf->currency); + print ''; + if ($outstandingBills > $object->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached")); + print ')'; + } print ''; print ''; } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 169e499b619..01df11a61ab 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1966,12 +1966,12 @@ if ($action == 'create') print $soc->getNomUrl(1); print ''; // Outstanding Bill - $outstandigBills = $soc->get_OutstandingBill(); + $outstandingBills = $soc->get_OutstandingBill(); print ' (' . $langs->trans('CurrentOutstandingBill') . ': '; - print price($outstandigBills, '', $langs, 0, 0, -1, $conf->currency); + print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency); if ($soc->outstanding_limit != '') { - if ($outstandigBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached")); + if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached")); print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency); } print ')'; @@ -2832,11 +2832,11 @@ if ($action == 'create') print '   '; print '(' . $langs->trans('OtherBills') . ''; // Outstanding Bill - $outstandigBills = $soc->get_OutstandingBill(); + $outstandingBills = $soc->get_OutstandingBill(); print ' - ' . $langs->trans('CurrentOutstandingBill') . ': '; - print price($outstandigBills, '', $langs, 0, 0, - 1, $conf->currency); + print price($outstandingBills, '', $langs, 0, 0, - 1, $conf->currency); if ($soc->outstanding_limit != '') { - if ($outstandigBills > $soc->outstanding_limit) + if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached")); print ' / ' . price($soc->outstanding_limit); } diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index f267091db40..f3131ca928a 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -129,7 +129,7 @@ if (empty($usemargins)) $usemargins=0; tva_tx,'%',$line->info_bits); ?> - pu_ht); ?> + subprice); ?> pu_ttc)?price($line->pu_ttc):price($line->subprice)); ?> diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index a2e6b9d22bc..e1b57b60c91 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -424,7 +424,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie // Bouton Enregistrer if ($action != 'add_paiement') { - print '<
'.$langs->trans("ClosePaidInvoicesAutomatically"); + print '
'.$langs->trans("ClosePaidInvoicesAutomatically"); print '
'; }