Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur
2012-02-04 00:51:47 +01:00
294 changed files with 4581 additions and 3598 deletions

View File

@@ -246,7 +246,7 @@ class modMyModule extends DolibarrModules
$result=$this->load_tables();
return $this->_init($sql);
return $this->_init($sql, $options);
}
/**
@@ -261,7 +261,7 @@ class modMyModule extends DolibarrModules
{
$sql = array();
return $this->_remove($sql);
return $this->_remove($sql, $options);
}