From f53060fec38aea4fc6888b11b8d437fecc0bdb54 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 2 Jun 2022 19:43:41 +0200 Subject: [PATCH 1/3] FIX selection of type of invoice --- htdocs/compta/facture/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index a4ad571867d..f807871c508 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -3158,7 +3158,7 @@ if ($action == 'create') { // Standard invoice print '
'; - $tmp = ' '; + $tmp = ' '; $tmp = $tmp.''; $desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3); print ''; From 309eccc426bab636b5c00b69b2abeb0b16dfbf47 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Jun 2022 14:08:04 +0200 Subject: [PATCH 2/3] Fix phpcs --- htdocs/compta/facture/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index f807871c508..6f9d7398324 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -2844,7 +2844,7 @@ if ($action == 'create') { $currency_code = $conf->currency; $fk_account = 0; - + // Load objectsrc $remise_absolue = 0; if (!empty($origin) && !empty($originid)) { From ab3f19dd59571bb74f0e4a554874db7622c95d7c Mon Sep 17 00:00:00 2001 From: Sylvain Legrand Date: Wed, 8 Jun 2022 22:07:48 +0200 Subject: [PATCH 3/3] Fix error when supplier deposit are used to pay supplier invoice --- htdocs/core/class/commoninvoice.class.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index f6edbd3f8d4..83bc936cc8f 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -159,11 +159,6 @@ abstract class CommonInvoice extends CommonObject */ public function getSumDepositsUsed($multicurrency = 0) { - if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') { - // TODO - return 0.0; - } - require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php'; $discountstatic = new DiscountAbsolute($this->db);