|
@@ -87,8 +87,6 @@ class ExpenseReportIk extends CoreObject
|
|
|
*/
|
|
|
public function __construct(DoliDB &$db)
|
|
|
{
|
|
|
- global $conf;
|
|
|
-
|
|
|
parent::__construct($db);
|
|
|
parent::init();
|
|
|
|
|
@@ -102,29 +100,28 @@ class ExpenseReportIk extends CoreObject
|
|
|
* @param int $mode 1=only active; 2=only inactive; other value return all
|
|
|
* @return array of category
|
|
|
*/
|
|
|
- public static function getTaxCategories($mode = 1)
|
|
|
+ public function getTaxCategories($mode = 1)
|
|
|
{
|
|
|
- global $db;
|
|
|
-
|
|
|
$categories = array();
|
|
|
|
|
|
$sql = 'SELECT rowid, label, entity, active';
|
|
|
$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat';
|
|
|
- $sql .= ' WHERE entity IN ('.getEntity('c_exp_tax_cat').')';
|
|
|
+ $sql .= ' WHERE entity IN (0, '.getEntity($this->element).')';
|
|
|
if ($mode == 1) {
|
|
|
$sql .= ' AND active = 1';
|
|
|
} elseif ($mode == 2) {
|
|
|
$sql .= 'AND active = 0';
|
|
|
}
|
|
|
|
|
|
- dol_syslog(get_called_class().'::getTaxCategories sql='.$sql, LOG_DEBUG);
|
|
|
- $resql = $db->query($sql);
|
|
|
+ dol_syslog(get_called_class().'::getTaxCategories', LOG_DEBUG);
|
|
|
+
|
|
|
+ $resql = $this->db->query($sql);
|
|
|
if ($resql) {
|
|
|
- while ($obj = $db->fetch_object($resql)) {
|
|
|
+ while ($obj = $this->db->fetch_object($resql)) {
|
|
|
$categories[$obj->rowid] = $obj;
|
|
|
}
|
|
|
} else {
|
|
|
- dol_print_error($db);
|
|
|
+ dol_print_error($this->db);
|
|
|
}
|
|
|
|
|
|
return $categories;
|
|
@@ -137,10 +134,10 @@ class ExpenseReportIk extends CoreObject
|
|
|
* @param int $fk_c_exp_tax_cat category
|
|
|
* @return boolean|array
|
|
|
*/
|
|
|
- public static function getRangeByUser(User $userauthor, int $fk_c_exp_tax_cat)
|
|
|
+ public function getRangeByUser(User $userauthor, int $fk_c_exp_tax_cat)
|
|
|
{
|
|
|
$default_range = (int) $userauthor->default_range; // if not defined, then 0
|
|
|
- $ranges = self::getRangesByCategory($fk_c_exp_tax_cat);
|
|
|
+ $ranges = $this->getRangesByCategory($fk_c_exp_tax_cat);
|
|
|
|
|
|
// substract 1 because array start from 0
|
|
|
if (empty($ranges) || !isset($ranges[$default_range - 1])) {
|
|
@@ -157,10 +154,8 @@ class ExpenseReportIk extends CoreObject
|
|
|
* @param int $active active
|
|
|
* @return array
|
|
|
*/
|
|
|
- public static function getRangesByCategory(int $fk_c_exp_tax_cat, $active = 1)
|
|
|
+ public function getRangesByCategory(int $fk_c_exp_tax_cat, $active = 1)
|
|
|
{
|
|
|
- global $db;
|
|
|
-
|
|
|
$ranges = array();
|
|
|
|
|
|
dol_syslog(get_called_class().'::getRangesByCategory for fk_c_exp_tax_cat='.$fk_c_exp_tax_cat, LOG_DEBUG);
|
|
@@ -170,24 +165,25 @@ class ExpenseReportIk extends CoreObject
|
|
|
$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_exp_tax_cat c ON (r.fk_c_exp_tax_cat = c.rowid)';
|
|
|
}
|
|
|
$sql .= ' WHERE r.fk_c_exp_tax_cat = '.((int) $fk_c_exp_tax_cat);
|
|
|
+ $sql .= " AND entity IN(0, ".getEntity($this->element).")";
|
|
|
if ($active) {
|
|
|
$sql .= ' AND r.active = 1 AND c.active = 1';
|
|
|
}
|
|
|
$sql .= ' ORDER BY r.range_ik';
|
|
|
|
|
|
- $resql = $db->query($sql);
|
|
|
+ $resql = $this->db->query($sql);
|
|
|
if ($resql) {
|
|
|
- $num = $db->num_rows($resql);
|
|
|
+ $num = $this->db->num_rows($resql);
|
|
|
if ($num > 0) {
|
|
|
- while ($obj = $db->fetch_object($resql)) {
|
|
|
- $object = new ExpenseReportIk($db);
|
|
|
+ while ($obj = $this->db->fetch_object($resql)) {
|
|
|
+ $object = new ExpenseReportIk($this->db);
|
|
|
$object->fetch($obj->rowid);
|
|
|
|
|
|
$ranges[] = $object;
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- dol_print_error($db);
|
|
|
+ dol_print_error($this->db);
|
|
|
}
|
|
|
|
|
|
return $ranges;
|
|
@@ -198,24 +194,23 @@ class ExpenseReportIk extends CoreObject
|
|
|
*
|
|
|
* @return array
|
|
|
*/
|
|
|
- public static function getAllRanges()
|
|
|
+ public function getAllRanges()
|
|
|
{
|
|
|
- global $db;
|
|
|
-
|
|
|
$ranges = array();
|
|
|
|
|
|
$sql = ' SELECT r.rowid, r.fk_c_exp_tax_cat, r.range_ik, c.label, i.rowid as fk_expense_ik, r.active as range_active, c.active as cat_active';
|
|
|
$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_range r';
|
|
|
$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_exp_tax_cat c ON (r.fk_c_exp_tax_cat = c.rowid)';
|
|
|
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expensereport_ik i ON (r.rowid = i.fk_range)';
|
|
|
- $sql .= ' WHERE r.entity IN (0, '.getEntity('').')';
|
|
|
+ $sql .= ' WHERE r.entity IN (0, '.getEntity($this->element).')';
|
|
|
$sql .= ' ORDER BY r.fk_c_exp_tax_cat, r.range_ik';
|
|
|
|
|
|
- dol_syslog(get_called_class().'::getAllRanges sql='.$sql, LOG_DEBUG);
|
|
|
- $resql = $db->query($sql);
|
|
|
+ dol_syslog(get_called_class().'::getAllRanges', LOG_DEBUG);
|
|
|
+
|
|
|
+ $resql = $this->db->query($sql);
|
|
|
if ($resql) {
|
|
|
- while ($obj = $db->fetch_object($resql)) {
|
|
|
- $ik = new ExpenseReportIk($db);
|
|
|
+ while ($obj = $this->db->fetch_object($resql)) {
|
|
|
+ $ik = new ExpenseReportIk($this->db);
|
|
|
if ($obj->fk_expense_ik > 0) {
|
|
|
$ik->fetch($obj->fk_expense_ik);
|
|
|
}
|
|
@@ -227,7 +222,7 @@ class ExpenseReportIk extends CoreObject
|
|
|
$ranges[$obj->fk_c_exp_tax_cat]['ranges'][] = $obj;
|
|
|
}
|
|
|
} else {
|
|
|
- dol_print_error($db);
|
|
|
+ dol_print_error($this->db);
|
|
|
}
|
|
|
|
|
|
return $ranges;
|
|
@@ -236,30 +231,28 @@ class ExpenseReportIk extends CoreObject
|
|
|
/**
|
|
|
* Return the max number of range by a category
|
|
|
*
|
|
|
- * @param int $default_c_exp_tax_cat id
|
|
|
- * @return int
|
|
|
+ * @param int $default_c_exp_tax_cat id Default c_exp_tax_cat
|
|
|
+ * @return int Max nb
|
|
|
*/
|
|
|
- public static function getMaxRangeNumber($default_c_exp_tax_cat = 0)
|
|
|
+ public function getMaxRangeNumber($default_c_exp_tax_cat = 0)
|
|
|
{
|
|
|
- global $db, $conf;
|
|
|
-
|
|
|
$sql = 'SELECT MAX(counted) as nbRange FROM (';
|
|
|
$sql .= ' SELECT COUNT(*) as counted';
|
|
|
$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_range r';
|
|
|
- $sql .= ' WHERE r.entity IN (0, '.$conf->entity.')';
|
|
|
+ $sql .= ' WHERE r.entity IN (0, '.getEntity($this->element).')';
|
|
|
if ($default_c_exp_tax_cat > 0) {
|
|
|
$sql .= ' AND r.fk_c_exp_tax_cat = '.((int) $default_c_exp_tax_cat);
|
|
|
}
|
|
|
$sql .= ' GROUP BY r.fk_c_exp_tax_cat';
|
|
|
$sql .= ') as counts';
|
|
|
|
|
|
- dol_syslog(get_called_class().'::getMaxRangeNumber sql='.$sql, LOG_DEBUG);
|
|
|
- $resql = $db->query($sql);
|
|
|
+ dol_syslog(get_called_class().'::getMaxRangeNumber', LOG_DEBUG);
|
|
|
+ $resql = $this->db->query($sql);
|
|
|
if ($resql) {
|
|
|
- $obj = $db->fetch_object($resql);
|
|
|
+ $obj = $this->db->fetch_object($resql);
|
|
|
return $obj->nbRange;
|
|
|
} else {
|
|
|
- dol_print_error($db);
|
|
|
+ dol_print_error($this->db);
|
|
|
}
|
|
|
|
|
|
return 0;
|