diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 7b23ae37d00..8e918b042f1 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -708,65 +708,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;
+ }
}
}
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index f8f1c0735b6..fcd334781a7 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -90,7 +90,7 @@ class PaiementFourn extends Paiement
$error=0;
$sql = 'SELECT p.rowid, p.ref, p.entity, p.datep as dp, p.amount, p.statut, p.fk_bank, p.multicurrency_amount,';
- $sql.= ' c.code as paiement_code, c.libelle as paiement_type,';
+ $sql.= ' c.code as payment_code, c.libelle as payment_type,';
$sql.= ' p.num_paiement as num_payment, p.note, b.fk_account';
$sql.= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
@@ -111,6 +111,7 @@ class PaiementFourn extends Paiement
if ($num > 0)
{
$obj = $this->db->fetch_object($resql);
+
$this->id = $obj->rowid;
$this->ref = $obj->ref;
$this->entity = $obj->entity;
@@ -118,6 +119,7 @@ class PaiementFourn extends Paiement
$this->datepaye = $this->db->jdate($obj->dp);
$this->num_paiement = $obj->num_payment;
$this->num_payment = $obj->num_payment;
+ $this->numero = $obj->num_payment;
$this->bank_account = $obj->fk_account;
$this->fk_account = $obj->fk_account;
$this->bank_line = $obj->fk_bank;
@@ -126,9 +128,10 @@ class PaiementFourn extends Paiement
$this->multicurrency_amount = $obj->multicurrency_amount;
$this->note = $obj->note;
$this->note_private = $obj->note;
- $this->type_code = $obj->paiement_code;
- $this->type_label = $obj->paiement_type;
+ $this->type_code = $obj->payment_code;
+ $this->type_label = $obj->payment_type;
$this->statut = $obj->statut;
+
$error = 1;
}
else
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index afab61f0837..b14dec6b362 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -274,10 +274,10 @@ if ($result > 0)
$i = 0;
$total = 0;
- print ''.$langs->trans("Invoices").'
';
+
print '
| '.$langs->trans('Ref').' | '; + print ''.$langs->trans('Invoice').' | '; print ''.$langs->trans('RefSupplier').' | '; print ''.$langs->trans('Company').' | '; print ''.$langs->trans('ExpectedToPay').' | ';