diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 887c1d9993e..f0caba60230 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -583,16 +583,16 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''.$langs->trans('DateMaxPayment').''; if (!empty($conf->multicurrency->enabled)) { print ''.$langs->trans('Currency').''; - print ''.$langs->trans('MulticurrencyAmountTTC').''; - print ''.$multicurrencyalreadypayedlabel.''; - print ''.$multicurrencyremaindertopay.''; - print ''.$langs->trans('MulticurrencyPaymentAmount').''; + print ''.$langs->trans('MulticurrencyAmountTTC').''; + print ''.$multicurrencyalreadypayedlabel.''; + print ''.$multicurrencyremaindertopay.''; + print ''.$langs->trans('MulticurrencyPaymentAmount').''; } - print ''.$langs->trans('AmountTTC').''; - print ''.$alreadypayedlabel.''; - print ''.$remaindertopay.''; - print ''.$langs->trans('PaymentAmount').''; - print ' '; + print ''.$langs->trans('AmountTTC').''; + print ''.$alreadypayedlabel.''; + print ''.$remaindertopay.''; + print ''.$langs->trans('PaymentAmount').''; + print ' '; print "\n"; $total=0; @@ -659,12 +659,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie // Multicurrency Price if (!empty($conf->multicurrency->enabled)) { - print ''; + print ''; if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc); print ''; // Multicurrency Price - print ''; + print ''; if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) { print price($sign * $multicurrency_payment); @@ -674,11 +674,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print ''; // Multicurrency Price - print ''; + print ''; if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay); print ''; - print ''; + print ''; // Add remind multicurrency amount $namef = 'multicurrency_amount_'.$objp->facid; @@ -703,20 +703,20 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie } // Price - print 'id==$facid)?' style="font-weight: bold" ':'').'>'.price($sign * $objp->total_ttc).''; + print 'id==$facid)?' style="font-weight: bold" ':'').'>'.price($sign * $objp->total_ttc).''; // Received or paid back - print ''.price($sign * $paiement); + print ''.price($sign * $paiement); if ($creditnotes) print '+'.price($creditnotes); if ($deposits) print '+'.price($deposits); print ''; // Remain to take or to pay back - print ''.price($sign * $remaintopay).''; + print ''.price($sign * $remaintopay).''; //$test= price(price2num($objp->total_ttc - $paiement - $creditnotes - $deposits)); // Amount - print ''; + print ''; // Add remind amount $namef = 'amount_'.$objp->facid; @@ -763,21 +763,21 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie { // Print total print ''; - print ''.$langs->trans('TotalTTC').''; + print ''.$langs->trans('TotalTTC').''; if (!empty($conf->multicurrency->enabled)) { print ''; print ''; print ''; print ''; - print ''; + print ''; } - print ''.price($sign * $total_ttc).''; - print ''.price($sign * $totalrecu); + print ''.price($sign * $total_ttc).''; + print ''.price($sign * $totalrecu); if ($totalrecucreditnote) print '+'.price($totalrecucreditnote); if ($totalrecudeposits) print '+'.price($totalrecudeposits); print ''; - print ''.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).''; - print ''; // Autofilled + print ''.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).''; + print ''; // Autofilled print ' '; print "\n"; } @@ -873,7 +873,7 @@ if (! GETPOST('action', 'aZ09')) print_liste_field_titre('Invoice', $_SERVER["PHP_SELF"], 'ref', '', '', '', $sortfield, $sortorder); print_liste_field_titre('Date', $_SERVER["PHP_SELF"], 'dp', '', '', '', $sortfield, $sortorder); print_liste_field_titre('Type', $_SERVER["PHP_SELF"], 'libelle', '', '', '', $sortfield, $sortorder); - print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', 'align="right"', $sortfield, $sortorder); + print_liste_field_titre('Amount', $_SERVER["PHP_SELF"], 'fa_amount', '', '', 'class="right"', $sortfield, $sortorder); print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch '); print "\n"; @@ -885,7 +885,7 @@ if (! GETPOST('action', 'aZ09')) print ''.$objp->ref."\n"; print ''.dol_print_date($db->jdate($objp->dp))."\n"; print ''.$objp->paiement_type.' '.$objp->num_paiement."\n"; - print ''.price($objp->amount).' '; + print ''.price($objp->amount).' '; $parameters=array(); $reshook=$hookmanager->executeHooks('printObjectLine', $parameters, $objp, $action); // Note that $action and $object may have been modified by hook