From 3921f706e24314b23ecd71082fb17e70b4b6680e Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Wed, 24 Jul 2019 09:01:11 +0200 Subject: [PATCH] Presentation nowrap on amount --- htdocs/compta/index.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index c57b073b487..722a7a3ce82 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -410,8 +410,8 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print ''; print $thirdpartystatic->getNomUrl(1, 'customer', 44); print ''; - if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).''; - print ''.price($obj->total_ttc).''; + if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).''; + print ''.price($obj->total_ttc).''; print ''.dol_print_date($db->jdate($obj->tms), 'day').''; print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).''; print ''; @@ -510,7 +510,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print $thirdpartystatic->getNomUrl(1, 'supplier', 44); print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).''; - print ''.price($obj->total_ttc).''; + print ''.price($obj->total_ttc).''; print ''.dol_print_date($db->jdate($obj->tms), 'day').''; print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).''; print ''; @@ -591,7 +591,7 @@ if (! empty($conf->don->enabled) && $user->rights->societe->lire) print ''; print ''.$donationstatic->getNomUrl(1).''; print ''.$label.''; - print ''.price($objp->amount).''; + print ''.price($objp->amount).''; print ''.dol_print_date($db->jdate($objp->dm), 'day').''; print ''.$donationstatic->LibStatut($objp->fk_statut, 3).''; print ''; @@ -662,8 +662,8 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) print ''; print ''.$chargestatic->getNomUrl(1).''; print ''.dol_print_date($db->jdate($obj->date_ech), 'day').''; - print ''.price($obj->amount).''; - print ''.price($obj->sumpaid).''; + print ''.price($obj->amount).''; + print ''.price($obj->sumpaid).''; print ''.$chargestatic->getLibStatut(3).''; print ''; $tot_ttc+=$obj->amount; @@ -671,7 +671,7 @@ if (! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) } print ''.$langs->trans("Total").''; - print ''.price($tot_ttc).''; + print ''.price($tot_ttc).''; print ''; print ' '; print ''; @@ -784,8 +784,8 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us print $societestatic->getNomUrl(1, 'customer', 44); print ''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).''; - print ''.price($obj->total_ttc).''; - print ''.price($obj->total_ttc-$obj->tot_fttc).''; + print ''.price($obj->total_ttc).''; + print ''.price($obj->total_ttc-$obj->tot_fttc).''; print ''.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).''; print ''; $tot_ht += $obj->total_ht; @@ -797,8 +797,8 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us print ''.$langs->trans("Total").'   ('.$langs->trans("RemainderToBill").': '.price($tot_tobill).') '; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($tot_ht).''; - print ''.price($tot_ttc).''; - print ''.price($tot_tobill).''; + print ''.price($tot_ttc).''; + print ''.price($tot_tobill).''; print ' '; print ''; print '
'; @@ -909,8 +909,8 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print ''; print ''.dol_print_date($db->jdate($obj->datelimite), 'day').''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).''; - print ''.price($obj->total_ttc).''; - print ''.price($obj->am).''; + print ''.price($obj->total_ttc).''; + print ''.price($obj->am).''; print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3, $obj->am).''; print ''; @@ -924,8 +924,8 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) print ''.$langs->trans("Total").'   ('.$langs->trans("RemainderToTake").': '.price($total_ttc-$totalam).') '; print ' '; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($total).''; - print ''.price($total_ttc).''; - print ''.price($totalam).''; + print ''.price($total_ttc).''; + print ''.price($totalam).''; print ' '; print ''; } @@ -1021,8 +1021,8 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print ''.$societestatic->getNomUrl(1, 'supplier', 44).''; print ''.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').''; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($obj->total_ht).''; - print ''.price($obj->total_ttc).''; - print ''.price($obj->am).''; + print ''.price($obj->total_ttc).''; + print ''.price($obj->am).''; print ''.$facstatic->LibStatut($obj->paye, $obj->fk_statut, 3).''; print ''; $total += $obj->total_ht; @@ -1034,8 +1034,8 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- print ''.$langs->trans("Total").'   ('.$langs->trans("RemainderToPay").': '.price($total_ttc-$totalam).') '; print ' '; if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print ''.price($total).''; - print ''.price($total_ttc).''; - print ''.price($totalam).''; + print ''.price($total_ttc).''; + print ''.price($totalam).''; print ' '; print ''; }