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

Merge pull request #13259 from ptibogxiv/patch-310

Browse Source 
FIX:  fk_type subscription list via api REST
This commit is contained in:
Laurent Destailleur 2020-03-03 23:11:47 +01:00 committed by GitHub
commit c80e37edf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/adherents/class/adherent.class.php
View File

@ -1377,7 +1377,7 @@ class Adherent extends CommonObject
require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php'; require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
$sql = "SELECT c.rowid, c.fk_adherent, c.subscription, c.note, c.fk_bank,"; $sql = "SELECT c.rowid, c.fk_adherent, c.fk_type, c.subscription, c.note, c.fk_bank,";
$sql .= " c.tms as datem,"; $sql .= " c.tms as datem,";
$sql .= " c.datec as datec,"; $sql .= " c.datec as datec,";
$sql .= " c.dateadh as dateh,"; $sql .= " c.dateadh as dateh,";
@ -1410,6 +1410,7 @@ class Adherent extends CommonObject
$subscription = new Subscription($this->db); $subscription = new Subscription($this->db);
$subscription->id = $obj->rowid; $subscription->id = $obj->rowid;
$subscription->fk_adherent = $obj->fk_adherent; $subscription->fk_adherent = $obj->fk_adherent;
$subscription->fk_type = $obj->fk_type;
$subscription->amount = $obj->subscription; $subscription->amount = $obj->subscription;
$subscription->note = $obj->note; $subscription->note = $obj->note;
$subscription->fk_bank = $obj->fk_bank; $subscription->fk_bank = $obj->fk_bank;