From c5c7e8d4513e316471c6afff87d70005f68b5b46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 29 May 2019 11:18:01 +0200 Subject: [PATCH 1/2] Update linkedobjectblock.tpl.php --- .../facture/tpl/linkedobjectblock.tpl.php | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index d184fb58966..f0916d79443 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -47,10 +47,31 @@ foreach($linkedObjectBlock as $key => $objectlink) if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass.=' liste_sub_total'; ?> - trans("CustomerInvoice"); ?> + type) { + case Facture::TYPE_REPLACEMENT: + echo $langs->trans("InvoiceReplacement"); + break; + case Facture::TYPE_CREDIT_NOTE: + echo $langs->trans("InvoiceAvoir"); + break; + case Facture::TYPE_DEPOSIT: + echo $langs->trans("InvoiceDeposit"); + break; + case Facture::TYPE_PROFORMA: + echo $langs->trans("InvoiceProForma"); + break; + case Facture::TYPE_SITUATION: + echo $langs->trans("InvoiceSituation"); + break; + default: + echo $langs->trans("CustomerInvoice"); + break; + } + ?> getNomUrl(1); ?> - ref_client; ?> - date, 'day'); ?> + ref_client; ?> + date, 'day'); ?> rights->facture->lire) { $sign = 1; @@ -76,8 +97,8 @@ if (count($linkedObjectBlock) > 1) trans("Total"); ?> - - + + From 6bb1a4a0e6f035132040a6c706e34f44e001a4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 29 May 2019 11:26:04 +0200 Subject: [PATCH 2/2] Update linkedobjectblock.tpl.php --- htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index f0916d79443..97f0b876abc 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -55,7 +55,7 @@ foreach($linkedObjectBlock as $key => $objectlink) case Facture::TYPE_CREDIT_NOTE: echo $langs->trans("InvoiceAvoir"); break; - case Facture::TYPE_DEPOSIT: + case Facture::TYPE_DEPOSIT: echo $langs->trans("InvoiceDeposit"); break; case Facture::TYPE_PROFORMA: @@ -70,7 +70,7 @@ foreach($linkedObjectBlock as $key => $objectlink) } ?> getNomUrl(1); ?> - ref_client; ?> + ref_client; ?> date, 'day'); ?> rights->facture->lire) {