alxarafe / alixar

Dolibarr/Modules/Contrat.php

Spacing +2 added lines, -2 removed lines

@@ -248,8 +248,8 @@
         }
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[1][2]) . "' AND type = 'contract' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[1][2]) . "', 'contract', " . ((int)$conf->entity) . ")"
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[1][2]) . "' AND type = 'contract' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[1][2]) . "', 'contract', " . ((int) $conf->entity) . ")"
         );
 
         return $this->_init($sql, $options);

Dolibarr/Modules/MultiCurrency.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
                 'priority' => 61,
                 'label' => 'MutltiCurrencyAutoUpdateCurrencies',
                 'jobtype' => 'method',
-                'class' => 'multicurrency/class/multicurrency.class.php',   // TODO: Review. Is correct? The file no longer exists!
+                'class' => 'multicurrency/class/multicurrency.class.php', // TODO: Review. Is correct? The file no longer exists!
                 'objectname' => 'MultiCurrency',
                 'method' => 'syncRates',
                 'parameters' => '0,0,cron',

Dolibarr/Modules/Facture.php

Spacing +3 added lines, -3 removed lines

@@ -656,7 +656,7 @@ 
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facturedet_extrafields as extra2 on fd.rowid = extra2.fk_object';
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product as p on (fd.fk_product = p.rowid)';
         if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
-            $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int)$conf->entity);
+            $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
         }
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product_extrafields as extra3 on p.rowid = extra3.fk_object';
         $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'accounting_account as aa on fd.fk_code_ventilation = aa.rowid';
@@ -793,8 +793,8 @@ 
         }
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[1][2]) . "' AND type = 'invoice' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[1][2]) . "','invoice'," . ((int)$conf->entity) . ")"
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[1][2]) . "' AND type = 'invoice' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[1][2]) . "','invoice'," . ((int) $conf->entity) . ")"
         );
 
         return $this->_init($sql, $options);

Dolibarr/Modules/ExpenseReport.php

Spacing +2 added lines, -2 removed lines

@@ -266,8 +266,8 @@
         $this->remove($options);
 
         $sql = array(
-            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard' AND type='expensereport' AND entity = " . ((int)$conf->entity),
-            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard','expensereport'," . ((int)$conf->entity) . ")"
+            "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = 'standard' AND type='expensereport' AND entity = " . ((int) $conf->entity),
+            "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('standard','expensereport'," . ((int) $conf->entity) . ")"
         );
 
         return $this->_init($sql, $options);

Dolibarr/Code/MultiCurrency/Classes/MultiCurrency.php

Spacing +13 added lines, -13 removed lines

@@ -124,7 +124,7 @@ 
     {
         global $conf;
 
-        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "multicurrency WHERE code = '" . $dbs->escape($code) . "' AND entity = " . ((int)$conf->entity);
+        $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "multicurrency WHERE code = '" . $dbs->escape($code) . "' AND entity = " . ((int) $conf->entity);
 
         dol_syslog(__METHOD__, LOG_DEBUG);
         $resql = $dbs->query($sql);
@@ -198,9 +198,9 @@ 
 
         if ($multicurrency_tx) {
             if ($way == 'dolibarr') {
-                return (float)price2num($amount * $multicurrency_tx, 'MU');
+                return (float) price2num($amount * $multicurrency_tx, 'MU');
             } else {
-                return (float)price2num($amount / $multicurrency_tx, 'MU');
+                return (float) price2num($amount / $multicurrency_tx, 'MU');
             }
         } else {
             return false;
@@ -218,7 +218,7 @@ 
     {
         global $db;
 
-        $sql = "SELECT multicurrency_tx FROM " . MAIN_DB_PREFIX . $table . " WHERE rowid = " . ((int)$fk_facture);
+        $sql = "SELECT multicurrency_tx FROM " . MAIN_DB_PREFIX . $table . " WHERE rowid = " . ((int) $fk_facture);
 
         dol_syslog(__METHOD__, LOG_DEBUG);
         $resql = $db->query($sql);
@@ -258,7 +258,7 @@ 
         $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET";
         $sql .= " name = '" . $this->db->escape($this->name) . "',";
         $sql .= " code = '" . $this->db->escape($this->code) . "'";
-        $sql .= " WHERE rowid = " . ((int)$this->id);
+        $sql .= " WHERE rowid = " . ((int) $this->id);
 
         $this->db->begin();
 
@@ -319,7 +319,7 @@ 
             }
 
             $sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element;
-            $sql .= " WHERE rowid = " . ((int)$this->id);
+            $sql .= " WHERE rowid = " . ((int) $this->id);
 
             dol_syslog(__METHOD__, LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -479,7 +479,7 @@ 
         if (!empty($code)) {
             $sql .= ' WHERE c.code = \'' . $this->db->escape($code) . '\' AND c.entity = ' . $conf->entity;
         } else {
-            $sql .= ' WHERE c.rowid = ' . ((int)$id);
+            $sql .= ' WHERE c.rowid = ' . ((int) $id);
         }
 
         dol_syslog(__METHOD__, LOG_DEBUG);
@@ -524,7 +524,7 @@ 
     {
         $sql = "SELECT cr.rowid";
         $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element_line . ' as cr';
-        $sql .= ' WHERE cr.fk_multicurrency = ' . ((int)$this->id);
+        $sql .= ' WHERE cr.fk_multicurrency = ' . ((int) $this->id);
         $sql .= ' ORDER BY cr.date_sync DESC';
 
         $this->rates = array();
@@ -560,8 +560,8 @@ 
     {
         $sql = "SELECT cr.rowid";
         $sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element_line . " as cr";
-        $sql .= " WHERE cr.fk_multicurrency = " . ((int)$this->id);
-        $sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM " . MAIN_DB_PREFIX . $this->table_element_line . " AS cr2 WHERE cr2.fk_multicurrency = " . ((int)$this->id) . ")";
+        $sql .= " WHERE cr.fk_multicurrency = " . ((int) $this->id);
+        $sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM " . MAIN_DB_PREFIX . $this->table_element_line . " AS cr2 WHERE cr2.fk_multicurrency = " . ((int) $this->id) . ")";
 
         dol_syslog(__METHOD__, LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -595,7 +595,7 @@ 
         global $user;
 
         $currencyRate = new CurrencyRate($this->db);
-        $currencyRate->rate = (float)price2num($rate);
+        $currencyRate->rate = (float) price2num($rate);
 
         if ($currencyRate->create($user, $this->id) > 0) {
             $this->rate = $currencyRate;
@@ -643,9 +643,9 @@ 
         $sql .= ') VALUES (';
         $sql .= " '" . $this->db->escape($this->code) . "',";
         $sql .= " '" . $this->db->escape($this->name) . "',";
-        $sql .= " " . ((int)$this->entity) . ",";
+        $sql .= " " . ((int) $this->entity) . ",";
         $sql .= " '" . $this->db->idate($now) . "',";
-        $sql .= " " . ((int)$user->id);
+        $sql .= " " . ((int) $user->id);
         $sql .= ')';
 
         $this->db->begin();

Dolibarr/Core/Base/DolibarrModules.php

Spacing +30 added lines, -30 removed lines

@@ -531,7 +531,7 @@ 
         $sql_del = "SELECT " . $this->db->decrypt('value') . " as value";
         $sql_del .= " FROM " . MAIN_DB_PREFIX . "const";
         $sql_del .= " WHERE " . $this->db->decrypt('name') . " = '" . $this->db->escape($this->const_name) . "'";
-        $sql_del .= " AND entity IN (0," . ((int)$entity) . ")";
+        $sql_del .= " AND entity IN (0," . ((int) $entity) . ")";
 
         $resql = $this->db->query($sql_del);
 
@@ -554,9 +554,9 @@ 
 
                 // If the module is active
                 foreach ($this->rights as $key => $value) {
-                    $r_id = $this->rights[$key][self::KEY_ID];  // permission id in llx_rights_def (not unique because primary key is couple id-entity)
+                    $r_id = $this->rights[$key][self::KEY_ID]; // permission id in llx_rights_def (not unique because primary key is couple id-entity)
                     $r_label = $this->rights[$key][self::KEY_LABEL];
-                    $r_type = $this->rights[$key][self::KEY_TYPE] ?? 'w';   // TODO deprecated
+                    $r_type = $this->rights[$key][self::KEY_TYPE] ?? 'w'; // TODO deprecated
                     $r_default = $this->rights[$key][self::KEY_DEFAULT] ?? 0;
                     $r_perms = $this->rights[$key][self::KEY_FIRST_LEVEL] ?? '';
                     $r_subperms = $this->rights[$key][self::KEY_SECOND_LEVEL] ?? '';
@@ -584,8 +584,8 @@ 
 
                     // Search if perm already present
                     $sql = "SELECT count(*) as nb FROM " . MAIN_DB_PREFIX . "rights_def";
-                    $sql .= " WHERE entity = " . ((int)$entity);
-                    $sql .= " AND id = " . ((int)$r_id);
+                    $sql .= " WHERE entity = " . ((int) $entity);
+                    $sql .= " AND id = " . ((int) $r_id);
 
                     $resqlselect = $this->db->query($sql);
                     if ($resqlselect) {
@@ -597,19 +597,19 @@ 
                             $sql .= ", libelle";
                             $sql .= ", module";
                             $sql .= ", module_origin";
-                            $sql .= ", type";   // TODO deprecated
+                            $sql .= ", type"; // TODO deprecated
                             $sql .= ", bydefault";
                             $sql .= ", perms";
                             $sql .= ", subperms";
                             $sql .= ", enabled";
                             $sql .= ") VALUES (";
-                            $sql .= ((int)$r_id);
-                            $sql .= ", " . ((int)$entity);
+                            $sql .= ((int) $r_id);
+                            $sql .= ", " . ((int) $entity);
                             $sql .= ", '" . $this->db->escape($r_label) . "'";
                             $sql .= ", '" . $this->db->escape($r_module) . "'";
                             $sql .= ", '" . $this->db->escape($r_module_origin) . "'";
-                            $sql .= ", '" . $this->db->escape($r_type) . "'";   // TODO deprecated
-                            $sql .= ", " . ((int)$r_default);
+                            $sql .= ", '" . $this->db->escape($r_type) . "'"; // TODO deprecated
+                            $sql .= ", " . ((int) $r_default);
                             $sql .= ", '" . $this->db->escape($r_perms) . "'";
                             $sql .= ", '" . $this->db->escape($r_subperms) . "'";
                             $sql .= ", '" . $this->db->escape($r_enabled) . "'";
@@ -851,7 +851,7 @@ 
         }
 
         // Run complementary sql requests
-        $num = count((array)$array_sql);
+        $num = count((array) $array_sql);
         for ($i = 0; $i < $num; $i++) {
             if (!$err) {
                 dol_syslog(get_class($this) . "::_remove", LOG_DEBUG);
@@ -876,7 +876,7 @@ 
                 $moduleNameInConf = 'supplier_proposal';
             }
 
-            unset($conf->modules[$moduleNameInConf]);   // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
+            unset($conf->modules[$moduleNameInConf]); // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
 
             return 1;
         } else {
@@ -964,7 +964,7 @@ 
 
                 $sql = "DELETE FROM " . MAIN_DB_PREFIX . "const";
                 $sql .= " WHERE " . $this->db->decrypt('name') . " LIKE '" . $this->db->escape($this->const_name) . "_" . strtoupper($key) . "'";
-                $sql .= " AND entity = " . ((int)$entity);
+                $sql .= " AND entity = " . ((int) $entity);
 
                 if (!$this->db->query($sql)) {
                     $this->error = $this->db->lasterror();
@@ -1069,7 +1069,7 @@ 
 
                 $sql = "DELETE FROM " . MAIN_DB_PREFIX . "boxes_def";
                 $sql .= " WHERE file = '" . $this->db->escape($file) . "'";
-                $sql .= " AND entity = " . $conf->entity;     // Do not use getEntity here, we want to delete only in current company
+                $sql .= " AND entity = " . $conf->entity; // Do not use getEntity here, we want to delete only in current company
 
                 dol_syslog(get_class($this) . "::delete_boxes", LOG_DEBUG);
                 $resql = $this->db->query($sql);
@@ -1132,7 +1132,7 @@ 
 
         // Delete all entities if core module
         if (empty($this->core_enabled)) {
-            $sql .= " AND entity = " . ((int)$conf->entity);
+            $sql .= " AND entity = " . ((int) $conf->entity);
         }
 
         dol_syslog(get_class($this) . "::delete_permissions", LOG_DEBUG);
@@ -1161,7 +1161,7 @@ 
 
         $sql = "DELETE FROM " . MAIN_DB_PREFIX . "menu";
         $sql .= " WHERE module = '" . $this->db->escape($module) . "'";
-        $sql .= " AND menu_handler = 'all'";    // We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
+        $sql .= " AND menu_handler = 'all'"; // We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
         $sql .= " AND entity IN (0, " . $conf->entity . ")";
 
         dol_syslog(get_class($this) . "::delete_menus", LOG_DEBUG);
@@ -1219,7 +1219,7 @@ 
         if ($pathoffile) {     // Mostly for external modules
             $content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024); // Max size loaded 1Mb
 
-            if ((float)DOL_VERSION >= 6.0) {
+            if ((float) DOL_VERSION >= 6.0) {
                 @include_once DOL_DOCUMENT_ROOT . '/core/lib/parsemd.lib.php';
 
                 $content = dolMd2Html(
@@ -1319,7 +1319,7 @@ 
         if ($filefound) {     // Mostly for external modules
             $content = file_get_contents($pathoffile);
 
-            if ((float)DOL_VERSION >= 6.0) {
+            if ((float) DOL_VERSION >= 6.0) {
                 @include_once DOL_DOCUMENT_ROOT . '/core/lib/parsemd.lib.php';
 
                 $content = dolMd2Html($content, 'parsedown', array('doc/' => dol_buildpath(strtolower($this->name) . '/doc/', 1)));
@@ -1458,7 +1458,7 @@ 
 
         $sql = "SELECT tms FROM " . MAIN_DB_PREFIX . "const";
         $sql .= " WHERE " . $this->db->decrypt('name') . " = '" . $this->db->escape($this->const_name) . "'";
-        $sql .= " AND entity IN (0, " . ((int)$conf->entity) . ")";
+        $sql .= " AND entity IN (0, " . ((int) $conf->entity) . ")";
 
         dol_syslog(get_class($this) . "::getLastActiveDate", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -1607,7 +1607,7 @@ 
                     $ignoreerror = $val['ignoreerror'];
                 }
                 // Add current entity id
-                $sql = str_replace('__ENTITY__', (string)$conf->entity, $sql);
+                $sql = str_replace('__ENTITY__', (string) $conf->entity, $sql);
 
                 dol_syslog(get_class($this) . "::_init ignoreerror=" . $ignoreerror, LOG_DEBUG);
                 $result = $this->db->query($sql, $ignoreerror);
@@ -1681,7 +1681,7 @@ 
         $sql = "INSERT INTO " . MAIN_DB_PREFIX . "const (name, value, visible, entity, note) VALUES";
         $sql .= " (" . $this->db->encrypt($this->const_name);
         $sql .= ", " . $this->db->encrypt('1');
-        $sql .= ", 0, " . ((int)$entity);
+        $sql .= ", 0, " . ((int) $entity);
         $sql .= ", '" . $this->db->escape($note) . "')";
 
         dol_syslog(get_class($this) . "::_active insert activation constant", LOG_DEBUG);
@@ -1741,7 +1741,7 @@ 
                     $sql .= ", " . $this->db->encrypt($newvalue);
                     $sql .= ", null";
                     $sql .= ", '0'";
-                    $sql .= ", " . ((int)$entity);
+                    $sql .= ", " . ((int) $entity);
                     $sql .= ")";
 
                     $resql = $this->db->query($sql);
@@ -1857,7 +1857,7 @@ 
                     $sql .= ", " . $this->db->encrypt($newvalue, 1);
                     $sql .= ", null";
                     $sql .= ", '0'";
-                    $sql .= ", " . ((int)$entity);
+                    $sql .= ", " . ((int) $entity);
                     $sql .= ")";
 
                     dol_syslog(get_class($this) . "::insert_module_parts for key=" . $this->const_name . "_" . strtoupper($key), LOG_DEBUG);
@@ -1917,7 +1917,7 @@ 
             $sql = "SELECT count(*) as nb";
             $sql .= " FROM " . MAIN_DB_PREFIX . "const";
             $sql .= " WHERE " . $this->db->decrypt('name') . " = '" . $this->db->escape($name) . "'";
-            $sql .= " AND entity = " . ((int)$entity);
+            $sql .= " AND entity = " . ((int) $entity);
 
             $result = $this->db->query($sql);
             if ($result) {
@@ -2021,7 +2021,7 @@ 
                                 }
 
                                 $sql = "INSERT INTO " . MAIN_DB_PREFIX . "boxes (box_id, position, box_order, fk_user, entity)";
-                                $sql .= " VALUES (" . ((int)$lastid) . ", " . ((int)$key2) . ", '0', 0, " . ((int)$conf->entity) . ")";
+                                $sql .= " VALUES (" . ((int) $lastid) . ", " . ((int) $key2) . ", '0', 0, " . ((int) $conf->entity) . ")";
 
                                 dol_syslog(get_class($this) . "::insert_boxes onto page " . $key2 . "=" . $val2, LOG_DEBUG);
                                 $resql = $this->db->query($sql);
@@ -2105,7 +2105,7 @@ 
                 if ($parameters) {
                     $sql .= " AND params = '".$this->db->escape($parameters)."'";
                 }*/
-                $sql .= " AND entity = " . ((int)$entity); // Must be exact entity
+                $sql .= " AND entity = " . ((int) $entity); // Must be exact entity
 
                 $now = dol_now();
 
@@ -2153,7 +2153,7 @@ 
                                 $sql .= "'" . $this->db->escape($priority) . "', ";
                             }
                             if (is_int($status)) {
-                                $sql .= ((int)$status) . ", ";
+                                $sql .= ((int) $status) . ", ";
                             }
                             $sql .= $entity . ",";
                             $sql .= "'" . $this->db->escape($test) . "'";
@@ -2381,7 +2381,7 @@ 
 
             if ($row[0] == 0) {
                 $sql = "INSERT INTO " . MAIN_DB_PREFIX . "const (name, type, value, note, visible, entity)";
-                $sql .= " VALUES (" . $this->db->encrypt($name) . ", 'chaine', " . $this->db->encrypt($dir) . ", '" . $this->db->escape("Directory for module " . $this->name) . "', '0', " . ((int)$conf->entity) . ")";
+                $sql .= " VALUES (" . $this->db->encrypt($name) . ", 'chaine', " . $this->db->encrypt($dir) . ", '" . $this->db->escape("Directory for module " . $this->name) . "', '0', " . ((int) $conf->entity) . ")";
 
                 dol_syslog(get_class($this) . "::insert_dirs", LOG_DEBUG);
                 $this->db->query($sql);
@@ -2467,7 +2467,7 @@ 
 
         $return .= '<div class="valignmiddle inline-block info-box-more">';
         //if ($versiontrans) print img_warning($langs->trans("Version").' '.$this->getVersion(1)).' ';
-        $return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\'' . constant('BASE_URL') . '/admin/modulehelp.php?id=' . ((int)$this->numero) . '\',\'text/html\',\'' . dol_escape_js($langs->trans("Module")) . '\')">' . img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule") . ' - ' : '') . $langs->trans("ClickToShowDescription"), $imginfo) . '</a>';
+        $return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\'' . constant('BASE_URL') . '/admin/modulehelp.php?id=' . ((int) $this->numero) . '\',\'text/html\',\'' . dol_escape_js($langs->trans("Module")) . '\')">' . img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule") . ' - ' : '') . $langs->trans("ClickToShowDescription"), $imginfo) . '</a>';
         $return .= '</div><br>';
 
         $return .= '<div class="valignmiddle inline-block info-box-actions">';
@@ -2623,7 +2623,7 @@ 
     {
         require_once constant('DOL_DOCUMENT_ROOT') . '/core/lib/geturl.lib.php';
         if (!empty($this->url_last_version)) {
-            $lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);    // Accept http or https links on external remote server only
+            $lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
             if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
                 // Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
                 $this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);

Dolibarr/Core/Trait/DolDeprecationHandler.php

Spacing +5 added lines, -5 removed lines

@@ -60,12 +60,12 @@ 
             return $this->$newProperty;
         }
         if ($this->isDynamicPropertiesEnabled()) {
-            return null;  // If the property is set, then __get is not called.
+            return null; // If the property is set, then __get is not called.
         }
         $msg = "DolDeprecationHandler: Undefined property '" . $name . "'" . self::getCallerInfoString();
         dol_syslog($msg);
         trigger_error($msg, E_USER_NOTICE);
-        return $this->$name;  // Returning value anyway (graceful degradation)
+        return $this->$name; // Returning value anyway (graceful degradation)
     }
 
     /**
@@ -95,7 +95,7 @@ 
         if (!$this->isDynamicPropertiesEnabled()) {
             $msg = "DolDeprecationHandler: Undefined property '" . $name . "'" . self::getCallerInfoString();
             trigger_error($msg, E_USER_NOTICE);
-            $this->$name = $value;  // Setting anyway for graceful degradation
+            $this->$name = $value; // Setting anyway for graceful degradation
         } else {
             $this->$name = $value;
         }
@@ -192,7 +192,7 @@ 
 
         if (property_exists($this, 'enableDeprecatedReporting')) {
             // If the property exists, then we use it.
-            return (bool)$this->enableDeprecatedReporting;
+            return (bool) $this->enableDeprecatedReporting;
         }
 
         return (error_reporting() & E_DEPRECATED) === E_DEPRECATED;
@@ -209,7 +209,7 @@ 
 
         if (property_exists($this, 'enableDynamicProperties')) {
             // If the property exists, then we use it.
-            return (bool)$this->enableDynamicProperties;
+            return (bool) $this->enableDynamicProperties;
         }
 
         // Otherwise it depends on a choice

public/htdocs/accountancy/journal/bankjournal.php

Indentation +1093 added lines, -1093 removed lines

@@ -369,235 +369,235 @@ 
                     // We save tabtype for a future use, to remember what kind of payment it is
                     $tabpay[$obj->rowid]['type'] = $links[$key]['type'];
                     $tabtype[$obj->rowid] = $links[$key]['type'];
-					/* phpcs:disable -- Code does nothing at this moment -> commented
+                    /* phpcs:disable -- Code does nothing at this moment -> commented
 					} elseif (in_array($links[$key]['type'], array('company', 'user'))) {
 						if ($tabpay[$obj->rowid]['type'] == 'unknown') {
 							// We can guess here it is a bank record for a thirdparty company or a user.
 							// But we won't be able to record somewhere else than into a waiting account, because there is no other journal to record the contreparty.
 						}
 					*/ // phpcs::enable
-				}
-
-				// Special case to ask later to add more request to get information for old links without company link.
-				if ($links[$key]['type'] == 'withdraw') {
-					$tabmoreinfo[$obj->rowid]['withdraw'] = 1;
-				}
+                }
 
-				if ($links[$key]['type'] == 'payment') {
-					$paymentstatic->id = $links[$key]['url_id'];
-					$paymentstatic->ref = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentstatic->getNomUrl(2, '', ''); // TODO Do not include list of invoice in tooltip, the dol_string_nohtmltag is ko with this
-					$tabpay[$obj->rowid]["paymentid"] = $paymentstatic->id;
-				} elseif ($links[$key]['type'] == 'payment_supplier') {
-					$paymentsupplierstatic->id = $links[$key]['url_id'];
-					$paymentsupplierstatic->ref = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsupplierstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentsupplierid"] = $paymentsupplierstatic->id;
-				} elseif ($links[$key]['type'] == 'company') {
-					$societestatic->id = $links[$key]['url_id'];
-					$societestatic->name = $links[$key]['label'];
-					$societestatic->email = $tabcompany[$obj->rowid]['email'];
-					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
-					if ($compta_soc) {
-						if (empty($tabtp[$obj->rowid][$compta_soc])) {
-							$tabtp[$obj->rowid][$compta_soc] = $amounttouse;
-						} else {
-							$tabtp[$obj->rowid][$compta_soc] += $amounttouse;
-						}
-					}
-				} elseif ($links[$key]['type'] == 'user') {
-					$userstatic->id = $links[$key]['url_id'];
-					$userstatic->name = $links[$key]['label'];
-					$userstatic->email = $tabuser[$obj->rowid]['email'];
-					$userstatic->firstname = $tabuser[$obj->rowid]['firstname'];
-					$userstatic->lastname = $tabuser[$obj->rowid]['lastname'];
-					$userstatic->status = $tabuser[$obj->rowid]['status'];
-					$userstatic->accountancy_code = $tabuser[$obj->rowid]['accountancy_code'];
-					if ($userstatic->id > 0) {
-						$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
-					} else {
-						$tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
-					}
-					if ($compta_user) {
-						$tabtp[$obj->rowid][$compta_user] += $amounttouse;
-					}
-				} elseif ($links[$key]['type'] == 'sc') {
-					$chargestatic->id = $links[$key]['url_id'];
-					$chargestatic->ref = $links[$key]['url_id'];
-
-					$tabpay[$obj->rowid]["lib"] .= ' '.$chargestatic->getNomUrl(2);
-					$reg = array();
-					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
-						if ($reg[1] == 'socialcontribution') {
-							$reg[1] = 'SocialContribution';
-						}
-						$chargestatic->label = $langs->trans($reg[1]);
-					} else {
-						$chargestatic->label = $links[$key]['label'];
-					}
-					$chargestatic->ref = $chargestatic->label;
-					$tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
-					$tabpay[$obj->rowid]["paymentscid"] = $chargestatic->id;
-
-					// Retrieve the accounting code of the social contribution of the payment from link of payment.
-					// Note: We have the social contribution id, it can be faster to get accounting code from social contribution id.
-					$sqlmid = "SELECT cchgsoc.accountancy_code";
-					$sqlmid .= " FROM ".MAIN_DB_PREFIX."c_chargesociales cchgsoc";
-					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."chargesociales as chgsoc ON chgsoc.fk_type = cchgsoc.id";
-					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."paiementcharge as paycharg ON paycharg.fk_charge = chgsoc.rowid";
-					$sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."bank_url as bkurl ON bkurl.url_id=paycharg.rowid AND bkurl.type = 'payment_sc'";
-					$sqlmid .= " WHERE bkurl.fk_bank = ".((int) $obj->rowid);
-
-					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=".$sqlmid, LOG_DEBUG);
-					$resultmid = $db->query($sqlmid);
-					if ($resultmid) {
-						$objmid = $db->fetch_object($resultmid);
-						$tabtp[$obj->rowid][$objmid->accountancy_code] = isset($tabtp[$obj->rowid][$objmid->accountancy_code]) ? $tabtp[$obj->rowid][$objmid->accountancy_code] + $amounttouse : $amounttouse;
-					}
-				} elseif ($links[$key]['type'] == 'payment_donation') {
-					$paymentdonstatic->id = $links[$key]['url_id'];
-					$paymentdonstatic->ref = $links[$key]['url_id'];
-					$paymentdonstatic->fk_donation = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentdonstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentdonationid"] = $paymentdonstatic->id;
-					$tabtp[$obj->rowid][$account_pay_donation] = isset($tabtp[$obj->rowid][$account_pay_donation]) ? $tabtp[$obj->rowid][$account_pay_donation] + $amounttouse : $amounttouse;
-				} elseif ($links[$key]['type'] == 'member') {
-					$paymentsubscriptionstatic->id = $links[$key]['url_id'];
-					$paymentsubscriptionstatic->ref = $links[$key]['url_id'];
-					$paymentsubscriptionstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsubscriptionstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentsubscriptionid"] = $paymentsubscriptionstatic->id;
-					$paymentsubscriptionstatic->fetch($paymentsubscriptionstatic->id);
-					$tabtp[$obj->rowid][$account_pay_subscription] = isset($tabtp[$obj->rowid][$account_pay_subscription]) ? $tabtp[$obj->rowid][$account_pay_subscription] + $amounttouse : $amounttouse;
-				} elseif ($links[$key]['type'] == 'payment_vat') {				// Payment VAT
-					$paymentvatstatic->id = $links[$key]['url_id'];
-					$paymentvatstatic->ref = $links[$key]['url_id'];
-					$paymentvatstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentvatstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentvatid"] = $paymentvatstatic->id;
-					$tabtp[$obj->rowid][$account_pay_vat] = isset($tabtp[$obj->rowid][$account_pay_vat]) ? $tabtp[$obj->rowid][$account_pay_vat] + $amounttouse : $amounttouse;
-				} elseif ($links[$key]['type'] == 'payment_salary') {
-					$paymentsalstatic->id = $links[$key]['url_id'];
-					$paymentsalstatic->ref = $links[$key]['url_id'];
-					$paymentsalstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsalstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
-
-					// This part of code is no more required. it is here to solve case where a link were missing (with v14.0.0) and keep writing in accountancy complete.
-					// Note: A better way to fix this is to delete payment of salary and recreate it, or to fix the bookkeeping table manually after.
-					if (getDolGlobalString('ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USER_ON_SALARY_BANK_PAYMENT')) {
-						$tmpsalary = new Salary($db);
-						$tmpsalary->fetch($paymentsalstatic->id);
-						$tmpsalary->fetch_user($tmpsalary->fk_user);
-
-						$userstatic->id = $tmpsalary->user->id;
-						$userstatic->name = $tmpsalary->user->name;
-						$userstatic->email = $tmpsalary->user->email;
-						$userstatic->firstname = $tmpsalary->user->firstname;
-						$userstatic->lastname = $tmpsalary->user->lastname;
-						$userstatic->status = $tmpsalary->user->status;
-						$userstatic->accountancy_code = $tmpsalary->user->accountancy_code;
-
-						if ($userstatic->id > 0) {
-							$tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
-						} else {
-							$tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen
-						}
+                // Special case to ask later to add more request to get information for old links without company link.
+                if ($links[$key]['type'] == 'withdraw') {
+                    $tabmoreinfo[$obj->rowid]['withdraw'] = 1;
+                }
 
-						if (empty($obj->typeop_user)) {	// Add test to avoid to add amount twice if a link already exists also on user.
-							$compta_user = $userstatic->accountancy_code;
-							if ($compta_user) {
-								$tabtp[$obj->rowid][$compta_user] += $amounttouse;
-								$tabuser[$obj->rowid] = array(
-								'id' => $userstatic->id,
-								'name' => dolGetFirstLastname($userstatic->firstname, $userstatic->lastname),
-								'lastname' => $userstatic->lastname,
-								'firstname' => $userstatic->firstname,
-								'email' => $userstatic->email,
-								'accountancy_code' => $compta_user,
-								'status' => $userstatic->status
-								);
-							}
-						}
-					}
-				} elseif ($links[$key]['type'] == 'payment_expensereport') {
-					$paymentexpensereportstatic->id = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= $paymentexpensereportstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentexpensereport"] = $paymentexpensereportstatic->id;
-				} elseif ($links[$key]['type'] == 'payment_various') {
-					$paymentvariousstatic->id = $links[$key]['url_id'];
-					$paymentvariousstatic->ref = $links[$key]['url_id'];
-					$paymentvariousstatic->label = $links[$key]['label'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentvariousstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentvariousid"] = $paymentvariousstatic->id;
-					$paymentvariousstatic->fetch($paymentvariousstatic->id);
-					$account_various = (!empty($paymentvariousstatic->accountancy_code) ? $paymentvariousstatic->accountancy_code : 'NotDefined'); // NotDefined is a reserved word
-					$account_subledger = (!empty($paymentvariousstatic->subledger_account) ? $paymentvariousstatic->subledger_account : ''); // NotDefined is a reserved word
-					$tabpay[$obj->rowid]["account_various"] = $account_various;
-					$tabtp[$obj->rowid][$account_subledger] = isset($tabtp[$obj->rowid][$account_subledger]) ? $tabtp[$obj->rowid][$account_subledger] + $amounttouse : $amounttouse;
-				} elseif ($links[$key]['type'] == 'payment_loan') {
-					$paymentloanstatic->id = $links[$key]['url_id'];
-					$paymentloanstatic->ref = $links[$key]['url_id'];
-					$paymentloanstatic->fk_loan = $links[$key]['url_id'];
-					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentloanstatic->getNomUrl(2);
-					$tabpay[$obj->rowid]["paymentloanid"] = $paymentloanstatic->id;
-					//$tabtp[$obj->rowid][$account_pay_loan] += $amounttouse;
-					$sqlmid = 'SELECT pl.amount_capital, pl.amount_insurance, pl.amount_interest, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest';
-					$sqlmid .= ' FROM '.MAIN_DB_PREFIX.'payment_loan as pl, '.MAIN_DB_PREFIX.'loan as l';
-					$sqlmid .= ' WHERE l.rowid = pl.fk_loan AND pl.fk_bank = '.((int) $obj->rowid);
-
-					dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=".$sqlmid, LOG_DEBUG);
-					$resultmid = $db->query($sqlmid);
-					if ($resultmid) {
-						$objmid = $db->fetch_object($resultmid);
-						$tabtp[$obj->rowid][$objmid->accountancy_account_capital] = isset($tabtp[$obj->rowid][$objmid->accountancy_account_capital]) ? $tabtp[$obj->rowid][$objmid->accountancy_account_capital] - $objmid->amount_capital : $amounttouse;
-						$tabtp[$obj->rowid][$objmid->accountancy_account_insurance] = isset($tabtp[$obj->rowid][$objmid->accountancy_account_insurance]) ? $tabtp[$obj->rowid][$objmid->accountancy_account_insurance] - $objmid->amount_insurance : $amounttouse;
-						$tabtp[$obj->rowid][$objmid->accountancy_account_interest] = isset($tabtp[$obj->rowid][$objmid->accountancy_account_interest]) ? $tabtp[$obj->rowid][$objmid->accountancy_account_interest] - $objmid->amount_interes : $amounttouse;
-					}
-				} elseif ($links[$key]['type'] == 'banktransfert') {
-					$accountLinestatic->fetch($links[$key]['url_id']);
-					$tabpay[$obj->rowid]["lib"] .= ' '.$langs->trans("BankTransfer").'- '.$accountLinestatic ->getNomUrl(1);
-					$tabtp[$obj->rowid][$account_transfer] = isset($tabtp[$obj->rowid][$account_transfer]) ? $tabtp[$obj->rowid][$account_transfer] + $amounttouse : $amounttouse;
-					$bankaccountstatic->fetch($tabpay[$obj->rowid]['fk_bank_account']);
-					$tabpay[$obj->rowid]["soclib"] = $bankaccountstatic->getNomUrl(2);
-				}
-			}
-		}
+                if ($links[$key]['type'] == 'payment') {
+                    $paymentstatic->id = $links[$key]['url_id'];
+                    $paymentstatic->ref = $links[$key]['url_id'];
+                    $tabpay[$obj->rowid]["lib"] .= ' '.$paymentstatic->getNomUrl(2, '', ''); // TODO Do not include list of invoice in tooltip, the dol_string_nohtmltag is ko with this
+                    $tabpay[$obj->rowid]["paymentid"] = $paymentstatic->id;
+                } elseif ($links[$key]['type'] == 'payment_supplier') {
+                    $paymentsupplierstatic->id = $links[$key]['url_id'];
+                    $paymentsupplierstatic->ref = $links[$key]['url_id'];
+                    $tabpay[$obj->rowid]["lib"] .= ' '.$paymentsupplierstatic->getNomUrl(2);
+                    $tabpay[$obj->rowid]["paymentsupplierid"] = $paymentsupplierstatic->id;
+                } elseif ($links[$key]['type'] == 'company') {
+                    $societestatic->id = $links[$key]['url_id'];
+                    $societestatic->name = $links[$key]['label'];
+                    $societestatic->email = $tabcompany[$obj->rowid]['email'];
+                    $tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
+                    if ($compta_soc) {
+                        if (empty($tabtp[$obj->rowid][$compta_soc])) {
+                            $tabtp[$obj->rowid][$compta_soc] = $amounttouse;
+                        } else {
+                            $tabtp[$obj->rowid][$compta_soc] += $amounttouse;
+                        }
+                    }
+                } elseif ($links[$key]['type'] == 'user') {
+                    $userstatic->id = $links[$key]['url_id'];
+                    $userstatic->name = $links[$key]['label'];
+                    $userstatic->email = $tabuser[$obj->rowid]['email'];
+                    $userstatic->firstname = $tabuser[$obj->rowid]['firstname'];
+                    $userstatic->lastname = $tabuser[$obj->rowid]['lastname'];
+                    $userstatic->status = $tabuser[$obj->rowid]['status'];
+                    $userstatic->accountancy_code = $tabuser[$obj->rowid]['accountancy_code'];
+                    if ($userstatic->id > 0) {
+                        $tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
+                    } else {
+                        $tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
+                    }
+                    if ($compta_user) {
+                        $tabtp[$obj->rowid][$compta_user] += $amounttouse;
+                    }
+                } elseif ($links[$key]['type'] == 'sc') {
+                    $chargestatic->id = $links[$key]['url_id'];
+                    $chargestatic->ref = $links[$key]['url_id'];
+
+                    $tabpay[$obj->rowid]["lib"] .= ' '.$chargestatic->getNomUrl(2);
+                    $reg = array();
+                    if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
+                        if ($reg[1] == 'socialcontribution') {
+                            $reg[1] = 'SocialContribution';
+                        }
+                        $chargestatic->label = $langs->trans($reg[1]);
+                    } else {
+                        $chargestatic->label = $links[$key]['label'];
+                    }
+                    $chargestatic->ref = $chargestatic->label;
+                    $tabpay[$obj->rowid]["soclib"] = $chargestatic->getNomUrl(1, 30);
+                    $tabpay[$obj->rowid]["paymentscid"] = $chargestatic->id;
+
+                    // Retrieve the accounting code of the social contribution of the payment from link of payment.
+                    // Note: We have the social contribution id, it can be faster to get accounting code from social contribution id.
+                    $sqlmid = "SELECT cchgsoc.accountancy_code";
+                    $sqlmid .= " FROM ".MAIN_DB_PREFIX."c_chargesociales cchgsoc";
+                    $sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."chargesociales as chgsoc ON chgsoc.fk_type = cchgsoc.id";
+                    $sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."paiementcharge as paycharg ON paycharg.fk_charge = chgsoc.rowid";
+                    $sqlmid .= " INNER JOIN ".MAIN_DB_PREFIX."bank_url as bkurl ON bkurl.url_id=paycharg.rowid AND bkurl.type = 'payment_sc'";
+                    $sqlmid .= " WHERE bkurl.fk_bank = ".((int) $obj->rowid);
+
+                    dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=".$sqlmid, LOG_DEBUG);
+                    $resultmid = $db->query($sqlmid);
+                    if ($resultmid) {
+                        $objmid = $db->fetch_object($resultmid);
+                        $tabtp[$obj->rowid][$objmid->accountancy_code] = isset($tabtp[$obj->rowid][$objmid->accountancy_code]) ? $tabtp[$obj->rowid][$objmid->accountancy_code] + $amounttouse : $amounttouse;
+                    }
+                } elseif ($links[$key]['type'] == 'payment_donation') {
+                    $paymentdonstatic->id = $links[$key]['url_id'];
+                    $paymentdonstatic->ref = $links[$key]['url_id'];
+                    $paymentdonstatic->fk_donation = $links[$key]['url_id'];
+                    $tabpay[$obj->rowid]["lib"] .= ' '.$paymentdonstatic->getNomUrl(2);
+                    $tabpay[$obj->rowid]["paymentdonationid"] = $paymentdonstatic->id;
+                    $tabtp[$obj->rowid][$account_pay_donation] = isset($tabtp[$obj->rowid][$account_pay_donation]) ? $tabtp[$obj->rowid][$account_pay_donation] + $amounttouse : $amounttouse;
+                } elseif ($links[$key]['type'] == 'member') {
+                    $paymentsubscriptionstatic->id = $links[$key]['url_id'];
+                    $paymentsubscriptionstatic->ref = $links[$key]['url_id'];
+                    $paymentsubscriptionstatic->label = $links[$key]['label'];
+                    $tabpay[$obj->rowid]["lib"] .= ' '.$paymentsubscriptionstatic->getNomUrl(2);
+                    $tabpay[$obj->rowid]["paymentsubscriptionid"] = $paymentsubscriptionstatic->id;
+                    $paymentsubscriptionstatic->fetch($paymentsubscriptionstatic->id);
+                    $tabtp[$obj->rowid][$account_pay_subscription] = isset($tabtp[$obj->rowid][$account_pay_subscription]) ? $tabtp[$obj->rowid][$account_pay_subscription] + $amounttouse : $amounttouse;
+                } elseif ($links[$key]['type'] == 'payment_vat') {				// Payment VAT
+                    $paymentvatstatic->id = $links[$key]['url_id'];
+                    $paymentvatstatic->ref = $links[$key]['url_id'];
+                    $paymentvatstatic->label = $links[$key]['label'];
+                    $tabpay[$obj->rowid]["lib"] .= ' '.$paymentvatstatic->getNomUrl(2);
+                    $tabpay[$obj->rowid]["paymentvatid"] = $paymentvatstatic->id;
+                    $tabtp[$obj->rowid][$account_pay_vat] = isset($tabtp[$obj->rowid][$account_pay_vat]) ? $tabtp[$obj->rowid][$account_pay_vat] + $amounttouse : $amounttouse;
+                } elseif ($links[$key]['type'] == 'payment_salary') {
+                    $paymentsalstatic->id = $links[$key]['url_id'];
+                    $paymentsalstatic->ref = $links[$key]['url_id'];
+                    $paymentsalstatic->label = $links[$key]['label'];
+                    $tabpay[$obj->rowid]["lib"] .= ' '.$paymentsalstatic->getNomUrl(2);
+                    $tabpay[$obj->rowid]["paymentsalid"] = $paymentsalstatic->id;
+
+                    // This part of code is no more required. it is here to solve case where a link were missing (with v14.0.0) and keep writing in accountancy complete.
+                    // Note: A better way to fix this is to delete payment of salary and recreate it, or to fix the bookkeeping table manually after.
+                    if (getDolGlobalString('ACCOUNTANCY_AUTOFIX_MISSING_LINK_TO_USER_ON_SALARY_BANK_PAYMENT')) {
+                        $tmpsalary = new Salary($db);
+                        $tmpsalary->fetch($paymentsalstatic->id);
+                        $tmpsalary->fetch_user($tmpsalary->fk_user);
+
+                        $userstatic->id = $tmpsalary->user->id;
+                        $userstatic->name = $tmpsalary->user->name;
+                        $userstatic->email = $tmpsalary->user->email;
+                        $userstatic->firstname = $tmpsalary->user->firstname;
+                        $userstatic->lastname = $tmpsalary->user->lastname;
+                        $userstatic->status = $tmpsalary->user->status;
+                        $userstatic->accountancy_code = $tmpsalary->user->accountancy_code;
+
+                        if ($userstatic->id > 0) {
+                            $tabpay[$obj->rowid]["soclib"] = $userstatic->getNomUrl(1, 'accountancy', 0);
+                        } else {
+                            $tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen
+                        }
+
+                        if (empty($obj->typeop_user)) {	// Add test to avoid to add amount twice if a link already exists also on user.
+                            $compta_user = $userstatic->accountancy_code;
+                            if ($compta_user) {
+                                $tabtp[$obj->rowid][$compta_user] += $amounttouse;
+                                $tabuser[$obj->rowid] = array(
+                                'id' => $userstatic->id,
+                                'name' => dolGetFirstLastname($userstatic->firstname, $userstatic->lastname),
+                                'lastname' => $userstatic->lastname,
+                                'firstname' => $userstatic->firstname,
+                                'email' => $userstatic->email,
+                                'accountancy_code' => $compta_user,
+                                'status' => $userstatic->status
+                                );
+                            }
+                        }
+                    }
+                } elseif ($links[$key]['type'] == 'payment_expensereport') {
+                    $paymentexpensereportstatic->id = $links[$key]['url_id'];
+                    $tabpay[$obj->rowid]["lib"] .= $paymentexpensereportstatic->getNomUrl(2);
+                    $tabpay[$obj->rowid]["paymentexpensereport"] = $paymentexpensereportstatic->id;
+                } elseif ($links[$key]['type'] == 'payment_various') {
+                    $paymentvariousstatic->id = $links[$key]['url_id'];
+                    $paymentvariousstatic->ref = $links[$key]['url_id'];
+                    $paymentvariousstatic->label = $links[$key]['label'];
+                    $tabpay[$obj->rowid]["lib"] .= ' '.$paymentvariousstatic->getNomUrl(2);
+                    $tabpay[$obj->rowid]["paymentvariousid"] = $paymentvariousstatic->id;
+                    $paymentvariousstatic->fetch($paymentvariousstatic->id);
+                    $account_various = (!empty($paymentvariousstatic->accountancy_code) ? $paymentvariousstatic->accountancy_code : 'NotDefined'); // NotDefined is a reserved word
+                    $account_subledger = (!empty($paymentvariousstatic->subledger_account) ? $paymentvariousstatic->subledger_account : ''); // NotDefined is a reserved word
+                    $tabpay[$obj->rowid]["account_various"] = $account_various;
+                    $tabtp[$obj->rowid][$account_subledger] = isset($tabtp[$obj->rowid][$account_subledger]) ? $tabtp[$obj->rowid][$account_subledger] + $amounttouse : $amounttouse;
+                } elseif ($links[$key]['type'] == 'payment_loan') {
+                    $paymentloanstatic->id = $links[$key]['url_id'];
+                    $paymentloanstatic->ref = $links[$key]['url_id'];
+                    $paymentloanstatic->fk_loan = $links[$key]['url_id'];
+                    $tabpay[$obj->rowid]["lib"] .= ' '.$paymentloanstatic->getNomUrl(2);
+                    $tabpay[$obj->rowid]["paymentloanid"] = $paymentloanstatic->id;
+                    //$tabtp[$obj->rowid][$account_pay_loan] += $amounttouse;
+                    $sqlmid = 'SELECT pl.amount_capital, pl.amount_insurance, pl.amount_interest, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest';
+                    $sqlmid .= ' FROM '.MAIN_DB_PREFIX.'payment_loan as pl, '.MAIN_DB_PREFIX.'loan as l';
+                    $sqlmid .= ' WHERE l.rowid = pl.fk_loan AND pl.fk_bank = '.((int) $obj->rowid);
+
+                    dol_syslog("accountancy/journal/bankjournal.php:: sqlmid=".$sqlmid, LOG_DEBUG);
+                    $resultmid = $db->query($sqlmid);
+                    if ($resultmid) {
+                        $objmid = $db->fetch_object($resultmid);
+                        $tabtp[$obj->rowid][$objmid->accountancy_account_capital] = isset($tabtp[$obj->rowid][$objmid->accountancy_account_capital]) ? $tabtp[$obj->rowid][$objmid->accountancy_account_capital] - $objmid->amount_capital : $amounttouse;
+                        $tabtp[$obj->rowid][$objmid->accountancy_account_insurance] = isset($tabtp[$obj->rowid][$objmid->accountancy_account_insurance]) ? $tabtp[$obj->rowid][$objmid->accountancy_account_insurance] - $objmid->amount_insurance : $amounttouse;
+                        $tabtp[$obj->rowid][$objmid->accountancy_account_interest] = isset($tabtp[$obj->rowid][$objmid->accountancy_account_interest]) ? $tabtp[$obj->rowid][$objmid->accountancy_account_interest] - $objmid->amount_interes : $amounttouse;
+                    }
+                } elseif ($links[$key]['type'] == 'banktransfert') {
+                    $accountLinestatic->fetch($links[$key]['url_id']);
+                    $tabpay[$obj->rowid]["lib"] .= ' '.$langs->trans("BankTransfer").'- '.$accountLinestatic ->getNomUrl(1);
+                    $tabtp[$obj->rowid][$account_transfer] = isset($tabtp[$obj->rowid][$account_transfer]) ? $tabtp[$obj->rowid][$account_transfer] + $amounttouse : $amounttouse;
+                    $bankaccountstatic->fetch($tabpay[$obj->rowid]['fk_bank_account']);
+                    $tabpay[$obj->rowid]["soclib"] = $bankaccountstatic->getNomUrl(2);
+                }
+            }
+        }
 
-		if (empty($tabbq[$obj->rowid][$compta_bank])) {
-			$tabbq[$obj->rowid][$compta_bank] = $amounttouse;
-		} else {
-			$tabbq[$obj->rowid][$compta_bank] += $amounttouse;
-		}
+        if (empty($tabbq[$obj->rowid][$compta_bank])) {
+            $tabbq[$obj->rowid][$compta_bank] = $amounttouse;
+        } else {
+            $tabbq[$obj->rowid][$compta_bank] += $amounttouse;
+        }
 
-		// If no links were found to know the amount on thirdparty, we try to guess it.
-		// This may happens on bank entries without the links lines to 'company'.
-		if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw'])) {	// If we don't find 'company' link because it is an old 'withdraw' record
-			foreach ($links as $key => $val) {
-				if ($links[$key]['type'] == 'payment') {
-					// Get thirdparty
-					$tmppayment->fetch($links[$key]['url_id']);
-					$arrayofamounts = $tmppayment->getAmountsArray();
-					if (is_array($arrayofamounts)) {
-						foreach ($arrayofamounts as $invoiceid => $amount) {
-							$tmpinvoice->fetch($invoiceid);
-							$tmpinvoice->fetch_thirdparty();
-							if ($tmpinvoice->thirdparty->code_compta_client) {
-								$tabtp[$obj->rowid][$tmpinvoice->thirdparty->code_compta_client] += $amount;
-							}
-						}
-					}
-				}
-			}
-		}
+        // If no links were found to know the amount on thirdparty, we try to guess it.
+        // This may happens on bank entries without the links lines to 'company'.
+        if (empty($tabtp[$obj->rowid]) && !empty($tabmoreinfo[$obj->rowid]['withdraw'])) {	// If we don't find 'company' link because it is an old 'withdraw' record
+            foreach ($links as $key => $val) {
+                if ($links[$key]['type'] == 'payment') {
+                    // Get thirdparty
+                    $tmppayment->fetch($links[$key]['url_id']);
+                    $arrayofamounts = $tmppayment->getAmountsArray();
+                    if (is_array($arrayofamounts)) {
+                        foreach ($arrayofamounts as $invoiceid => $amount) {
+                            $tmpinvoice->fetch($invoiceid);
+                            $tmpinvoice->fetch_thirdparty();
+                            if ($tmpinvoice->thirdparty->code_compta_client) {
+                                $tabtp[$obj->rowid][$tmpinvoice->thirdparty->code_compta_client] += $amount;
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
-		// If no links were found to know the amount on thirdparty/user, we init it to account 'NotDefined'.
-		if (empty($tabtp[$obj->rowid])) {
-			$tabtp[$obj->rowid]['NotDefined'] = $tabbq[$obj->rowid][$compta_bank];
-		}
+        // If no links were found to know the amount on thirdparty/user, we init it to account 'NotDefined'.
+        if (empty($tabtp[$obj->rowid])) {
+            $tabtp[$obj->rowid]['NotDefined'] = $tabbq[$obj->rowid][$compta_bank];
+        }
 
-		// Check account number is ok
-		/*if ($action == 'writebookkeeping')		// Make test now in such a case
+        // Check account number is ok
+        /*if ($action == 'writebookkeeping')		// Make test now in such a case
 		{
 			reset($tabbq[$obj->rowid]);
 			$first_key_tabbq = key($tabbq[$obj->rowid]);
@@ -615,12 +615,12 @@ 
 			}
 		}*/
 
-		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $amounttouse;
+        // if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $amounttouse;
 
-		$i++;
-	}
+        $i++;
+    }
 } else {
-	dol_print_error($db);
+    dol_print_error($db);
 }
 
 
@@ -632,454 +632,454 @@ 
 
 // Write bookkeeping
 if (!$error && $action == 'writebookkeeping') {
-	$now = dol_now();
-
-	$accountingaccountcustomer = new AccountingAccount($db);
-	$accountingaccountcustomer->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'), true);
-
-	$accountingaccountsupplier = new AccountingAccount($db);
-	$accountingaccountsupplier->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER'), true);
-
-	$accountingaccountpayment = new AccountingAccount($db);
-	$accountingaccountpayment->fetch(null, getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT'), true);
-
-	$accountingaccountexpensereport = new AccountingAccount($db);
-	$accountingaccountexpensereport->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_EXPENSEREPORT, true);
-
-	$accountingaccountsuspense = new AccountingAccount($db);
-	$accountingaccountsuspense->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'), true);
-
-	$error = 0;
-	foreach ($tabpay as $key => $val) {		// $key is rowid into llx_bank
-		$date = dol_print_date($val["date"], 'day');
-
-		$ref = getSourceDocRef($val, $tabtype[$key]);
-
-		$errorforline = 0;
-
-		$totalcredit = 0;
-		$totaldebit = 0;
-
-		$db->begin();
-
-		// Introduce a protection. Total of tabtp must be total of tabbq
-		//var_dump($tabpay);
-		//var_dump($tabtp);
-		//var_dump($tabbq);exit;
-
-		// Bank
-		if (!$errorforline && is_array($tabbq[$key])) {
-			// Line into bank account
-			foreach ($tabbq[$key] as $k => $mt) {
-				if ($mt) {
-					if (empty($conf->cache['accountingaccountincurrententity'][$k])) {
-						$accountingaccount = new AccountingAccount($db);
-						$accountingaccount->fetch(0, $k, true);	// $k is accounting account of the bank.
-						$conf->cache['accountingaccountincurrententity'][$k] = $accountingaccount;
-					} else {
-						$accountingaccount = $conf->cache['accountingaccountincurrententity'][$k];
-					}
-
-					$account_label = $accountingaccount->label;
-
-					$reflabel = '';
-					if (!empty($val['lib'])) {
-						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
-					}
-					$reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
-					if (!empty($val['soclib'])) {
-						$reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
-					}
-
-					$bookkeeping = new BookKeeping($db);
-					$bookkeeping->doc_date = $val["date"];
-					$bookkeeping->doc_ref = $ref;
-					$bookkeeping->doc_type = 'bank';
-					$bookkeeping->fk_doc = $key;
-					$bookkeeping->fk_docdet = $val["fk_bank"];
-
-					$bookkeeping->numero_compte = $k;
-					$bookkeeping->label_compte = $account_label;
-
-					$bookkeeping->label_operation = $reflabel;
-					$bookkeeping->montant = $mt;
-					$bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
-					$bookkeeping->debit = ($mt >= 0 ? $mt : 0);
-					$bookkeeping->credit = ($mt < 0 ? -$mt : 0);
-					$bookkeeping->code_journal = $journal;
-					$bookkeeping->journal_label = $langs->transnoentities($journal_label);
-					$bookkeeping->fk_user_author = $user->id;
-					$bookkeeping->date_creation = $now;
-
-					// No subledger_account value for the bank line but add a specific label_operation
-					$bookkeeping->subledger_account = '';
-					$bookkeeping->label_operation = $reflabel;
-					$bookkeeping->entity = $conf->entity;
-
-					$totaldebit += $bookkeeping->debit;
-					$totalcredit += $bookkeeping->credit;
-
-					$result = $bookkeeping->create($user);
-					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
-							$error++;
-							$errorforline++;
-							setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-						} else {
-							$error++;
-							$errorforline++;
-							setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-						}
-					}
-				}
-			}
-		}
-
-		// Third party
-		if (!$errorforline) {
-			if (is_array($tabtp[$key])) {
-				// Line into thirdparty account
-				foreach ($tabtp[$key] as $k => $mt) {
-					if ($mt) {
-						$lettering = false;
-
-						$reflabel = '';
-						if (!empty($val['lib'])) {
-							$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
-						}
-						if ($tabtype[$key] == 'banktransfert') {
-							$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
-						} else {
-							$reflabel .= dol_string_nohtmltag($val['soclib']);
-						}
+    $now = dol_now();
+
+    $accountingaccountcustomer = new AccountingAccount($db);
+    $accountingaccountcustomer->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER'), true);
+
+    $accountingaccountsupplier = new AccountingAccount($db);
+    $accountingaccountsupplier->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER'), true);
+
+    $accountingaccountpayment = new AccountingAccount($db);
+    $accountingaccountpayment->fetch(null, getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT'), true);
+
+    $accountingaccountexpensereport = new AccountingAccount($db);
+    $accountingaccountexpensereport->fetch(null, $conf->global->ACCOUNTING_ACCOUNT_EXPENSEREPORT, true);
+
+    $accountingaccountsuspense = new AccountingAccount($db);
+    $accountingaccountsuspense->fetch(null, getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'), true);
+
+    $error = 0;
+    foreach ($tabpay as $key => $val) {		// $key is rowid into llx_bank
+        $date = dol_print_date($val["date"], 'day');
+
+        $ref = getSourceDocRef($val, $tabtype[$key]);
+
+        $errorforline = 0;
+
+        $totalcredit = 0;
+        $totaldebit = 0;
+
+        $db->begin();
+
+        // Introduce a protection. Total of tabtp must be total of tabbq
+        //var_dump($tabpay);
+        //var_dump($tabtp);
+        //var_dump($tabbq);exit;
+
+        // Bank
+        if (!$errorforline && is_array($tabbq[$key])) {
+            // Line into bank account
+            foreach ($tabbq[$key] as $k => $mt) {
+                if ($mt) {
+                    if (empty($conf->cache['accountingaccountincurrententity'][$k])) {
+                        $accountingaccount = new AccountingAccount($db);
+                        $accountingaccount->fetch(0, $k, true);	// $k is accounting account of the bank.
+                        $conf->cache['accountingaccountincurrententity'][$k] = $accountingaccount;
+                    } else {
+                        $accountingaccount = $conf->cache['accountingaccountincurrententity'][$k];
+                    }
+
+                    $account_label = $accountingaccount->label;
+
+                    $reflabel = '';
+                    if (!empty($val['lib'])) {
+                        $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+                    }
+                    $reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
+                    if (!empty($val['soclib'])) {
+                        $reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+                    }
+
+                    $bookkeeping = new BookKeeping($db);
+                    $bookkeeping->doc_date = $val["date"];
+                    $bookkeeping->doc_ref = $ref;
+                    $bookkeeping->doc_type = 'bank';
+                    $bookkeeping->fk_doc = $key;
+                    $bookkeeping->fk_docdet = $val["fk_bank"];
+
+                    $bookkeeping->numero_compte = $k;
+                    $bookkeeping->label_compte = $account_label;
+
+                    $bookkeeping->label_operation = $reflabel;
+                    $bookkeeping->montant = $mt;
+                    $bookkeeping->sens = ($mt >= 0) ? 'D' : 'C';
+                    $bookkeeping->debit = ($mt >= 0 ? $mt : 0);
+                    $bookkeeping->credit = ($mt < 0 ? -$mt : 0);
+                    $bookkeeping->code_journal = $journal;
+                    $bookkeeping->journal_label = $langs->transnoentities($journal_label);
+                    $bookkeeping->fk_user_author = $user->id;
+                    $bookkeeping->date_creation = $now;
+
+                    // No subledger_account value for the bank line but add a specific label_operation
+                    $bookkeeping->subledger_account = '';
+                    $bookkeeping->label_operation = $reflabel;
+                    $bookkeeping->entity = $conf->entity;
+
+                    $totaldebit += $bookkeeping->debit;
+                    $totalcredit += $bookkeeping->credit;
+
+                    $result = $bookkeeping->create($user);
+                    if ($result < 0) {
+                        if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
+                            $error++;
+                            $errorforline++;
+                            setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                        } else {
+                            $error++;
+                            $errorforline++;
+                            setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                        }
+                    }
+                }
+            }
+        }
 
-						$bookkeeping = new BookKeeping($db);
-						$bookkeeping->doc_date = $val["date"];
-						$bookkeeping->doc_ref = $ref;
-						$bookkeeping->doc_type = 'bank';
-						$bookkeeping->fk_doc = $key;
-						$bookkeeping->fk_docdet = $val["fk_bank"];
-
-						$bookkeeping->label_operation = $reflabel;
-						$bookkeeping->montant = $mt;
-						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-						$bookkeeping->debit = ($mt < 0 ? -$mt : 0);
-						$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $langs->transnoentities($journal_label);
-						$bookkeeping->fk_user_author = $user->id;
-						$bookkeeping->date_creation = $now;
-
-						if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
-							$lettering = true;
-							$bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp
-							$bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction
-							$bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
-							$bookkeeping->label_compte = $accountingaccountcustomer->label;
-						} elseif ($tabtype[$key] == 'payment_supplier') {	// If payment is payment of supplier invoice, we get ref of invoice
-							$lettering = true;
-							$bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp
-							$bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction
-							$bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER');
-							$bookkeeping->label_compte = $accountingaccountsupplier->label;
-						} elseif ($tabtype[$key] == 'payment_expensereport') {
-							$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
-							$bookkeeping->subledger_label = $tabuser[$key]['name'];
-							$bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT');
-							$bookkeeping->label_compte = $accountingaccountexpensereport->label;
-						} elseif ($tabtype[$key] == 'payment_salary') {
-							$bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
-							$bookkeeping->subledger_label = $tabuser[$key]['name'];
-							$bookkeeping->numero_compte = getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT');
-							$bookkeeping->label_compte = $accountingaccountpayment->label;
-						} elseif (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
-							$bookkeeping->subledger_account = '';
-							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(null, $k, true);	// TODO Use a cache
-							$bookkeeping->numero_compte = $k;
-							$bookkeeping->label_compte = $accountingaccount->label;
-						} elseif ($tabtype[$key] == 'payment_vat') {
-							$bookkeeping->subledger_account = '';
-							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
-							$bookkeeping->numero_compte = $k;
-							$bookkeeping->label_compte = $accountingaccount->label;
-						} elseif ($tabtype[$key] == 'payment_donation') {
-							$bookkeeping->subledger_account = '';
-							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
-							$bookkeeping->numero_compte = $k;
-							$bookkeeping->label_compte = $accountingaccount->label;
-						} elseif ($tabtype[$key] == 'member') {
-							$bookkeeping->subledger_account = '';
-							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
-							$bookkeeping->numero_compte = $k;
-							$bookkeeping->label_compte = $accountingaccount->label;
-						} elseif ($tabtype[$key] == 'payment_loan') {
-							$bookkeeping->subledger_account = '';
-							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
-							$bookkeeping->numero_compte = $k;
-							$bookkeeping->label_compte = $accountingaccount->label;
-						} elseif ($tabtype[$key] == 'payment_various') {
-							$bookkeeping->subledger_account = $k;
-							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
-							$accountingaccount->fetch(null, $tabpay[$key]["account_various"], true);	// TODO Use a cache
-							$bookkeeping->numero_compte = $tabpay[$key]["account_various"];
-							$bookkeeping->label_compte = $accountingaccount->label;
-						} elseif ($tabtype[$key] == 'banktransfert') {
-							$bookkeeping->subledger_account = '';
-							$bookkeeping->subledger_label = '';
-							$accountingaccount->fetch(null, $k, true);		// TODO Use a cache
-							$bookkeeping->numero_compte = $k;
-							$bookkeeping->label_compte = $accountingaccount->label;
-						} else {
-							if ($tabtype[$key] == 'unknown') {	// Unknown transaction, we will use a waiting account for thirdparty.
-								// Temporary account
-								$bookkeeping->subledger_account = '';
-								$bookkeeping->subledger_label = '';
-								$bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE');
-								$bookkeeping->label_compte = $accountingaccountsuspense->label;
-							}
-						}
-						$bookkeeping->label_operation = $reflabel;
-						$bookkeeping->entity = $conf->entity;
-
-						$totaldebit += $bookkeeping->debit;
-						$totalcredit += $bookkeeping->credit;
-
-						$result = $bookkeeping->create($user);
-						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
-								$error++;
-								$errorforline++;
-								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							} else {
-								$error++;
-								$errorforline++;
-								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-							}
-						} else {
-							if ($lettering && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) {
-								$lettering_static = new Lettering($db);
-								$nb_lettering = $lettering_static->bookkeepingLetteringAll(array($bookkeeping->id));
-							}
-						}
-					}
-				}
-			} else {	// If thirdparty unknown, output the waiting account
-				foreach ($tabbq[$key] as $k => $mt) {
-					if ($mt) {
-						$reflabel = '';
-						if (!empty($val['lib'])) {
-							$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
-						}
-						$reflabel .= dol_string_nohtmltag('WaitingAccount');
-
-						$bookkeeping = new BookKeeping($db);
-						$bookkeeping->doc_date = $val["date"];
-						$bookkeeping->doc_ref = $ref;
-						$bookkeeping->doc_type = 'bank';
-						$bookkeeping->fk_doc = $key;
-						$bookkeeping->fk_docdet = $val["fk_bank"];
-						$bookkeeping->montant = $mt;
-						$bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
-						$bookkeeping->debit = ($mt < 0 ? -$mt : 0);
-						$bookkeeping->credit = ($mt >= 0) ? $mt : 0;
-						$bookkeeping->code_journal = $journal;
-						$bookkeeping->journal_label = $langs->transnoentities($journal_label);
-						$bookkeeping->fk_user_author = $user->id;
-						$bookkeeping->date_creation = $now;
-						$bookkeeping->label_compte = '';
-						$bookkeeping->label_operation = $reflabel;
-						$bookkeeping->entity = $conf->entity;
-
-						$totaldebit += $bookkeeping->debit;
-						$totalcredit += $bookkeeping->credit;
-
-						$result = $bookkeeping->create($user);
-
-						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
-								$error++;
-								$errorforline++;
-								setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
-							} else {
-								$error++;
-								$errorforline++;
-								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
-							}
-						}
-					}
-				}
-			}
-		}
+        // Third party
+        if (!$errorforline) {
+            if (is_array($tabtp[$key])) {
+                // Line into thirdparty account
+                foreach ($tabtp[$key] as $k => $mt) {
+                    if ($mt) {
+                        $lettering = false;
+
+                        $reflabel = '';
+                        if (!empty($val['lib'])) {
+                            $reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
+                        }
+                        if ($tabtype[$key] == 'banktransfert') {
+                            $reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
+                        } else {
+                            $reflabel .= dol_string_nohtmltag($val['soclib']);
+                        }
+
+                        $bookkeeping = new BookKeeping($db);
+                        $bookkeeping->doc_date = $val["date"];
+                        $bookkeeping->doc_ref = $ref;
+                        $bookkeeping->doc_type = 'bank';
+                        $bookkeeping->fk_doc = $key;
+                        $bookkeeping->fk_docdet = $val["fk_bank"];
+
+                        $bookkeeping->label_operation = $reflabel;
+                        $bookkeeping->montant = $mt;
+                        $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+                        $bookkeeping->debit = ($mt < 0 ? -$mt : 0);
+                        $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+                        $bookkeeping->code_journal = $journal;
+                        $bookkeeping->journal_label = $langs->transnoentities($journal_label);
+                        $bookkeeping->fk_user_author = $user->id;
+                        $bookkeeping->date_creation = $now;
+
+                        if ($tabtype[$key] == 'payment') {	// If payment is payment of customer invoice, we get ref of invoice
+                            $lettering = true;
+                            $bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp
+                            $bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction
+                            $bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
+                            $bookkeeping->label_compte = $accountingaccountcustomer->label;
+                        } elseif ($tabtype[$key] == 'payment_supplier') {	// If payment is payment of supplier invoice, we get ref of invoice
+                            $lettering = true;
+                            $bookkeeping->subledger_account = $k; // For payment, the subledger account is stored as $key of $tabtp
+                            $bookkeeping->subledger_label = $tabcompany[$key]['name']; // $tabcompany is defined only if we are sure there is 1 thirdparty for the bank transaction
+                            $bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER');
+                            $bookkeeping->label_compte = $accountingaccountsupplier->label;
+                        } elseif ($tabtype[$key] == 'payment_expensereport') {
+                            $bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
+                            $bookkeeping->subledger_label = $tabuser[$key]['name'];
+                            $bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT');
+                            $bookkeeping->label_compte = $accountingaccountexpensereport->label;
+                        } elseif ($tabtype[$key] == 'payment_salary') {
+                            $bookkeeping->subledger_account = $tabuser[$key]['accountancy_code'];
+                            $bookkeeping->subledger_label = $tabuser[$key]['name'];
+                            $bookkeeping->numero_compte = getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT');
+                            $bookkeeping->label_compte = $accountingaccountpayment->label;
+                        } elseif (in_array($tabtype[$key], array('sc', 'payment_sc'))) {   // If payment is payment of social contribution
+                            $bookkeeping->subledger_account = '';
+                            $bookkeeping->subledger_label = '';
+                            $accountingaccount->fetch(null, $k, true);	// TODO Use a cache
+                            $bookkeeping->numero_compte = $k;
+                            $bookkeeping->label_compte = $accountingaccount->label;
+                        } elseif ($tabtype[$key] == 'payment_vat') {
+                            $bookkeeping->subledger_account = '';
+                            $bookkeeping->subledger_label = '';
+                            $accountingaccount->fetch(null, $k, true);		// TODO Use a cache
+                            $bookkeeping->numero_compte = $k;
+                            $bookkeeping->label_compte = $accountingaccount->label;
+                        } elseif ($tabtype[$key] == 'payment_donation') {
+                            $bookkeeping->subledger_account = '';
+                            $bookkeeping->subledger_label = '';
+                            $accountingaccount->fetch(null, $k, true);		// TODO Use a cache
+                            $bookkeeping->numero_compte = $k;
+                            $bookkeeping->label_compte = $accountingaccount->label;
+                        } elseif ($tabtype[$key] == 'member') {
+                            $bookkeeping->subledger_account = '';
+                            $bookkeeping->subledger_label = '';
+                            $accountingaccount->fetch(null, $k, true);		// TODO Use a cache
+                            $bookkeeping->numero_compte = $k;
+                            $bookkeeping->label_compte = $accountingaccount->label;
+                        } elseif ($tabtype[$key] == 'payment_loan') {
+                            $bookkeeping->subledger_account = '';
+                            $bookkeeping->subledger_label = '';
+                            $accountingaccount->fetch(null, $k, true);		// TODO Use a cache
+                            $bookkeeping->numero_compte = $k;
+                            $bookkeeping->label_compte = $accountingaccount->label;
+                        } elseif ($tabtype[$key] == 'payment_various') {
+                            $bookkeeping->subledger_account = $k;
+                            $bookkeeping->subledger_label = $tabcompany[$key]['name'];
+                            $accountingaccount->fetch(null, $tabpay[$key]["account_various"], true);	// TODO Use a cache
+                            $bookkeeping->numero_compte = $tabpay[$key]["account_various"];
+                            $bookkeeping->label_compte = $accountingaccount->label;
+                        } elseif ($tabtype[$key] == 'banktransfert') {
+                            $bookkeeping->subledger_account = '';
+                            $bookkeeping->subledger_label = '';
+                            $accountingaccount->fetch(null, $k, true);		// TODO Use a cache
+                            $bookkeeping->numero_compte = $k;
+                            $bookkeeping->label_compte = $accountingaccount->label;
+                        } else {
+                            if ($tabtype[$key] == 'unknown') {	// Unknown transaction, we will use a waiting account for thirdparty.
+                                // Temporary account
+                                $bookkeeping->subledger_account = '';
+                                $bookkeeping->subledger_label = '';
+                                $bookkeeping->numero_compte = getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE');
+                                $bookkeeping->label_compte = $accountingaccountsuspense->label;
+                            }
+                        }
+                        $bookkeeping->label_operation = $reflabel;
+                        $bookkeeping->entity = $conf->entity;
+
+                        $totaldebit += $bookkeeping->debit;
+                        $totalcredit += $bookkeeping->credit;
+
+                        $result = $bookkeeping->create($user);
+                        if ($result < 0) {
+                            if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
+                                $error++;
+                                $errorforline++;
+                                setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                            } else {
+                                $error++;
+                                $errorforline++;
+                                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                            }
+                        } else {
+                            if ($lettering && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && getDolGlobalInt('ACCOUNTING_ENABLE_AUTOLETTERING')) {
+                                $lettering_static = new Lettering($db);
+                                $nb_lettering = $lettering_static->bookkeepingLetteringAll(array($bookkeeping->id));
+                            }
+                        }
+                    }
+                }
+            } else {	// If thirdparty unknown, output the waiting account
+                foreach ($tabbq[$key] as $k => $mt) {
+                    if ($mt) {
+                        $reflabel = '';
+                        if (!empty($val['lib'])) {
+                            $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+                        }
+                        $reflabel .= dol_string_nohtmltag('WaitingAccount');
+
+                        $bookkeeping = new BookKeeping($db);
+                        $bookkeeping->doc_date = $val["date"];
+                        $bookkeeping->doc_ref = $ref;
+                        $bookkeeping->doc_type = 'bank';
+                        $bookkeeping->fk_doc = $key;
+                        $bookkeeping->fk_docdet = $val["fk_bank"];
+                        $bookkeeping->montant = $mt;
+                        $bookkeeping->sens = ($mt < 0) ? 'D' : 'C';
+                        $bookkeeping->debit = ($mt < 0 ? -$mt : 0);
+                        $bookkeeping->credit = ($mt >= 0) ? $mt : 0;
+                        $bookkeeping->code_journal = $journal;
+                        $bookkeeping->journal_label = $langs->transnoentities($journal_label);
+                        $bookkeeping->fk_user_author = $user->id;
+                        $bookkeeping->date_creation = $now;
+                        $bookkeeping->label_compte = '';
+                        $bookkeeping->label_operation = $reflabel;
+                        $bookkeeping->entity = $conf->entity;
+
+                        $totaldebit += $bookkeeping->debit;
+                        $totalcredit += $bookkeeping->credit;
+
+                        $result = $bookkeeping->create($user);
+
+                        if ($result < 0) {
+                            if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
+                                $error++;
+                                $errorforline++;
+                                setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
+                            } else {
+                                $error++;
+                                $errorforline++;
+                                setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
+                            }
+                        }
+                    }
+                }
+            }
+        }
 
-		if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT')) {
-			$error++;
-			$errorforline++;
-			setEventMessages('We tried to insert a non balanced transaction in book for '.$ref.'. Canceled. Surely a bug.', null, 'errors');
-		}
+        if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT')) {
+            $error++;
+            $errorforline++;
+            setEventMessages('We tried to insert a non balanced transaction in book for '.$ref.'. Canceled. Surely a bug.', null, 'errors');
+        }
 
-		if (!$errorforline) {
-			$db->commit();
-		} else {
-			//print 'KO for line '.$key.' '.$error.'<br>';
-			$db->rollback();
+        if (!$errorforline) {
+            $db->commit();
+        } else {
+            //print 'KO for line '.$key.' '.$error.'<br>';
+            $db->rollback();
 
-			$MAXNBERRORS = 5;
-			if ($error >= $MAXNBERRORS) {
-				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped").' (>'.$MAXNBERRORS.')', null, 'errors');
-				break; // Break in the foreach
-			}
-		}
-	}
-
-	if (empty($error) && count($tabpay) > 0) {
-		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	} elseif (count($tabpay) == $error) {
-		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
-	} else {
-		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
-	}
-
-	$action = '';
-
-	// Must reload data, so we make a redirect
-	if (count($tabpay) != $error) {
-		$param = 'id_journal='.$id_journal;
-		$param .= '&date_startday='.$date_startday;
-		$param .= '&date_startmonth='.$date_startmonth;
-		$param .= '&date_startyear='.$date_startyear;
-		$param .= '&date_endday='.$date_endday;
-		$param .= '&date_endmonth='.$date_endmonth;
-		$param .= '&date_endyear='.$date_endyear;
-		$param .= '&in_bookkeeping='.$in_bookkeeping;
-		header("Location: ".$_SERVER['PHP_SELF'].($param ? '?'.$param : ''));
-		exit;
-	}
+            $MAXNBERRORS = 5;
+            if ($error >= $MAXNBERRORS) {
+                setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped").' (>'.$MAXNBERRORS.')', null, 'errors');
+                break; // Break in the foreach
+            }
+        }
+    }
+
+    if (empty($error) && count($tabpay) > 0) {
+        setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+    } elseif (count($tabpay) == $error) {
+        setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+    } else {
+        setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+    }
+
+    $action = '';
+
+    // Must reload data, so we make a redirect
+    if (count($tabpay) != $error) {
+        $param = 'id_journal='.$id_journal;
+        $param .= '&date_startday='.$date_startday;
+        $param .= '&date_startmonth='.$date_startmonth;
+        $param .= '&date_startyear='.$date_startyear;
+        $param .= '&date_endday='.$date_endday;
+        $param .= '&date_endmonth='.$date_endmonth;
+        $param .= '&date_endyear='.$date_endyear;
+        $param .= '&in_bookkeeping='.$in_bookkeeping;
+        header("Location: ".$_SERVER['PHP_SELF'].($param ? '?'.$param : ''));
+        exit;
+    }
 }
 
 
 
 // Export
 if ($action == 'exportcsv') {		// ISO and not UTF8 !
-	$sep = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV');
-
-	$filename = 'journal';
-	$type_export = 'journal';
-	include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
-
-	// CSV header line
-	print '"'.$langs->transnoentitiesnoconv("BankId").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("Date").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("PaymentMode").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("AccountAccounting").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("LedgerAccount").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("SubledgerAccount").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("Label").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("AccountingDebit").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("AccountingCredit").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("Journal").'"'.$sep;
-	print '"'.$langs->transnoentitiesnoconv("Note").'"'.$sep;
-	print "\n";
-
-	foreach ($tabpay as $key => $val) {
-		$date = dol_print_date($val["date"], 'day');
-
-		$ref = getSourceDocRef($val, $tabtype[$key]);
-
-		// Bank
-		foreach ($tabbq[$key] as $k => $mt) {
-			if ($mt) {
-				$reflabel = '';
-				if (!empty($val['lib'])) {
-					$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
-				}
-				$reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
-				if (!empty($val['soclib'])) {
-					$reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
-				}
-
-				print '"'.$key.'"'.$sep;
-				print '"'.$date.'"'.$sep;
-				print '"'.$val["type_payment"].'"'.$sep;
-				print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-				print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
-				print "  ".$sep;
-				print '"'.$reflabel.'"'.$sep;
-				print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-				print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-				print '"'.$journal.'"'.$sep;
-				print '"'.dol_string_nohtmltag($ref).'"'.$sep;
-				print "\n";
-			}
-		}
+    $sep = getDolGlobalString('ACCOUNTING_EXPORT_SEPARATORCSV');
+
+    $filename = 'journal';
+    $type_export = 'journal';
+    include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
+
+    // CSV header line
+    print '"'.$langs->transnoentitiesnoconv("BankId").'"'.$sep;
+    print '"'.$langs->transnoentitiesnoconv("Date").'"'.$sep;
+    print '"'.$langs->transnoentitiesnoconv("PaymentMode").'"'.$sep;
+    print '"'.$langs->transnoentitiesnoconv("AccountAccounting").'"'.$sep;
+    print '"'.$langs->transnoentitiesnoconv("LedgerAccount").'"'.$sep;
+    print '"'.$langs->transnoentitiesnoconv("SubledgerAccount").'"'.$sep;
+    print '"'.$langs->transnoentitiesnoconv("Label").'"'.$sep;
+    print '"'.$langs->transnoentitiesnoconv("AccountingDebit").'"'.$sep;
+    print '"'.$langs->transnoentitiesnoconv("AccountingCredit").'"'.$sep;
+    print '"'.$langs->transnoentitiesnoconv("Journal").'"'.$sep;
+    print '"'.$langs->transnoentitiesnoconv("Note").'"'.$sep;
+    print "\n";
+
+    foreach ($tabpay as $key => $val) {
+        $date = dol_print_date($val["date"], 'day');
+
+        $ref = getSourceDocRef($val, $tabtype[$key]);
+
+        // Bank
+        foreach ($tabbq[$key] as $k => $mt) {
+            if ($mt) {
+                $reflabel = '';
+                if (!empty($val['lib'])) {
+                    $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+                }
+                $reflabel .= $langs->trans("Bank").' '.dol_string_nohtmltag($val['bank_account_ref']);
+                if (!empty($val['soclib'])) {
+                    $reflabel .= " - ".dol_string_nohtmltag($val['soclib']);
+                }
 
-		// Third party
-		if (is_array($tabtp[$key])) {
-			foreach ($tabtp[$key] as $k => $mt) {
-				if ($mt) {
-					$reflabel = '';
-					if (!empty($val['lib'])) {
-						$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
-					}
-					if ($tabtype[$key] == 'banktransfert') {
-						$reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
-					} else {
-						$reflabel .= dol_string_nohtmltag($val['soclib']);
-					}
+                print '"'.$key.'"'.$sep;
+                print '"'.$date.'"'.$sep;
+                print '"'.$val["type_payment"].'"'.$sep;
+                print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+                print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+                print "  ".$sep;
+                print '"'.$reflabel.'"'.$sep;
+                print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+                print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+                print '"'.$journal.'"'.$sep;
+                print '"'.dol_string_nohtmltag($ref).'"'.$sep;
+                print "\n";
+            }
+        }
 
-					print '"'.$key.'"'.$sep;
-					print '"'.$date.'"'.$sep;
-					print '"'.$val["type_payment"].'"'.$sep;
-					print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-					if ($tabtype[$key] == 'payment_supplier') {
-						print '"'.getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER').'"'.$sep;
-					} elseif ($tabtype[$key] == 'payment') {
-						print '"'.getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER').'"'.$sep;
-					} elseif ($tabtype[$key] == 'payment_expensereport') {
-						print '"'.getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT').'"'.$sep;
-					} elseif ($tabtype[$key] == 'payment_salary') {
-						print '"'.getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT').'"'.$sep;
-					} else {
-						print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
-					}
-					print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
-					print '"'.$reflabel.'"'.$sep;
-					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-					print '"'.$journal.'"'.$sep;
-					print '"'.dol_string_nohtmltag($ref).'"'.$sep;
-					print "\n";
-				}
-			}
-		} else {	// If thirdparty unknown, output the waiting account
-			foreach ($tabbq[$key] as $k => $mt) {
-				if ($mt) {
-					$reflabel = '';
-					if (!empty($val['lib'])) {
-						$reflabel .= dol_string_nohtmltag($val['lib'])." - ";
-					}
-					$reflabel .= dol_string_nohtmltag('WaitingAccount');
-
-					print '"'.$key.'"'.$sep;
-					print '"'.$date.'"'.$sep;
-					print '"'.$val["type_payment"].'"'.$sep;
-					print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE')).'"'.$sep;
-					print '"'.length_accounta(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE')).'"'.$sep;
-					print $sep;
-					print '"'.$reflabel.'"'.$sep;
-					print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
-					print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
-					print '"'.$journal.'"'.$sep;
-					print '"'.dol_string_nohtmltag($ref).'"'.$sep;
-					print "\n";
-				}
-			}
-		}
-	}
+        // Third party
+        if (is_array($tabtp[$key])) {
+            foreach ($tabtp[$key] as $k => $mt) {
+                if ($mt) {
+                    $reflabel = '';
+                    if (!empty($val['lib'])) {
+                        $reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
+                    }
+                    if ($tabtype[$key] == 'banktransfert') {
+                        $reflabel .= dol_string_nohtmltag($langs->transnoentitiesnoconv('TransitionalAccount').' '.$account_transfer);
+                    } else {
+                        $reflabel .= dol_string_nohtmltag($val['soclib']);
+                    }
+
+                    print '"'.$key.'"'.$sep;
+                    print '"'.$date.'"'.$sep;
+                    print '"'.$val["type_payment"].'"'.$sep;
+                    print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+                    if ($tabtype[$key] == 'payment_supplier') {
+                        print '"'.getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER').'"'.$sep;
+                    } elseif ($tabtype[$key] == 'payment') {
+                        print '"'.getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER').'"'.$sep;
+                    } elseif ($tabtype[$key] == 'payment_expensereport') {
+                        print '"'.getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT').'"'.$sep;
+                    } elseif ($tabtype[$key] == 'payment_salary') {
+                        print '"'.getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT').'"'.$sep;
+                    } else {
+                        print '"'.length_accountg(html_entity_decode($k)).'"'.$sep;
+                    }
+                    print '"'.length_accounta(html_entity_decode($k)).'"'.$sep;
+                    print '"'.$reflabel.'"'.$sep;
+                    print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+                    print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+                    print '"'.$journal.'"'.$sep;
+                    print '"'.dol_string_nohtmltag($ref).'"'.$sep;
+                    print "\n";
+                }
+            }
+        } else {	// If thirdparty unknown, output the waiting account
+            foreach ($tabbq[$key] as $k => $mt) {
+                if ($mt) {
+                    $reflabel = '';
+                    if (!empty($val['lib'])) {
+                        $reflabel .= dol_string_nohtmltag($val['lib'])." - ";
+                    }
+                    $reflabel .= dol_string_nohtmltag('WaitingAccount');
+
+                    print '"'.$key.'"'.$sep;
+                    print '"'.$date.'"'.$sep;
+                    print '"'.$val["type_payment"].'"'.$sep;
+                    print '"'.length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE')).'"'.$sep;
+                    print '"'.length_accounta(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE')).'"'.$sep;
+                    print $sep;
+                    print '"'.$reflabel.'"'.$sep;
+                    print '"'.($mt < 0 ? price(-$mt) : '').'"'.$sep;
+                    print '"'.($mt >= 0 ? price($mt) : '').'"'.$sep;
+                    print '"'.$journal.'"'.$sep;
+                    print '"'.dol_string_nohtmltag($ref).'"'.$sep;
+                    print "\n";
+                }
+            }
+        }
+    }
 }
 
 
@@ -1090,117 +1090,117 @@ 
 $form = new Form($db);
 
 if (empty($action) || $action == 'view') {
-	$invoicestatic = new Facture($db);
-	$invoicesupplierstatic = new FactureFournisseur($db);
-	$expensereportstatic = new ExpenseReport($db);
-	$vatstatic = new Tva($db);
-	$donationstatic = new Don($db);
-	$loanstatic = new Loan($db);
-	$salarystatic = new Salary($db);
-	$variousstatic = new PaymentVarious($db);
-
-	$title = $langs->trans("GenerationOfAccountingEntries").' - '.$accountingjournalstatic->getNomUrl(0, 2, 1, '', 1);
-	$help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#G&eacute;n&eacute;ration_des_&eacute;critures_en_comptabilit&eacute;';
-	llxHeader('', dol_string_nohtmltag($title), $help_url, '', 0, 0, '', '', '', 'mod-accountancy accountancy-generation page-bankjournal');
-
-	$nom = $title;
-	$builddate = dol_now();
-	//$description = $langs->trans("DescFinanceJournal") . '<br>';
-	$description = $langs->trans("DescJournalOnlyBindedVisible").'<br>';
-
-	$listofchoices = array(
-		'notyet' => $langs->trans("NotYetInGeneralLedger"),
-		'already' => $langs->trans("AlreadyInGeneralLedger")
-	);
-	$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
-	$period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
-
-	$varlink = 'id_journal='.$id_journal;
-	$periodlink = '';
-	$exportlink = '';
-
-	$listofchoices = array(
-		1 => $langs->trans("TransfertAllBankLines"),
-		2 => $langs->trans("TransfertOnlyConciliatedBankLine")
-	);
-	$moreoptions = [ "BankLineConciliated" => $form->selectarray('only_rappro', $listofchoices, $only_rappro)];
-
-	journalHead($nom, '', $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink, $moreoptions);
-
-	$desc = '';
-
-	if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') != 'blockedonclosed') {
-		// Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
-		// Fiscal period test
-		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE entity = ".((int) $conf->entity);
-		$resql = $db->query($sql);
-		if ($resql) {
-			$obj = $db->fetch_object($resql);
-			if ($obj->nb == 0) {
-				print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheFiscalPeriodIsNotDefined");
-				$desc = ' : '.$langs->trans("AccountancyAreaDescFiscalPeriod", 4, '{link}');
-				$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("FiscalPeriod").'</strong>', $desc);
-				print $desc;
-				print '</div>';
-			}
-		} else {
-			dol_print_error($db);
-		}
-	}
-
-	// Bank test
-	$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."bank_account WHERE entity = ".((int) $conf->entity)." AND fk_accountancy_journal IS NULL AND clos=0";
-	$resql = $db->query($sql);
-	if ($resql) {
-		$obj = $db->fetch_object($resql);
-		if ($obj->nb > 0) {
-			print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
-			$desc = ' : '.$langs->trans("AccountancyAreaDescBank", 6, '{link}');
-			$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>', $desc);
-			print $desc;
-			print '</div>';
-		}
-	} else {
-		dol_print_error($db);
-	}
+    $invoicestatic = new Facture($db);
+    $invoicesupplierstatic = new FactureFournisseur($db);
+    $expensereportstatic = new ExpenseReport($db);
+    $vatstatic = new Tva($db);
+    $donationstatic = new Don($db);
+    $loanstatic = new Loan($db);
+    $salarystatic = new Salary($db);
+    $variousstatic = new PaymentVarious($db);
+
+    $title = $langs->trans("GenerationOfAccountingEntries").' - '.$accountingjournalstatic->getNomUrl(0, 2, 1, '', 1);
+    $help_url ='EN:Module_Double_Entry_Accounting|FR:Module_Comptabilit&eacute;_en_Partie_Double#G&eacute;n&eacute;ration_des_&eacute;critures_en_comptabilit&eacute;';
+    llxHeader('', dol_string_nohtmltag($title), $help_url, '', 0, 0, '', '', '', 'mod-accountancy accountancy-generation page-bankjournal');
+
+    $nom = $title;
+    $builddate = dol_now();
+    //$description = $langs->trans("DescFinanceJournal") . '<br>';
+    $description = $langs->trans("DescJournalOnlyBindedVisible").'<br>';
+
+    $listofchoices = array(
+        'notyet' => $langs->trans("NotYetInGeneralLedger"),
+        'already' => $langs->trans("AlreadyInGeneralLedger")
+    );
+    $period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+    $period .= ' -  '.$langs->trans("JournalizationInLedgerStatus").' '.$form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+
+    $varlink = 'id_journal='.$id_journal;
+    $periodlink = '';
+    $exportlink = '';
+
+    $listofchoices = array(
+        1 => $langs->trans("TransfertAllBankLines"),
+        2 => $langs->trans("TransfertOnlyConciliatedBankLine")
+    );
+    $moreoptions = [ "BankLineConciliated" => $form->selectarray('only_rappro', $listofchoices, $only_rappro)];
+
+    journalHead($nom, '', $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink, $moreoptions);
+
+    $desc = '';
+
+    if (getDolGlobalString('ACCOUNTANCY_FISCAL_PERIOD_MODE') != 'blockedonclosed') {
+        // Test that setup is complete (we are in accounting, so test on entity is always on $conf->entity only, no sharing allowed)
+        // Fiscal period test
+        $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_fiscalyear WHERE entity = ".((int) $conf->entity);
+        $resql = $db->query($sql);
+        if ($resql) {
+            $obj = $db->fetch_object($resql);
+            if ($obj->nb == 0) {
+                print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheFiscalPeriodIsNotDefined");
+                $desc = ' : '.$langs->trans("AccountancyAreaDescFiscalPeriod", 4, '{link}');
+                $desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("FiscalPeriod").'</strong>', $desc);
+                print $desc;
+                print '</div>';
+            }
+        } else {
+            dol_print_error($db);
+        }
+    }
+
+    // Bank test
+    $sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."bank_account WHERE entity = ".((int) $conf->entity)." AND fk_accountancy_journal IS NULL AND clos=0";
+    $resql = $db->query($sql);
+    if ($resql) {
+        $obj = $db->fetch_object($resql);
+        if ($obj->nb > 0) {
+            print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
+            $desc = ' : '.$langs->trans("AccountancyAreaDescBank", 6, '{link}');
+            $desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>', $desc);
+            print $desc;
+            print '</div>';
+        }
+    } else {
+        dol_print_error($db);
+    }
 
 
-	// Button to write into Ledger
-	if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1'
-		|| getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == '-1'
-		|| (isModEnabled("salaries") && (getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') == "" || getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') == '-1'))
-		|| (isModEnabled("expensereport") && (getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT') == '-1'))) {
+    // Button to write into Ledger
+    if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1'
+        || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == '-1'
+        || (isModEnabled("salaries") && (getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') == "" || getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT') == '-1'))
+        || (isModEnabled("expensereport") && (getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT') == '-1'))) {
 
 
-		print($desc ? '' : '<br>').'<div class="warning">'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
-		$desc = ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '{link}');
-		$desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>', $desc);
-		print $desc;
-		print '</div>';
-	}
+        print($desc ? '' : '<br>').'<div class="warning">'.img_warning().' '.$langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+        $desc = ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '{link}');
+        $desc = str_replace('{link}', '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>', $desc);
+        print $desc;
+        print '</div>';
+    }
 
 
-	print '<br><div class="tabsAction tabsActionNoBottom centerimp">';
+    print '<br><div class="tabsAction tabsActionNoBottom centerimp">';
 
-	if (getDolGlobalString('ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL') && $in_bookkeeping == 'notyet') {
-		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
-	}
+    if (getDolGlobalString('ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL') && $in_bookkeeping == 'notyet') {
+        print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+    }
 
-	if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1'
-		|| getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == '-1') {
-		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
-	} else {
-		if ($in_bookkeeping == 'notyet') {
-			print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
-		} else {
-			print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
-		}
-	}
+    if (getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER') == '-1'
+        || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == "" || getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER') == '-1') {
+        print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
+    } else {
+        if ($in_bookkeeping == 'notyet') {
+            print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+        } else {
+            print '<a class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+        }
+    }
 
-	print '</div>';
+    print '</div>';
 
-	// TODO Avoid using js. We can use a direct link with $param
-	print '
+    // TODO Avoid using js. We can use a direct link with $param
+    print '
 	<script type="text/javascript">
 		function launch_export() {
 			console.log("Set value into form and submit");
@@ -1216,259 +1216,259 @@ 
 		}
 	</script>';
 
-	/*
+    /*
 	 * Show result array
 	 */
-	print '<br>';
-
-	$i = 0;
-	print '<div class="div-table-responsive">';
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre">';
-	print "<td>".$langs->trans("Date")."</td>";
-	print "<td>".$langs->trans("Piece").' ('.$langs->trans("ObjectsRef").")</td>";
-	print "<td>".$langs->trans("AccountAccounting")."</td>";
-	print "<td>".$langs->trans("SubledgerAccount")."</td>";
-	print "<td>".$langs->trans("LabelOperation")."</td>";
-	print '<td class="center">'.$langs->trans("PaymentMode")."</td>";
-	print '<td class="right">'.$langs->trans("AccountingDebit")."</td>";
-	print '<td class="right">'.$langs->trans("AccountingCredit")."</td>";
-	print "</tr>\n";
-
-	$r = '';
-
-	foreach ($tabpay as $key => $val) {			  // $key is rowid in llx_bank
-		$date = dol_print_date($val["date"], 'day');
-
-		$ref = getSourceDocRef($val, $tabtype[$key]);
-
-		// Bank
-		foreach ($tabbq[$key] as $k => $mt) {
-			if ($mt) {
-				$reflabel = '';
-				if (!empty($val['lib'])) {
-					$reflabel .= $val['lib']." - ";
-				}
-				$reflabel .= $langs->trans("Bank").' '.$val['bank_account_ref'];
-				if (!empty($val['soclib'])) {
-					$reflabel .= " - ".$val['soclib'];
-				}
+    print '<br>';
 
-				//var_dump($tabpay[$key]);
-				print '<!-- Bank bank.rowid='.$key.' type='.$tabpay[$key]['type'].' ref='.$tabpay[$key]['ref'].'-->';
-				print '<tr class="oddeven">';
+    $i = 0;
+    print '<div class="div-table-responsive">';
+    print '<table class="noborder centpercent">';
+    print '<tr class="liste_titre">';
+    print "<td>".$langs->trans("Date")."</td>";
+    print "<td>".$langs->trans("Piece").' ('.$langs->trans("ObjectsRef").")</td>";
+    print "<td>".$langs->trans("AccountAccounting")."</td>";
+    print "<td>".$langs->trans("SubledgerAccount")."</td>";
+    print "<td>".$langs->trans("LabelOperation")."</td>";
+    print '<td class="center">'.$langs->trans("PaymentMode")."</td>";
+    print '<td class="right">'.$langs->trans("AccountingDebit")."</td>";
+    print '<td class="right">'.$langs->trans("AccountingCredit")."</td>";
+    print "</tr>\n";
+
+    $r = '';
+
+    foreach ($tabpay as $key => $val) {			  // $key is rowid in llx_bank
+        $date = dol_print_date($val["date"], 'day');
+
+        $ref = getSourceDocRef($val, $tabtype[$key]);
+
+        // Bank
+        foreach ($tabbq[$key] as $k => $mt) {
+            if ($mt) {
+                $reflabel = '';
+                if (!empty($val['lib'])) {
+                    $reflabel .= $val['lib']." - ";
+                }
+                $reflabel .= $langs->trans("Bank").' '.$val['bank_account_ref'];
+                if (!empty($val['soclib'])) {
+                    $reflabel .= " - ".$val['soclib'];
+                }
 
-				// Date
-				print "<td>".$date."</td>";
+                //var_dump($tabpay[$key]);
+                print '<!-- Bank bank.rowid='.$key.' type='.$tabpay[$key]['type'].' ref='.$tabpay[$key]['ref'].'-->';
+                print '<tr class="oddeven">';
 
-				// Ref
-				print "<td>".dol_escape_htmltag($ref)."</td>";
+                // Date
+                print "<td>".$date."</td>";
 
-				// Ledger account
-				$accounttoshow = length_accountg($k);
-				if (empty($accounttoshow) || $accounttoshow == 'NotDefined') {
-					$accounttoshow = '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
-				}
-				print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">';
-				print $accounttoshow;
-				print "</td>";
+                // Ref
+                print "<td>".dol_escape_htmltag($ref)."</td>";
 
-				// Subledger account
-				print '<td class="maxwidth300">';
-				/*$accounttoshow = length_accountg($k);
+                // Ledger account
+                $accounttoshow = length_accountg($k);
+                if (empty($accounttoshow) || $accounttoshow == 'NotDefined') {
+                    $accounttoshow = '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
+                }
+                print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">';
+                print $accounttoshow;
+                print "</td>";
+
+                // Subledger account
+                print '<td class="maxwidth300">';
+                /*$accounttoshow = length_accountg($k);
 				if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
 				{
 					print '<span class="error">'.$langs->trans("BankAccountNotDefined").'</span>';
 				}
 				else print $accounttoshow;*/
-				print "</td>";
-
-				// Label operation
-				print '<td>';
-				print $reflabel;	// This is already html escaped content
-				print "</td>";
-
-				print '<td class="center">'.$val["type_payment"]."</td>";
-				print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
-				print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
-				print "</tr>";
-
-				$i++;
-			}
-		}
-
-		// Third party
-		if (is_array($tabtp[$key])) {
-			foreach ($tabtp[$key] as $k => $mt) {
-				if ($mt) {
-					$reflabel = '';
-					if (!empty($val['lib'])) {
-						$reflabel .= $val['lib'].(isset($val['soclib']) ? " - " : "");
-					}
-					if ($tabtype[$key] == 'banktransfert') {
-						$reflabel .= $langs->trans('TransitionalAccount').' '.$account_transfer;
-					} else {
-						$reflabel .= isset($val['soclib']) ? $val['soclib'] : "";
-					}
-
-					print '<!-- Thirdparty bank.rowid='.$key.' -->';
-					print '<tr class="oddeven">';
-
-					// Date
-					print "<td>".$date."</td>";
-
-					// Ref
-					print "<td>".dol_escape_htmltag($ref)."</td>";
-
-					// Ledger account
-					$account_ledger = $k;
-					// Try to force general ledger account depending on type
-					if ($tabtype[$key] == 'payment') {
-						$account_ledger = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
-					}
-					if ($tabtype[$key] == 'payment_supplier') {
-						$account_ledger = getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER');
-					}
-					if ($tabtype[$key] == 'payment_expensereport') {
-						$account_ledger = getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT');
-					}
-					if ($tabtype[$key] == 'payment_salary') {
-						$account_ledger = getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT');
-					}
-					if ($tabtype[$key] == 'payment_vat') {
-						$account_ledger = getDolGlobalString('ACCOUNTING_VAT_PAY_ACCOUNT');
-					}
-					if ($tabtype[$key] == 'member') {
-						$account_ledger = getDolGlobalString('ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT');
-					}
-					if ($tabtype[$key] == 'payment_various') {
-						$account_ledger = $tabpay[$key]["account_various"];
-					}
-					$accounttoshow = length_accountg($account_ledger);
-					if (empty($accounttoshow) || $accounttoshow == 'NotDefined') {
-						if ($tabtype[$key] == 'unknown') {
-							// We will accept writing, but into a waiting account
-							if (!getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE') || getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE') == '-1') {
-								$accounttoshow = '<span class="error small">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
-							} else {
-								$accounttoshow = '<span class="warning small">'.$langs->trans('UnknownAccountForThirdparty', length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'))).'</span>'; // We will use a waiting account
-							}
-						} else {
-							// We will refuse writing
-							$errorstring = 'UnknownAccountForThirdpartyBlocking';
-							if ($tabtype[$key] == 'payment') {
-								$errorstring = 'MainAccountForCustomersNotDefined';
-							}
-							if ($tabtype[$key] == 'payment_supplier') {
-								$errorstring = 'MainAccountForSuppliersNotDefined';
-							}
-							if ($tabtype[$key] == 'payment_expensereport') {
-								$errorstring = 'MainAccountForUsersNotDefined';
-							}
-							if ($tabtype[$key] == 'payment_salary') {
-								$errorstring = 'MainAccountForUsersNotDefined';
-							}
-							if ($tabtype[$key] == 'payment_vat') {
-								$errorstring = 'MainAccountForVatPaymentNotDefined';
-							}
-							if ($tabtype[$key] == 'member') {
-								$errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
-							}
-							$accounttoshow = '<span class="error small">'.$langs->trans($errorstring).'</span>';
-						}
-					}
-					print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">';
-					print $accounttoshow;	// This is a HTML string
-					print "</td>";
-
-					// Subledger account
-					$accounttoshowsubledger = '';
-					if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary', 'payment_various'))) {	// Type of payments that uses a subledger
-						$accounttoshowsubledger = length_accounta($k);
-						if ($accounttoshow != $accounttoshowsubledger) {
-							if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined') {
-								//var_dump($tabpay[$key]);
-								//var_dump($tabtype[$key]);
-								//var_dump($tabbq[$key]);
-								//print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-								if (!empty($tabcompany[$key]['code_compta'])) {
-									if (in_array($tabtype[$key], array('payment_various', 'payment_salary'))) {
-										// For such case, if subledger is not defined, we won't use subledger accounts.
-										$accounttoshowsubledger = '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored").'</span>';
-									} else {
-										$accounttoshowsubledger = '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
-									}
-								} else {
-									$accounttoshowsubledger = '<span class="error small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
-								}
-							}
-						} else {
-							$accounttoshowsubledger = '';
-						}
-					}
-					print '<td class="maxwidth300">';
-					print $accounttoshowsubledger;	// This is a html string
-					print "</td>";
-
-					print "<td>".$reflabel."</td>";
-
-					print '<td class="center">'.$val["type_payment"]."</td>";
+                print "</td>";
 
-					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+                // Label operation
+                print '<td>';
+                print $reflabel;	// This is already html escaped content
+                print "</td>";
 
-					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+                print '<td class="center">'.$val["type_payment"]."</td>";
+                print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+                print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+                print "</tr>";
 
-					print "</tr>";
+                $i++;
+            }
+        }
 
-					$i++;
-				}
-			}
-		} else {	// Waiting account
-			foreach ($tabbq[$key] as $k => $mt) {
-				if ($mt) {
-					$reflabel = '';
-					if (!empty($val['lib'])) {
-						$reflabel .= $val['lib']." - ";
-					}
-					$reflabel .= 'WaitingAccount';
-
-					print '<!-- Wait bank.rowid='.$key.' -->';
-					print '<tr class="oddeven">';
-					print "<td>".$date."</td>";
-					print "<td>".$ref."</td>";
-					// Ledger account
-					print "<td>";
-					/*if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
+        // Third party
+        if (is_array($tabtp[$key])) {
+            foreach ($tabtp[$key] as $k => $mt) {
+                if ($mt) {
+                    $reflabel = '';
+                    if (!empty($val['lib'])) {
+                        $reflabel .= $val['lib'].(isset($val['soclib']) ? " - " : "");
+                    }
+                    if ($tabtype[$key] == 'banktransfert') {
+                        $reflabel .= $langs->trans('TransitionalAccount').' '.$account_transfer;
+                    } else {
+                        $reflabel .= isset($val['soclib']) ? $val['soclib'] : "";
+                    }
+
+                    print '<!-- Thirdparty bank.rowid='.$key.' -->';
+                    print '<tr class="oddeven">';
+
+                    // Date
+                    print "<td>".$date."</td>";
+
+                    // Ref
+                    print "<td>".dol_escape_htmltag($ref)."</td>";
+
+                    // Ledger account
+                    $account_ledger = $k;
+                    // Try to force general ledger account depending on type
+                    if ($tabtype[$key] == 'payment') {
+                        $account_ledger = getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER');
+                    }
+                    if ($tabtype[$key] == 'payment_supplier') {
+                        $account_ledger = getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER');
+                    }
+                    if ($tabtype[$key] == 'payment_expensereport') {
+                        $account_ledger = getDolGlobalString('ACCOUNTING_ACCOUNT_EXPENSEREPORT');
+                    }
+                    if ($tabtype[$key] == 'payment_salary') {
+                        $account_ledger = getDolGlobalString('SALARIES_ACCOUNTING_ACCOUNT_PAYMENT');
+                    }
+                    if ($tabtype[$key] == 'payment_vat') {
+                        $account_ledger = getDolGlobalString('ACCOUNTING_VAT_PAY_ACCOUNT');
+                    }
+                    if ($tabtype[$key] == 'member') {
+                        $account_ledger = getDolGlobalString('ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT');
+                    }
+                    if ($tabtype[$key] == 'payment_various') {
+                        $account_ledger = $tabpay[$key]["account_various"];
+                    }
+                    $accounttoshow = length_accountg($account_ledger);
+                    if (empty($accounttoshow) || $accounttoshow == 'NotDefined') {
+                        if ($tabtype[$key] == 'unknown') {
+                            // We will accept writing, but into a waiting account
+                            if (!getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE') || getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE') == '-1') {
+                                $accounttoshow = '<span class="error small">'.$langs->trans('UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking').'</span>';
+                            } else {
+                                $accounttoshow = '<span class="warning small">'.$langs->trans('UnknownAccountForThirdparty', length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'))).'</span>'; // We will use a waiting account
+                            }
+                        } else {
+                            // We will refuse writing
+                            $errorstring = 'UnknownAccountForThirdpartyBlocking';
+                            if ($tabtype[$key] == 'payment') {
+                                $errorstring = 'MainAccountForCustomersNotDefined';
+                            }
+                            if ($tabtype[$key] == 'payment_supplier') {
+                                $errorstring = 'MainAccountForSuppliersNotDefined';
+                            }
+                            if ($tabtype[$key] == 'payment_expensereport') {
+                                $errorstring = 'MainAccountForUsersNotDefined';
+                            }
+                            if ($tabtype[$key] == 'payment_salary') {
+                                $errorstring = 'MainAccountForUsersNotDefined';
+                            }
+                            if ($tabtype[$key] == 'payment_vat') {
+                                $errorstring = 'MainAccountForVatPaymentNotDefined';
+                            }
+                            if ($tabtype[$key] == 'member') {
+                                $errorstring = 'MainAccountForSubscriptionPaymentNotDefined';
+                            }
+                            $accounttoshow = '<span class="error small">'.$langs->trans($errorstring).'</span>';
+                        }
+                    }
+                    print '<td class="maxwidth300" title="'.dol_escape_htmltag(dol_string_nohtmltag($accounttoshow)).'">';
+                    print $accounttoshow;	// This is a HTML string
+                    print "</td>";
+
+                    // Subledger account
+                    $accounttoshowsubledger = '';
+                    if (in_array($tabtype[$key], array('payment', 'payment_supplier', 'payment_expensereport', 'payment_salary', 'payment_various'))) {	// Type of payments that uses a subledger
+                        $accounttoshowsubledger = length_accounta($k);
+                        if ($accounttoshow != $accounttoshowsubledger) {
+                            if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined') {
+                                //var_dump($tabpay[$key]);
+                                //var_dump($tabtype[$key]);
+                                //var_dump($tabbq[$key]);
+                                //print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
+                                if (!empty($tabcompany[$key]['code_compta'])) {
+                                    if (in_array($tabtype[$key], array('payment_various', 'payment_salary'))) {
+                                        // For such case, if subledger is not defined, we won't use subledger accounts.
+                                        $accounttoshowsubledger = '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored").'</span>';
+                                    } else {
+                                        $accounttoshowsubledger = '<span class="warning small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknown", $tabcompany[$key]['code_compta']).'</span>';
+                                    }
+                                } else {
+                                    $accounttoshowsubledger = '<span class="error small">'.$langs->trans("ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking").'</span>';
+                                }
+                            }
+                        } else {
+                            $accounttoshowsubledger = '';
+                        }
+                    }
+                    print '<td class="maxwidth300">';
+                    print $accounttoshowsubledger;	// This is a html string
+                    print "</td>";
+
+                    print "<td>".$reflabel."</td>";
+
+                    print '<td class="center">'.$val["type_payment"]."</td>";
+
+                    print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+
+                    print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+
+                    print "</tr>";
+
+                    $i++;
+                }
+            }
+        } else {	// Waiting account
+            foreach ($tabbq[$key] as $k => $mt) {
+                if ($mt) {
+                    $reflabel = '';
+                    if (!empty($val['lib'])) {
+                        $reflabel .= $val['lib']." - ";
+                    }
+                    $reflabel .= 'WaitingAccount';
+
+                    print '<!-- Wait bank.rowid='.$key.' -->';
+                    print '<tr class="oddeven">';
+                    print "<td>".$date."</td>";
+                    print "<td>".$ref."</td>";
+                    // Ledger account
+                    print "<td>";
+                    /*if (empty($accounttoshow) || $accounttoshow == 'NotDefined')
 					{
 						print '<span class="error">'.$langs->trans("WaitAccountNotDefined").'</span>';
 					}
 					else */
-					print length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'));
-					print "</td>";
-					// Subledger account
-					print "<td>";
-					print "</td>";
-					print "<td>".dol_escape_htmltag($reflabel)."</td>";
-					print '<td class="center">'.$val["type_payment"]."</td>";
-					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
-					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
-					print "</tr>";
-
-					$i++;
-				}
-			}
-		}
-	}
+                    print length_accountg(getDolGlobalString('ACCOUNTING_ACCOUNT_SUSPENSE'));
+                    print "</td>";
+                    // Subledger account
+                    print "<td>";
+                    print "</td>";
+                    print "<td>".dol_escape_htmltag($reflabel)."</td>";
+                    print '<td class="center">'.$val["type_payment"]."</td>";
+                    print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
+                    print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
+                    print "</tr>";
+
+                    $i++;
+                }
+            }
+        }
+    }
 
-	if (!$i) {
-		$colspan = 8;
-		print '<tr class="oddeven"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
-	}
+    if (!$i) {
+        $colspan = 8;
+        print '<tr class="oddeven"><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+    }
 
-	print "</table>";
-	print '</div>';
+    print "</table>";
+    print '</div>';
 
-	llxFooter();
+    llxFooter();
 }
 
 $db->close();
@@ -1484,110 +1484,110 @@ 
  */
 function getSourceDocRef($val, $typerecord)
 {
-	global $db, $langs;
-
-	// Defined the docref into $ref (We start with $val['ref'] by default and we complete according to other data)
-	// WE MUST HAVE SAME REF FOR ALL LINES WE WILL RECORD INTO THE BOOKKEEPING
-	$ref = $val['ref'];
-	if ($ref == '(SupplierInvoicePayment)' || $ref == '(SupplierInvoicePaymentBack)') {
-		$ref = $langs->transnoentitiesnoconv('Supplier');
-	}
-	if ($ref == '(CustomerInvoicePayment)' || $ref == '(CustomerInvoicePaymentBack)') {
-		$ref = $langs->transnoentitiesnoconv('Customer');
-	}
-	if ($ref == '(SocialContributionPayment)') {
-		$ref = $langs->transnoentitiesnoconv('SocialContribution');
-	}
-	if ($ref == '(DonationPayment)') {
-		$ref = $langs->transnoentitiesnoconv('Donation');
-	}
-	if ($ref == '(SubscriptionPayment)') {
-		$ref = $langs->transnoentitiesnoconv('Subscription');
-	}
-	if ($ref == '(ExpenseReportPayment)') {
-		$ref = $langs->transnoentitiesnoconv('Employee');
-	}
-	if ($ref == '(LoanPayment)') {
-		$ref = $langs->transnoentitiesnoconv('Loan');
-	}
-	if ($ref == '(payment_salary)') {
-		$ref = $langs->transnoentitiesnoconv('Employee');
-	}
-
-	$sqlmid = '';
-	if ($typerecord == 'payment') {
-		if (getDolGlobalInt('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
-			$sqlmid = "SELECT payfac.fk_facture as id, ".$db->ifsql('f1.rowid IS NULL', 'f.ref', 'f1.ref')." as ref";
-			$sqlmid .= " FROM ".$db->prefix()."paiement_facture as payfac";
-			$sqlmid .= " LEFT JOIN ".$db->prefix()."facture as f ON f.rowid = payfac.fk_facture";
-			$sqlmid .= " LEFT JOIN ".$db->prefix()."societe_remise_except as sre ON sre.fk_facture_source = payfac.fk_facture";
-			$sqlmid .= " LEFT JOIN ".$db->prefix()."facture as f1 ON f1.rowid = sre.fk_facture";
-			$sqlmid .= " WHERE payfac.fk_paiement=".((int) $val['paymentid']);
-		} else {
-			$sqlmid = "SELECT payfac.fk_facture as id, f.ref as ref";
-			$sqlmid .= " FROM ".$db->prefix()."paiement_facture as payfac";
-			$sqlmid .= " INNER JOIN ".$db->prefix()."facture as f ON f.rowid = payfac.fk_facture";
-			$sqlmid .= " WHERE payfac.fk_paiement=".((int) $val['paymentid']);
-		}
-		$ref = $langs->transnoentitiesnoconv("Invoice");
-	} elseif ($typerecord == 'payment_supplier') {
-		$sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
-		$sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".((int) $val["paymentsupplierid"]);
-		$ref = $langs->transnoentitiesnoconv("SupplierInvoice");
-	} elseif ($typerecord == 'payment_expensereport') {
-		$sqlmid = 'SELECT e.rowid as id, e.ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as pe, ".MAIN_DB_PREFIX."expensereport as e";
-		$sqlmid .= " WHERE pe.rowid=".((int) $val["paymentexpensereport"])." AND pe.fk_expensereport = e.rowid";
-		$ref = $langs->transnoentitiesnoconv("ExpenseReport");
-	} elseif ($typerecord == 'payment_salary') {
-		$sqlmid = 'SELECT s.rowid as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
-		$sqlmid .= " WHERE s.rowid=".((int) $val["paymentsalid"]);
-		$ref = $langs->transnoentitiesnoconv("SalaryPayment");
-	} elseif ($typerecord == 'sc') {
-		$sqlmid = 'SELECT sc.rowid as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementcharge as sc";
-		$sqlmid .= " WHERE sc.rowid=".((int) $val["paymentscid"]);
-		$ref = $langs->transnoentitiesnoconv("SocialContribution");
-	} elseif ($typerecord == 'payment_vat') {
-		$sqlmid = 'SELECT v.rowid as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."tva as v";
-		$sqlmid .= " WHERE v.rowid=".((int) $val["paymentvatid"]);
-		$ref = $langs->transnoentitiesnoconv("PaymentVat");
-	} elseif ($typerecord == 'payment_donation') {
-		$sqlmid = 'SELECT payd.fk_donation as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_donation as payd";
-		$sqlmid .= " WHERE payd.fk_donation=".((int) $val["paymentdonationid"]);
-		$ref = $langs->transnoentitiesnoconv("Donation");
-	} elseif ($typerecord == 'payment_loan') {
-		$sqlmid = 'SELECT l.rowid as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_loan as l";
-		$sqlmid .= " WHERE l.rowid=".((int) $val["paymentloanid"]);
-		$ref = $langs->transnoentitiesnoconv("LoanPayment");
-	} elseif ($typerecord == 'payment_various') {
-		$sqlmid = 'SELECT v.rowid as ref';
-		$sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
-		$sqlmid .= " WHERE v.rowid=".((int) $val["paymentvariousid"]);
-		$ref = $langs->transnoentitiesnoconv("VariousPayment");
-	}
-	// Add warning
-	if (empty($sqlmid)) {
-		dol_syslog("Found a typerecord=".$typerecord." not supported", LOG_WARNING);
-	}
-
-	if ($sqlmid) {
-		dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
-		$resultmid = $db->query($sqlmid);
-		if ($resultmid) {
-			while ($objmid = $db->fetch_object($resultmid)) {
-				$ref .= ' '.$objmid->ref;
-			}
-		} else {
-			dol_print_error($db);
-		}
-	}
+    global $db, $langs;
+
+    // Defined the docref into $ref (We start with $val['ref'] by default and we complete according to other data)
+    // WE MUST HAVE SAME REF FOR ALL LINES WE WILL RECORD INTO THE BOOKKEEPING
+    $ref = $val['ref'];
+    if ($ref == '(SupplierInvoicePayment)' || $ref == '(SupplierInvoicePaymentBack)') {
+        $ref = $langs->transnoentitiesnoconv('Supplier');
+    }
+    if ($ref == '(CustomerInvoicePayment)' || $ref == '(CustomerInvoicePaymentBack)') {
+        $ref = $langs->transnoentitiesnoconv('Customer');
+    }
+    if ($ref == '(SocialContributionPayment)') {
+        $ref = $langs->transnoentitiesnoconv('SocialContribution');
+    }
+    if ($ref == '(DonationPayment)') {
+        $ref = $langs->transnoentitiesnoconv('Donation');
+    }
+    if ($ref == '(SubscriptionPayment)') {
+        $ref = $langs->transnoentitiesnoconv('Subscription');
+    }
+    if ($ref == '(ExpenseReportPayment)') {
+        $ref = $langs->transnoentitiesnoconv('Employee');
+    }
+    if ($ref == '(LoanPayment)') {
+        $ref = $langs->transnoentitiesnoconv('Loan');
+    }
+    if ($ref == '(payment_salary)') {
+        $ref = $langs->transnoentitiesnoconv('Employee');
+    }
+
+    $sqlmid = '';
+    if ($typerecord == 'payment') {
+        if (getDolGlobalInt('FACTURE_DEPOSITS_ARE_JUST_PAYMENTS')) {
+            $sqlmid = "SELECT payfac.fk_facture as id, ".$db->ifsql('f1.rowid IS NULL', 'f.ref', 'f1.ref')." as ref";
+            $sqlmid .= " FROM ".$db->prefix()."paiement_facture as payfac";
+            $sqlmid .= " LEFT JOIN ".$db->prefix()."facture as f ON f.rowid = payfac.fk_facture";
+            $sqlmid .= " LEFT JOIN ".$db->prefix()."societe_remise_except as sre ON sre.fk_facture_source = payfac.fk_facture";
+            $sqlmid .= " LEFT JOIN ".$db->prefix()."facture as f1 ON f1.rowid = sre.fk_facture";
+            $sqlmid .= " WHERE payfac.fk_paiement=".((int) $val['paymentid']);
+        } else {
+            $sqlmid = "SELECT payfac.fk_facture as id, f.ref as ref";
+            $sqlmid .= " FROM ".$db->prefix()."paiement_facture as payfac";
+            $sqlmid .= " INNER JOIN ".$db->prefix()."facture as f ON f.rowid = payfac.fk_facture";
+            $sqlmid .= " WHERE payfac.fk_paiement=".((int) $val['paymentid']);
+        }
+        $ref = $langs->transnoentitiesnoconv("Invoice");
+    } elseif ($typerecord == 'payment_supplier') {
+        $sqlmid = 'SELECT payfac.fk_facturefourn as id, f.ref';
+        $sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfac, ".MAIN_DB_PREFIX."facture_fourn as f";
+        $sqlmid .= " WHERE payfac.fk_facturefourn = f.rowid AND payfac.fk_paiementfourn=".((int) $val["paymentsupplierid"]);
+        $ref = $langs->transnoentitiesnoconv("SupplierInvoice");
+    } elseif ($typerecord == 'payment_expensereport') {
+        $sqlmid = 'SELECT e.rowid as id, e.ref';
+        $sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as pe, ".MAIN_DB_PREFIX."expensereport as e";
+        $sqlmid .= " WHERE pe.rowid=".((int) $val["paymentexpensereport"])." AND pe.fk_expensereport = e.rowid";
+        $ref = $langs->transnoentitiesnoconv("ExpenseReport");
+    } elseif ($typerecord == 'payment_salary') {
+        $sqlmid = 'SELECT s.rowid as ref';
+        $sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
+        $sqlmid .= " WHERE s.rowid=".((int) $val["paymentsalid"]);
+        $ref = $langs->transnoentitiesnoconv("SalaryPayment");
+    } elseif ($typerecord == 'sc') {
+        $sqlmid = 'SELECT sc.rowid as ref';
+        $sqlmid .= " FROM ".MAIN_DB_PREFIX."paiementcharge as sc";
+        $sqlmid .= " WHERE sc.rowid=".((int) $val["paymentscid"]);
+        $ref = $langs->transnoentitiesnoconv("SocialContribution");
+    } elseif ($typerecord == 'payment_vat') {
+        $sqlmid = 'SELECT v.rowid as ref';
+        $sqlmid .= " FROM ".MAIN_DB_PREFIX."tva as v";
+        $sqlmid .= " WHERE v.rowid=".((int) $val["paymentvatid"]);
+        $ref = $langs->transnoentitiesnoconv("PaymentVat");
+    } elseif ($typerecord == 'payment_donation') {
+        $sqlmid = 'SELECT payd.fk_donation as ref';
+        $sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_donation as payd";
+        $sqlmid .= " WHERE payd.fk_donation=".((int) $val["paymentdonationid"]);
+        $ref = $langs->transnoentitiesnoconv("Donation");
+    } elseif ($typerecord == 'payment_loan') {
+        $sqlmid = 'SELECT l.rowid as ref';
+        $sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_loan as l";
+        $sqlmid .= " WHERE l.rowid=".((int) $val["paymentloanid"]);
+        $ref = $langs->transnoentitiesnoconv("LoanPayment");
+    } elseif ($typerecord == 'payment_various') {
+        $sqlmid = 'SELECT v.rowid as ref';
+        $sqlmid .= " FROM ".MAIN_DB_PREFIX."payment_various as v";
+        $sqlmid .= " WHERE v.rowid=".((int) $val["paymentvariousid"]);
+        $ref = $langs->transnoentitiesnoconv("VariousPayment");
+    }
+    // Add warning
+    if (empty($sqlmid)) {
+        dol_syslog("Found a typerecord=".$typerecord." not supported", LOG_WARNING);
+    }
+
+    if ($sqlmid) {
+        dol_syslog("accountancy/journal/bankjournal.php::sqlmid=".$sqlmid, LOG_DEBUG);
+        $resultmid = $db->query($sqlmid);
+        if ($resultmid) {
+            while ($objmid = $db->fetch_object($resultmid)) {
+                $ref .= ' '.$objmid->ref;
+            }
+        } else {
+            dol_print_error($db);
+        }
+    }
 
-	$ref = dol_trunc($langs->transnoentitiesnoconv("BankId").' '.$val['fk_bank'].' - '.$ref, 295); // 295 + 3 dots (...) is < than max size of 300
-	return $ref;
+    $ref = dol_trunc($langs->transnoentitiesnoconv("BankId").' '.$val['fk_bank'].' - '.$ref, 295); // 295 + 3 dots (...) is < than max size of 300
+    return $ref;
 }

Dolibarr/Code/Contrat/Classes/ContratLigne.php

Indentation +8 added lines, -8 removed lines

@@ -260,7 +260,7 @@ 
         return $this->LibStatut($this->statut, $mode, ((!empty($this->date_end)) ? ($this->date_end < dol_now() ? 1 : 0) : -1));
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return label of a contract line status
      *
@@ -273,7 +273,7 @@ 
      */
     public static function LibStatut($status, $mode, $expired = -1, $moreatt = '', $morelabel = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
         $langs->load("contracts");
 
@@ -709,7 +709,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update in database the fields total_xxx of lines
      *  Used by migration process
@@ -718,7 +718,7 @@ 
      */
     public function update_total()
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->db->begin();
 
         // Mise a jour ligne en base
@@ -836,7 +836,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Activate a contract line
      *
@@ -848,7 +848,7 @@ 
      */
     public function active_line($user, $date, $date_end = '', $comment = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         $error = 0;
 
         $this->db->begin();
@@ -894,7 +894,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Close a contract line
      *
@@ -906,7 +906,7 @@ 
      */
     public function close_line($user, $date_end_real, $comment = '', $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->date_cloture = $date_end_real;
         $this->date_end_real = $date_end_real;
         $this->user_closing_id = $user->id;