From 26a462dce0babaa1d3f8fb093281672282c99d45 Mon Sep 17 00:00:00 2001
From: kamel <kamel@kam>
Date: Fri, 18 Mar 2022 15:43:32 +0100
Subject: [PATCH] NEW : Update variants to standard card and list (permission)

---
 htdocs/core/modules/modVariants.class.php        | 14 ++++++++++++++
 htdocs/langs/en_US/admin.lang                    |  3 +++
 htdocs/variants/card.php                         |  8 ++++----
 htdocs/variants/class/ProductAttribute.class.php |  2 +-
 htdocs/variants/list.php                         |  6 +++---
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php
index 049377a561f..ad71d2ca300 100644
--- a/htdocs/core/modules/modVariants.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -109,5 +109,19 @@ class modVariants extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
+		$r = 0;
+
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read objects of ProductAttribute'; // Permission label
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update objects of ProductAttribute'; // Permission label
+		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete objects of ProductAttribute'; // Permission label
+		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$r++;
 	}
 }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index cffd3532c05..0971771e9ca 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -883,6 +883,9 @@ Permission564=Record Debits/Rejections of credit transfer
 Permission601=Read stickers
 Permission602=Create/modify stickers
 Permission609=Delete stickers
+Permission611=Read objects of ProductAttribute
+Permission612=Create/Update objects of ProductAttribute
+Permission613=Delete objects of ProductAttribute
 Permission650=Read Bills of Materials
 Permission651=Create/Update Bills of Materials
 Permission652=Delete Bills of Materials
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 1ee1543b9e4..1a97c2252df 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -58,10 +58,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('productattributecard', 'globalcard'));
 
-$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
-$permissiontoadd = $user->rights->produit->lire || $user->rights->service->lire; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontoedit = $user->rights->produit->lire || $user->rights->service->lire; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->produit->lire || $user->rights->service->lire;
+$permissiontoread = $user->rights->variants->read;
+$permissiontoadd = $user->rights->variants->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoedit = $user->rights->variants->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->variants->delete;
 
 $error = 0;
 
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 94aa87d6031..2a97b44009e 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -1346,7 +1346,7 @@ class ProductAttribute extends CommonObject
 		global $form;
 		global $object_rights, $disableedit, $disablemove, $disableremove; // TODO We should not use global var for this !
 
-		$object_rights = $user->rights->produit->lire || $user->rights->service->lire;
+		$object_rights = $user->rights->variants;
 
 		// Line in view mode
 		if ($action != 'editline' || $selected != $line->id) {
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index 6881b17b781..950db09bb4b 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -131,9 +131,9 @@ $arrayfields['nb_products'] = array(
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
-$permissiontoadd = $user->rights->produit->lire || $user->rights->service->lire;
-$permissiontodelete = $user->rights->produit->lire || $user->rights->service->lire;
+$permissiontoread = $user->rights->variants->read;
+$permissiontoadd = $user->rights->variants->write;
+$permissiontodelete = $user->rights->variants->delete;
 
 // Security check
 if (empty($conf->variants->enabled)) {