Skip to content

Commit

Permalink
FIX #4453 SEPA Direct Debit generated XML shows a trailing comma in R…
Browse files Browse the repository at this point in the history
…mtInf field

Close #4453
  • Loading branch information
marcosgdf committed Mar 2, 2016
1 parent 2d6c2d4 commit 6f54818
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions htdocs/compta/prelevement/class/bonprelevement.class.php
Expand Up @@ -1261,28 +1261,25 @@ function generate()
$dateTime_ECMA = dol_print_date($date_actu, '%Y-%m-%dT%H:%M:%S');
$fileDebiteurSection = '';
$fileEmetteurSection = '';
$ListOfFactures = '';
$i = 0;
$j = 0;
$this->total = 0;

/*
* section Debiteur (sepa Debiteurs bloc lines)
*/

$tmp_invoices = array();

$sql = "SELECT f.facnumber as fac FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."prelevement_facture as pf, ".MAIN_DB_PREFIX."societe as soc, ".MAIN_DB_PREFIX."c_country as p, ".MAIN_DB_PREFIX."societe_rib as rib WHERE pl.fk_prelevement_bons = ".$this->id." AND pl.rowid = pf.fk_prelevement_lignes AND pf.fk_facture = f.rowid AND soc.fk_pays = p.rowid AND soc.rowid = f.fk_soc AND rib.fk_soc = f.fk_soc AND rib.default_rib = 1";
$resql=$this->db->query($sql);
if ($resql)
{
$num = $this->db->num_rows($resql);
while ($j < $num)
{
$objfac = $this->db->fetch_object($resql);
$ListOfFactures .= ($j>0?',':'') . $objfac->fac;
$j++;
if ($resql) {
while ($objfac = $this->db->fetch_object($resql)) {
$tmp_invoices[] = $objfac->fac;
}
}

$ListOfFactures = implode($tmp_invoices);

$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, c.code as country_code,";
$sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.datec, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
Expand Down

0 comments on commit 6f54818

Please sign in to comment.