diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index c885d6228cbc4..5d9e7a9910a90 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -54,18 +54,15 @@ class BookKeeping extends CommonObject
* @var string Name of table without prefix where object is stored
*/
public $table_element = 'accounting_bookkeeping';
-
-
+
public $entity = 1;
-
-
+
/**
*
* @var BookKeepingLine[] Lines
*/
public $lines = array ();
-
-
+
/**
*
* @var int ID
@@ -89,10 +86,10 @@ class BookKeeping extends CommonObject
public $import_key;
public $code_journal;
public $piece_num;
-
+
/**
*/
-
+
/**
* Constructor
*
@@ -101,7 +98,7 @@ class BookKeeping extends CommonObject
public function __construct(DoliDB $db) {
$this->db = $db;
}
-
+
/**
* Create object into database
*
@@ -110,12 +107,12 @@ public function __construct(DoliDB $db) {
* @return int <0 if KO, Id of created object if OK
*/
public function create(User $user, $notrigger = false) {
- global $conf, $langs;
-
+ global $conf, $langs;
+
dol_syslog(__METHOD__, LOG_DEBUG);
-
+
$error = 0;
-
+
// Clean parameters
if (isset($this->doc_type)) {
$this->doc_type = trim($this->doc_type);
@@ -177,15 +174,14 @@ public function create(User $user, $notrigger = false) {
{
$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->fk_doc, $this->doc_type);
}
-
+
return -1;
}
-
-
+
$this->db->begin();
-
+
$this->piece_num = 0;
-
+
// First check if line not yet already in bookkeeping
$sql = "SELECT count(*) as nb";
$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -193,10 +189,10 @@ public function create(User $user, $notrigger = false) {
$sql .= " AND fk_doc = " . $this->fk_doc;
$sql .= " AND fk_docdet = " . $this->fk_docdet; // This field can be 0 is record is for several lines
$sql .= " AND numero_compte = '" . $this->db->escape($this->numero_compte) . "'";
- $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-
+ $sql .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
$resql = $this->db->query($sql);
-
+
if ($resql) {
$row = $this->db->fetch_object($resql);
if ($row->nb == 0)
@@ -207,8 +203,8 @@ public function create(User $user, $notrigger = false) {
$sqlnum .= " WHERE doc_type = '" . $this->db->escape($this->doc_type) . "'"; // For example doc_type = 'bank'
$sqlnum .= " AND fk_docdet = " . $this->db->escape($this->fk_docdet); // fk_docdet is rowid into llx_bank or llx_facturedet or llx_facturefourndet, or ...
$sqlnum .= " AND doc_ref = '" . $this->db->escape($this->doc_ref) . "'"; // ref of source object
- $sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
-
+ $sqlnum .= " AND entity IN (" . getEntity("accountancy", 1) . ")";
+
dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
$resqlnum = $this->db->query($sqlnum);
if ($resqlnum) {
@@ -219,8 +215,8 @@ public function create(User $user, $notrigger = false) {
if (empty($this->piece_num)) {
$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
$sqlnum .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
- $sqlnum .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-
+ $sqlnum .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
+
dol_syslog(get_class($this) . ":: create sqlnum=" . $sqlnum, LOG_DEBUG);
$resqlnum = $this->db->query($sqlnum);
if ($resqlnum) {
@@ -232,12 +228,12 @@ public function create(User $user, $notrigger = false) {
if (empty($this->piece_num)) {
$this->piece_num = 1;
}
-
+
$now = dol_now();
if (empty($this->date_create)) {
$this->date_create = $now;
}
-
+
$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
$sql .= "doc_date";
$sql .= ", doc_type";
@@ -275,7 +271,7 @@ public function create(User $user, $notrigger = false) {
$sql .= "," . $this->piece_num;
$sql .= ", " . (! isset($this->entity) ? '1' : $this->entity);
$sql .= ")";
-
+
dol_syslog(get_class($this) . ":: create sql=" . $sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
@@ -308,7 +304,7 @@ public function create(User $user, $notrigger = false) {
$this->errors[] = 'Error ' . $this->db->lasterror();
dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
}
-
+
if (! $error) {
if (! $notrigger) {
@@ -321,7 +317,7 @@ public function create(User $user, $notrigger = false) {
// // End call triggers
}
}
-
+
// Commit or rollback
if ($error) {
$this->db->rollback();
@@ -331,7 +327,7 @@ public function create(User $user, $notrigger = false) {
return $result;
}
}
-
+
/**
* Create object into database
*
@@ -341,11 +337,11 @@ public function create(User $user, $notrigger = false) {
*/
public function createStd(User $user, $notrigger = false) {
dol_syslog(__METHOD__, LOG_DEBUG);
-
+
$error = 0;
-
+
// Clean parameters
-
+
if (isset($this->doc_type)) {
$this->doc_type = trim($this->doc_type);
}
@@ -393,10 +389,10 @@ public function createStd(User $user, $notrigger = false) {
}
if (empty($this->debit)) $this->debit = 0;
if (empty($this->credit)) $this->credit = 0;
-
+
// Check parameters
// Put here code to add control on parameters values
-
+
// Insert request
$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
$sql .= 'doc_date,';
@@ -435,19 +431,19 @@ public function createStd(User $user, $notrigger = false) {
$sql .= ' ' . (empty($this->piece_num) ? 'NULL' : $this->piece_num).',';
$sql .= ' ' . (! isset($this->entity) ? '1' : $this->entity);
$sql .= ')';
-
+
$this->db->begin();
-
+
$resql = $this->db->query($sql);
if (! $resql) {
$error ++;
$this->errors[] = 'Error ' . $this->db->lasterror();
dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
}
-
+
if (! $error) {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
+
if (! $notrigger) {
// Uncomment this and change MYOBJECT to your own tag if you
// want this action to call a trigger.
@@ -458,7 +454,7 @@ public function createStd(User $user, $notrigger = false) {
// // End call triggers
}
}
-
+
// Commit or rollback
if ($error) {
$this->db->rollback();
@@ -470,7 +466,7 @@ public function createStd(User $user, $notrigger = false) {
return $this->id;
}
}
-
+
/**
* Load object in memory from the database
*
@@ -481,9 +477,9 @@ public function createStd(User $user, $notrigger = false) {
*/
public function fetch($id, $ref = null) {
global $conf;
-
+
dol_syslog(__METHOD__, LOG_DEBUG);
-
+
$sql = 'SELECT';
$sql .= ' t.rowid,';
$sql .= " t.doc_date,";
@@ -510,15 +506,15 @@ public function fetch($id, $ref = null) {
} else {
$sql .= ' AND t.rowid = ' . $id;
}
-
+
$resql = $this->db->query($sql);
if ($resql) {
$numrows = $this->db->num_rows($resql);
if ($numrows) {
$obj = $this->db->fetch_object($resql);
-
+
$this->id = $obj->rowid;
-
+
$this->doc_date = $this->db->jdate($obj->doc_date);
$this->doc_type = $obj->doc_type;
$this->doc_ref = $obj->doc_ref;
@@ -537,7 +533,7 @@ public function fetch($id, $ref = null) {
$this->piece_num = $obj->piece_num;
}
$this->db->free($resql);
-
+
if ($numrows) {
return 1;
} else {
@@ -565,9 +561,9 @@ public function fetch($id, $ref = null) {
*/
public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
global $conf;
-
- dol_syslog(__METHOD__, LOG_DEBUG);
-
+
+ dol_syslog(__METHOD__, LOG_DEBUG);
+
$sql = 'SELECT';
$sql .= ' t.rowid,';
$sql .= " t.doc_date,";
@@ -622,16 +618,16 @@ public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0,
$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
}
$this->lines = array ();
-
+
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
-
+
while ( $obj = $this->db->fetch_object($resql) ) {
$line = new BookKeepingLine();
-
+
$line->id = $obj->rowid;
-
+
$line->doc_date = $this->db->jdate($obj->doc_date);
$line->doc_type = $obj->doc_type;
$line->doc_ref = $obj->doc_ref;
@@ -648,16 +644,16 @@ public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0,
$line->import_key = $obj->import_key;
$line->code_journal = $obj->code_journal;
$line->piece_num = $obj->piece_num;
-
+
$this->lines[] = $line;
}
$this->db->free($resql);
-
+
return $num;
} else {
$this->errors[] = 'Error ' . $this->db->lasterror();
dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-
+
return - 1;
}
}
@@ -677,9 +673,9 @@ public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0,
*/
public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
global $conf;
-
+
dol_syslog(__METHOD__, LOG_DEBUG);
-
+
$sql = 'SELECT';
$sql .= ' t.rowid,';
$sql .= " t.doc_date,";
@@ -723,7 +719,7 @@ public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset =
if (count($sqlwhere) > 0) {
$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
}
-
+
if (! empty($sortfield)) {
$sql .= $this->db->order($sortfield, $sortorder);
}
@@ -731,16 +727,16 @@ public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset =
$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
}
$this->lines = array ();
-
+
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
-
+
while ( $obj = $this->db->fetch_object($resql) ) {
$line = new BookKeepingLine();
-
+
$line->id = $obj->rowid;
-
+
$line->doc_date = $this->db->jdate($obj->doc_date);
$line->doc_type = $obj->doc_type;
$line->doc_ref = $obj->doc_ref;
@@ -757,20 +753,20 @@ public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset =
$line->import_key = $obj->import_key;
$line->code_journal = $obj->code_journal;
$line->piece_num = $obj->piece_num;
-
+
$this->lines[] = $line;
}
$this->db->free($resql);
-
+
return $num;
} else {
$this->errors[] = 'Error ' . $this->db->lasterror();
dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-
+
return - 1;
}
}
-
+
/**
* Load object in memory from the database
*
@@ -785,9 +781,9 @@ public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset =
*/
public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') {
global $conf;
-
+
dol_syslog(__METHOD__, LOG_DEBUG);
-
+
$sql = 'SELECT';
$sql .= " t.numero_compte,";
$sql .= " SUM(t.debit) as debit,";
@@ -817,9 +813,9 @@ public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $o
if (count($sqlwhere) > 0) {
$sql .= ' AND ' . implode(' ' . $filtermode . ' ', $sqlwhere);
}
-
+
$sql .= ' GROUP BY t.numero_compte';
-
+
if (! empty($sortfield)) {
$sql .= $this->db->order($sortfield, $sortorder);
}
@@ -827,30 +823,30 @@ public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $o
$sql .= ' ' . $this->db->plimit($limit + 1, $offset);
}
$this->lines = array ();
-
+
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
-
+
while ( $obj = $this->db->fetch_object($resql) ) {
$line = new BookKeepingLine();
-
+
$line->numero_compte = $obj->numero_compte;
$line->debit = $obj->debit;
$line->credit = $obj->credit;
$this->lines[] = $line;
}
$this->db->free($resql);
-
+
return $num;
} else {
$this->errors[] = 'Error ' . $this->db->lasterror();
dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-
+
return - 1;
}
}
-
+
/**
* Update object into database
*
@@ -861,11 +857,10 @@ public function fetchAllBalance($sortorder = '', $sortfield = '', $limit = 0, $o
*/
public function update(User $user, $notrigger = false) {
$error = 0;
-
+
dol_syslog(__METHOD__, LOG_DEBUG);
-
+
// Clean parameters
-
if (isset($this->doc_type)) {
$this->doc_type = trim($this->doc_type);
}
@@ -911,10 +906,10 @@ public function update(User $user, $notrigger = false) {
if (isset($this->piece_num)) {
$this->piece_num = trim($this->piece_num);
}
-
+
// Check parameters
// Put here code to add a control on parameters values
-
+
// Update request
$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
$sql .= ' doc_date = ' . (! isset($this->doc_date) || dol_strlen($this->doc_date) != 0 ? "'" . $this->db->idate($this->doc_date) . "'" : 'null') . ',';
@@ -934,16 +929,16 @@ public function update(User $user, $notrigger = false) {
$sql .= ' code_journal = ' . (isset($this->code_journal) ? "'" . $this->db->escape($this->code_journal) . "'" : "null") . ',';
$sql .= ' piece_num = ' . (isset($this->piece_num) ? $this->piece_num : "null");
$sql .= ' WHERE rowid=' . $this->id;
-
+
$this->db->begin();
-
+
$resql = $this->db->query($sql);
if (! $resql) {
$error ++;
$this->errors[] = 'Error ' . $this->db->lasterror();
dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
}
-
+
if (! $error && ! $notrigger) {
// Uncomment this and change MYOBJECT to your own tag if you
// want this action calls a trigger.
@@ -953,19 +948,19 @@ public function update(User $user, $notrigger = false) {
// if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
// // End call triggers
}
-
+
// Commit or rollback
if ($error) {
$this->db->rollback();
-
+
return - 1 * $error;
} else {
$this->db->commit();
-
+
return 1;
}
}
-
+
/**
* Delete object in database
*
@@ -976,27 +971,27 @@ public function update(User $user, $notrigger = false) {
*/
public function delete(User $user, $notrigger = false) {
dol_syslog(__METHOD__, LOG_DEBUG);
-
+
$error = 0;
-
+
$this->db->begin();
-
+
if (! $error) {
if (! $notrigger) {
// Uncomment this and change MYOBJECT to your own tag if you
// want this action calls a trigger.
-
+
// // Call triggers
// $result=$this->call_trigger('MYOBJECT_DELETE',$user);
// if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
// // End call triggers
}
}
-
+
if (! $error) {
$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
$sql .= ' WHERE rowid=' . $this->id;
-
+
$resql = $this->db->query($sql);
if (! $resql) {
$error ++;
@@ -1004,19 +999,19 @@ public function delete(User $user, $notrigger = false) {
dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
}
}
-
+
// Commit or rollback
if ($error) {
$this->db->rollback();
-
+
return - 1 * $error;
} else {
$this->db->commit();
-
+
return 1;
}
}
-
+
/**
* Delete bookkepping by importkey
*
@@ -1025,25 +1020,25 @@ public function delete(User $user, $notrigger = false) {
*/
function deleteByImportkey($importkey) {
$this->db->begin();
-
+
// first check if line not yet in bookkeeping
$sql = "DELETE";
$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
$sql .= " WHERE import_key = '" . $importkey . "'";
-
+
$resql = $this->db->query($sql);
-
+
if (! $resql) {
$this->errors[] = "Error " . $this->db->lasterror();
dol_syslog(get_class($this)."::delete Error " . $this->db->lasterror(), LOG_ERR);
$this->db->rollback();
return - 1;
}
-
+
$this->db->commit();
return 1;
}
-
+
/**
* Delete bookkepping by year
*
@@ -1079,7 +1074,7 @@ function deleteByYearAndJournal($delyear='', $journal='') {
$this->db->rollback();
return -1;
}
-
+
$this->db->commit();
return 1;
}
@@ -1094,7 +1089,7 @@ function deleteMvtNum($piecenum) {
global $conf;
$this->db->begin();
-
+
// first check if line not yet in bookkeeping
$sql = "DELETE";
$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
@@ -1112,7 +1107,7 @@ function deleteMvtNum($piecenum) {
$this->db->rollback();
return - 1;
}
-
+
$this->db->commit();
return 1;
}
@@ -1126,7 +1121,7 @@ function deleteMvtNum($piecenum) {
*/
public function createFromClone($fromid) {
dol_syslog(__METHOD__, LOG_DEBUG);
-
+
global $user;
$error = 0;
$object = new Accountingbookkeeping($this->db);
@@ -1154,7 +1149,7 @@ public function createFromClone($fromid) {
// End
if (! $error) {
$this->db->commit();
-
+
return $object->id;
} else {
$this->db->rollback();
@@ -1237,7 +1232,7 @@ public function getNextNumMvt()
$sql = "SELECT MAX(piece_num)+1 as max FROM " . MAIN_DB_PREFIX . $this->table_element;
$sql .= " WHERE entity IN (" . getEntity("accountancy", 1) . ")";
-
+
dol_syslog(get_class($this) . "getNextNumMvt sql=" . $sql, LOG_DEBUG);
$result = $this->db->query($sql);
@@ -1433,8 +1428,7 @@ function select_account($selectid, $htmlname = 'account', $showempty = 0, $event
return $out;
}
-
-
+
/**
* Description of a root accounting account
*
@@ -1442,10 +1436,10 @@ function select_account($selectid, $htmlname = 'account', $showempty = 0, $event
* @return string Root account
*/
function get_compte_racine($account = null)
- {
+ {
global $conf;
$pcgver = $conf->global->CHARTOFACCOUNTS;
-
+
$sql = "SELECT root.account_number, root.label as label";
$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa";
$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
@@ -1456,7 +1450,7 @@ function get_compte_racine($account = null)
$sql .= " AND parent.active = 1";
$sql .= " AND root.active = 1";
$sql .= " AND aa.entity IN (" . getEntity("accountancy", 1) . ")";
-
+
dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
@@ -1464,9 +1458,9 @@ function get_compte_racine($account = null)
if ($this->db->num_rows($resql)) {
$obj = $this->db->fetch_object($resql);
}
-
+
return $obj->label;
-
+
} else {
$this->error = "Error " . $this->db->lasterror();
dol_syslog(__METHOD__ . " " . $this->error, LOG_ERR);
@@ -1483,9 +1477,9 @@ function get_compte_racine($account = null)
* @return string Account desc
*/
function get_compte_desc($account = null)
- {
+ {
global $conf;
-
+
$pcgver = $conf->global->CHARTOFACCOUNTS;
$sql = "SELECT aa.account_number, aa.label, aa.rowid, aa.fk_pcg_version, cat.label as category";
$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account as aa ";
@@ -1495,7 +1489,7 @@ function get_compte_desc($account = null)
$sql .= " AND aa.active = 1";
$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
$sql .= " WHERE aa.entity IN (" . getEntity("accountancy", 1) . ")";
-
+
dol_syslog(get_class($this) . "::select_account sql=" . $sql, LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
@@ -1503,12 +1497,10 @@ function get_compte_desc($account = null)
if ($this->db->num_rows($resql)) {
$obj = $this->db->fetch_object($resql);
}
-
- if(empty($obj->category)){
+ if(empty($obj->category)){
return $obj->label;
}else{
return $obj->label.' ('.$obj->category.')';
-
}
} else {
$this->error = "Error " . $this->db->lasterror();
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index d1602bedf00f0..ea98d67867162 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -34,6 +34,7 @@
require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/bank.lib.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php';
require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
@@ -63,7 +64,10 @@
$langs->load("trips");
$langs->load("hrm");
+// Old system menu
$id_bank_account = GETPOST('id_account', 'int');
+// Multi journal
+$code_journal = GETPOST('code_journal', 'alpha');
$date_startmonth = GETPOST('date_startmonth');
$date_startday = GETPOST('date_startday');
@@ -83,9 +87,9 @@
/*
* Actions
*/
-
+
$error = 0;
-
+
$year_current = strftime("%Y", dol_now());
$pastmonth = strftime("%m", dol_now()) - 1;
$pastmonthyear = $year_current;
@@ -134,9 +138,21 @@
$paymentexpensereportstatic = new PaymentExpenseReport($db);
// Get code of finance journal
-$bank_code_journal = new Account($db);
-$result = $bank_code_journal->fetch($id_bank_account);
-$journal = $bank_code_journal->accountancy_journal;
+$journal = '';
+$bankstatic = new Account($db);
+$bankstatic->fetch($id_bank_account);
+$bankstatic->rowid;
+$bankstatic->number;
+$bankstatic->label;
+$bankstatic->fk_accountancy_journal;
+
+$accountingjournalstatic = new AccountingJournal($db);
+if(! empty($id_bank_account)) {
+ $accountingjournalstatic->fetch($bankstatic->fk_accountancy_journal);
+} else {
+ $accountingjournalstatic->fetch('',$code_journal);
+}
+$journal = $accountingjournalstatic->code;
dol_syslog("accountancy/journal/bankjournal.php", LOG_DEBUG);
$result = $db->query($sql);
@@ -179,7 +195,7 @@
'name' => $obj->name,
'code_compta' => $compta_soc,
);
-
+
$compta_user = (! empty($obj->accountancy_code) ? $obj->accountancy_code : $account_employee);
$tabuser[$obj->rowid] = array (
@@ -205,8 +221,8 @@
if (is_array($links)) {
// Now loop on each link of record in bank.
foreach ( $links as $key => $val ) {
-
- if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport'))) // So we excluded 'company' here
+
+ if (in_array($links[$key]['type'], array('sc', 'payment_sc', 'payment', 'payment_supplier', 'payment_vat', 'payment_expensereport', 'banktransfert'))) // So we excluded 'company' here
{
// We save tabtype for a future use, to remember what kind of payment it is
$tabtype[$obj->rowid] = $links[$key]['type'];
@@ -330,11 +346,11 @@
$error = 0;
foreach ( $tabpay as $key => $val ) { // $key is rowid into llx_bank
-
+
$errorforline = 0;
-
+
$db->begin();
-
+
// Bank
if (! $errorforline)
{
@@ -473,6 +489,9 @@
}
$bookkeeping->code_tiers = $tabcompany[$key]['code_compta'];
$bookkeeping->numero_compte = $k;
+ } else if ($tabtype[$key] == 'banktransfert') {
+ $bookkeeping->code_tiers = '';
+ $bookkeeping->numero_compte = $k;
} else {
// FIXME Should be a temporary account ???
$bookkeeping->doc_ref = $k;
@@ -705,17 +724,17 @@
$invoicestatic = new Facture($db);
$invoicesupplierstatic = new FactureFournisseur($db);
$expensereportstatic = new ExpenseReport($db);
-
+
llxHeader('', $langs->trans("FinanceJournal"));
- $nom = $langs->trans("FinanceJournal") . ' - ' . $bank_code_journal->getNomUrl(1);
+ $nom = $langs->trans("FinanceJournal") . ' - ' . $bankstatic->getNomUrl(1);
$builddate = time();
//$description = $langs->trans("DescFinanceJournal") . '
';
$description.= $langs->trans("DescJournalOnlyBindedVisible").'
';
$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
$varlink = 'id_account=' . $id_bank_account;
-
+
journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
/*if ($conf->global->ACCOUNTING_EXPORT_MODELCSV != 1 && $conf->global->ACCOUNTING_EXPORT_MODELCSV != 2) {
@@ -852,9 +871,9 @@ function writebookkeeping() {
else print $accountoshow;
print "";
if ($val['soclib'] == '') {
- print "" . $bank_code_journal->label . " - " . $val["ref"] . " | ";
+ print "" . $bankstatic->label . " - " . $val["ref"] . " | ";
} else {
- print "" . $bank_code_journal->label . " - " . $val['soclib'] . " | ";
+ print "" . $bankstatic->label . " - " . $val['soclib'] . " | ";
}
print "" . $val["type_payment"] . " | ";
print "" . ($mt >= 0 ? price($mt) : '') . " | ";