From bb2e843fc90a439bb398d21ef8b8e8eaf7e3012e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Jun 2014 14:03:14 +0200 Subject: [PATCH] More visible information on predefined invoices. --- htdocs/compta/facture/fiche-rec.php | 33 ++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 2b3fc89d33b..7ae2e6aeb96 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -217,12 +217,15 @@ if ($action == 'create') if ($num) { print ''; - print ''.$langs->trans("Description").''; - print ''.$langs->trans("VAT").''; - print ''.$langs->trans("Qty").''; - print ''.$langs->trans("ReductionShort").''; - print ''.$langs->trans("PriceU").''; - if (empty($conf->global->PRODUIT_MULTIPRICES)) print ''.$langs->trans("CurrentProductPrice").''; + print ''.$langs->trans("Description").''; + print ''.$langs->trans("VAT").''; + print ''.$langs->trans("Qty").''; + print ''.$langs->trans("ReductionShort").''; + print ''.$langs->trans("TotalHT").''; + print ''.$langs->trans("TotalVAT").''; + print ''.$langs->trans("TotalTTC").''; + print ''.$langs->trans("PriceUHT").''; + if (empty($conf->global->PRODUIT_MULTIPRICES)) print ''.$langs->trans("CurrentProductPrice").''; print "\n"; } $var=True; @@ -288,9 +291,13 @@ if ($action == 'create') print "\n"; } - + // Vat rate print ''.vatrate($objp->tva_tx).'%'; + + // Qty print ''.$objp->qty.''; + + // Percent if ($objp->remise_percent > 0) { print ''.$objp->remise_percent." %\n"; @@ -300,9 +307,19 @@ if ($action == 'create') print ' '; } + // Total HT + print ''.price($objp->total_ht)."\n"; + + // Total VAT + print ''.price($objp->total_vat)."\n"; + + // Total TTC + print ''.price($objp->total_ttc)."\n"; + + // Total Unit price print ''.price($objp->subprice)."\n"; - // Price of product + // Current price of product if (empty($conf->global->PRODUIT_MULTIPRICES)) { if ($objp->fk_product > 0)