Merge pull request #1516 from marcosgdf/multicompany-fixes

Fixed a problem with bank accounts sharing across entities

htdocs/compta/bank/class/account.class.php

@@ -613,7 +613,7 @@ class Account extends CommonObject
         $sql.= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_pays as p ON ba.fk_pays = p.rowid';
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON ba.state_id = d.rowid';
-        $sql.= " WHERE entity = ".$conf->entity;
+        $sql.= " WHERE entity IN (".getEntity('bank_account', 1).')';
         if ($id)  $sql.= " AND ba.rowid  = ".$id;
         if ($ref) $sql.= " AND ba.ref = '".$this->db->escape($ref)."'";
 

htdocs/compta/bank/index.php

@@ -59,7 +59,7 @@ $accounts = array();
 
 $sql  = "SELECT rowid, courant, rappro";
 $sql.= " FROM ".MAIN_DB_PREFIX."bank_account";
-$sql.= " WHERE entity = ".$conf->entity;
+$sql.= " WHERE entity IN (".getEntity('bank_account', 1).')';
 if ($statut != 'all') $sql.= " AND clos = 0";
 $sql.= $db->order('label', 'ASC');