lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2022-01-07 12:44:03 +01:00
commit 0d6ef2e76b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/fourn/class/paiementfourn.class.php
View File

@ -93,7 +93,7 @@ class PaiementFourn extends Paiement
$sql = 'SELECT p.rowid, p.ref, p.entity, p.datep as dp, p.amount, p.statut, p.fk_bank, p.multicurrency_amount,'; $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 payment_code, c.libelle as payment_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 .= ' p.num_paiement as num_payment, p.note, b.fk_account, p.fk_paiement';
$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p'; $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn as p';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid'; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
@ -130,6 +130,7 @@ class PaiementFourn extends Paiement
$this->note_private = $obj->note; $this->note_private = $obj->note;
$this->type_code = $obj->payment_code; $this->type_code = $obj->payment_code;
$this->type_label = $obj->payment_type; $this->type_label = $obj->payment_type;
$this->fk_paiement = $obj->fk_paiement;
$this->statut = $obj->statut; $this->statut = $obj->statut;
$error = 1; $error = 1;