From 0a242983859f864d36ea2760af713098cbc49041 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Fri, 4 Dec 2020 02:57:40 +0100
Subject: [PATCH 1/2] FIX: Problem on supplier payment card

---
 htdocs/fourn/class/paiementfourn.class.php | 1 +
 htdocs/fourn/paiement/card.php             | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index b48fef9759a..fd07cc7bf89 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -118,6 +118,7 @@ class PaiementFourn extends Paiement
 				$this->bank_account   = $obj->fk_account;
 				$this->bank_line      = $obj->fk_bank;
 				$this->montant        = $obj->amount;
+				$this->amount        = $obj->amount;
 				$this->note           = $obj->note;
 				$this->type_code      = $obj->paiement_code;
 				$this->type_libelle   = $obj->paiement_type;
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 6d9661ded5d..6aec24bb0a8 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -274,10 +274,9 @@ if ($result > 0)
 
 		$i = 0;
 		$total = 0;
-		print '<b>'.$langs->trans("Invoices").'</b><br>';
 		print '<table class="noborder" width="100%">';
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans('Ref').'</td>';
+		print '<td>'.$langs->trans('Invoice').'</td>';
 		print '<td>'.$langs->trans('RefSupplier').'</td>';
 		print '<td>'.$langs->trans('Company').'</td>';
 		print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';

From 7c77a0d84b1a5128037b6f31bd155b8be9fb3d67 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Mon, 7 Dec 2020 23:53:09 +0100
Subject: [PATCH 2/2] FIX : Export FEC - Remove line at zero

---
 .../class/accountancyexport.class.php         | 85 ++++++++++---------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 11486bf76c9..a7183c70114 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -688,65 +688,70 @@ class AccountancyExport
 		print $end_line;
 
 		foreach ($objectLines as $line) {
-			$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
-			$date_document = dol_print_date($line->doc_date, '%Y%m%d');
-			$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+			if ($line->debit == 0 && $line->credit == 0) {
+                unset($array[$line]);
+            } else {
+				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
+				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
+				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
+				$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
 
-			// FEC:JournalCode
-			print $line->code_journal . $separator;
+				// FEC:JournalCode
+				print $line->code_journal . $separator;
 
-			// FEC:JournalLib
-			print $line->journal_label . $separator;
+				// FEC:JournalLib
+				print $line->journal_label . $separator;
 
-			// FEC:EcritureNum
-			print $line->piece_num . $separator;
+				// FEC:EcritureNum
+				print $line->piece_num . $separator;
 
-			// FEC:EcritureDate
-			print $date_document . $separator;
+				// FEC:EcritureDate
+				print $date_document . $separator;
 
-			// FEC:CompteNum
-			print $line->numero_compte . $separator;
+				// FEC:CompteNum
+				print $line->numero_compte . $separator;
 
-			// FEC:CompteLib
-			print dol_string_unaccent($line->label_compte) . $separator;
+				// FEC:CompteLib
+				print dol_string_unaccent($line->label_compte) . $separator;
 
-			// FEC:CompAuxNum
-			print $line->subledger_account . $separator;
+				// FEC:CompAuxNum
+				print $line->subledger_account . $separator;
 
-			// FEC:CompAuxLib
-			print dol_string_unaccent($line->subledger_label) . $separator;
+				// FEC:CompAuxLib
+				print dol_string_unaccent($line->subledger_label) . $separator;
 
-			// FEC:PieceRef
-			print $line->doc_ref . $separator;
+				// FEC:PieceRef
+				print $line->doc_ref . $separator;
 
-			// FEC:PieceDate
-			print dol_string_unaccent($date_creation) . $separator;
+				// FEC:PieceDate
+				print $date_creation . $separator;
 
-			// FEC:EcritureLib
-			print $line->label_operation . $separator;
+				// FEC:EcritureLib
+				print dol_string_unaccent($line->label_operation) . $separator;
 
-			// FEC:Debit
-			print price2fec($line->debit) . $separator;
+				// FEC:Debit
+				print price2fec($line->debit) . $separator;
 
-			// FEC:Credit
-			print price2fec($line->credit) . $separator;
+				// FEC:Credit
+				print price2fec($line->credit) . $separator;
 
-			// FEC:EcritureLet
-			print $line->lettering_code . $separator;
+				// FEC:EcritureLet
+				print $line->lettering_code . $separator;
 
-			// FEC:DateLet
-			print $line->date_lettering . $separator;
+				// FEC:DateLet
+				print $date_lettering . $separator;
 
-			// FEC:ValidDate
-			print $date_validation . $separator;
+				// FEC:ValidDate
+				print $date_validation . $separator;
 
-			// FEC:Montantdevise
-			print $line->multicurrency_amount . $separator;
+				// FEC:Montantdevise
+				print $line->multicurrency_amount . $separator;
 
-			// FEC:Idevise
-			print $line->multicurrency_code;
+				// FEC:Idevise
+				print $line->multicurrency_code;
 
-			print $end_line;
+				print $end_line;
+			}
 		}
 	}