| '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_STOCK, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
print " |
";
}
@@ -454,7 +454,7 @@ else
// Categories
if($conf->categorie->enabled) {
print '| '.$langs->trans("Categories").' | ';
- $cate_arbo = $form->select_all_categories(Categorie::TYPE_STOCK, '', 'parent', 64, 0, 1);
+ $cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
$c = new Categorie($db);
- $cats = $c->containing($object->id, Categorie::TYPE_STOCK);
+ $cats = $c->containing($object->id, Categorie::TYPE_WAREHOUSE);
$arrayselected=array();
foreach($cats as $cat) {
$arrayselected[] = $cat->id;
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 25feb132117..9c19979308b 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -856,7 +856,9 @@ class Entrepot extends CommonObject
*/
public function setCategories($categories)
{
- // Handle single category
+ $type_categ = Categorie::TYPE_WAREHOUSE;
+
+ // Handle single category
if (! is_array($categories)) {
$categories = array($categories);
}
@@ -864,7 +866,7 @@ class Entrepot extends CommonObject
// Get current categories
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$c = new Categorie($this->db);
- $existing = $c->containing($this->id, Categorie::TYPE_STOCK, 'id');
+ $existing = $c->containing($this->id, $type_categ, 'id');
// Diff
if (is_array($existing)) {
@@ -878,12 +880,12 @@ class Entrepot extends CommonObject
// Process
foreach($to_del as $del) {
if ($c->fetch($del) > 0) {
- $c->del_type($this, 'stock');
+ $c->del_type($this, $type_categ);
}
}
foreach ($to_add as $add) {
if ($c->fetch($add) > 0) {
- $c->add_type($this, 'stock');
+ $c->add_type($this, $type_categ);
}
}
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 3dcc486d266..1764126bbe4 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1979,10 +1979,7 @@ class Project extends CommonObject
*/
public function setCategories($categories)
{
- // Decode type
- $type_id = Categorie::TYPE_PROJECT;
- $type_text = 'project';
-
+ $type_categ = Categorie::TYPE_PROJECT;
// Handle single category
if (!is_array($categories)) {
@@ -1992,7 +1989,7 @@ class Project extends CommonObject
// Get current categories
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$c = new Categorie($this->db);
- $existing = $c->containing($this->id, $type_id, 'id');
+ $existing = $c->containing($this->id, $type_categ, 'id');
// Diff
if (is_array($existing)) {
@@ -2006,7 +2003,7 @@ class Project extends CommonObject
// Process
foreach ($to_del as $del) {
if ($c->fetch($del) > 0) {
- $result=$c->del_type($this, $type_text);
+ $result=$c->del_type($this, $type_categ);
if ($result<0) {
$this->errors=$c->errors;
$this->error=$c->error;
@@ -2016,7 +2013,7 @@ class Project extends CommonObject
}
foreach ($to_add as $add) {
if ($c->fetch($add) > 0) {
- $result=$c->add_type($this, $type_text);
+ $result=$c->add_type($this, $type_categ);
if ($result<0) {
$this->errors=$c->errors;
$this->error=$c->error;
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 0172d67e5c7..bfc6eac906e 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -4037,22 +4037,16 @@ class Societe extends CommonObject
* Existing categories are left untouch.
*
* @param int[]|int $categories Category ID or array of Categories IDs
- * @param string $type Category type ('customer' or 'supplier')
+ * @param string $type_categ Category type ('customer' or 'supplier')
* @return int <0 if KO, >0 if OK
*/
- public function setCategories($categories, $type)
+ public function setCategories($categories, $type_categ)
{
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
// Decode type
- if ($type == 'customer') {
- $type_id = Categorie::TYPE_CUSTOMER;
- $type_text = 'customer';
- } elseif ($type == 'supplier') {
- $type_id = Categorie::TYPE_SUPPLIER;
- $type_text = 'supplier';
- } else {
- dol_syslog(__METHOD__ . ': Type ' . $type . 'is an unknown company category type. Done nothing.', LOG_ERR);
+ if (! in_array($type_categ, array(Categorie::TYPE_CUSTOMER, Categorie::TYPE_SUPPLIER))) {
+ dol_syslog(__METHOD__ . ': Type ' . $type_categ . 'is an unknown company category type. Done nothing.', LOG_ERR);
return -1;
}
@@ -4063,7 +4057,7 @@ class Societe extends CommonObject
// Get current categories
$c = new Categorie($this->db);
- $existing = $c->containing($this->id, $type_id, 'id');
+ $existing = $c->containing($this->id, $type_categ, 'id');
// Diff
if (is_array($existing)) {
@@ -4079,13 +4073,13 @@ class Societe extends CommonObject
// Process
foreach ($to_del as $del) {
if ($c->fetch($del) > 0) {
- $c->del_type($this, $type_text);
+ $c->del_type($this, $type_categ);
}
}
foreach ($to_add as $add) {
if ($c->fetch($add) > 0)
{
- $result = $c->add_type($this, $type_text);
+ $result = $c->add_type($this, $type_categ);
if ($result < 0)
{
$error++;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index ae1d9afa062..03188fb9e3f 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -997,6 +997,8 @@ class User extends CommonObject
*/
public function setCategories($categories)
{
+ $type_categ = Categorie::TYPE_USER;
+
// Handle single category
if (!is_array($categories)) {
$categories = array($categories);
@@ -1005,7 +1007,7 @@ class User extends CommonObject
// Get current categories
require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
$c = new Categorie($this->db);
- $existing = $c->containing($this->id, Categorie::TYPE_USER, 'id');
+ $existing = $c->containing($this->id, $type_categ, 'id');
// Diff
if (is_array($existing)) {
@@ -1019,12 +1021,12 @@ class User extends CommonObject
// Process
foreach ($to_del as $del) {
if ($c->fetch($del) > 0) {
- $c->del_type($this, 'user');
+ $c->del_type($this, $type_categ);
}
}
foreach ($to_add as $add) {
if ($c->fetch($add) > 0) {
- $c->add_type($this, 'user');
+ $c->add_type($this, $type_categ);
}
}
|