mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-02-08 00:52:01 +01:00
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
This commit is contained in:
@@ -91,7 +91,7 @@ $max=10;
|
||||
|
||||
$sql = "SELECT bc.rowid, bc.date_bordereau as db, bc.amount, bc.ref as ref,";
|
||||
$sql.= " bc.statut, bc.nbcheque,";
|
||||
$sql.= " ba.ref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.fk_accountancy_journal,";
|
||||
$sql.= " ba.ref as bref, ba.label, ba.rowid as bid, ba.number, ba.currency_code, ba.account_number, ba.fk_accountancy_journal,";
|
||||
$sql.= " aj.code";
|
||||
$sql.= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc, ".MAIN_DB_PREFIX."bank_account as ba";
|
||||
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_journal as aj ON aj.rowid = ba.fk_accountancy_journal";
|
||||
@@ -120,7 +120,7 @@ if ($resql)
|
||||
$checkdepositstatic->statut=$objp->statut;
|
||||
|
||||
$accountstatic->id=$objp->bid;
|
||||
$accountstatic->ref=$objp->ref;
|
||||
$accountstatic->ref=$objp->bref;
|
||||
$accountstatic->label=$objp->label;
|
||||
$accountstatic->number=$objp->number;
|
||||
$accountstatic->currency_code=$objp->currency_code;
|
||||
|
||||
Reference in New Issue
Block a user