From 486d130b3fb4aa168f03017a515539c6d55682f1 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 28 Nov 2022 10:20:08 +0100 Subject: [PATCH 1/5] NEW : HRM module as STABLE --- htdocs/core/modules/modHRM.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php index 09ff03cae9b..3f3dd4b97a1 100644 --- a/htdocs/core/modules/modHRM.class.php +++ b/htdocs/core/modules/modHRM.class.php @@ -56,7 +56,7 @@ class modHRM extends DolibarrModules // Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module) $this->description = "HRM"; // Possible values for version are: 'development', 'experimental', 'dolibarr' or version - $this->version = 'experimental'; + $this->version = 'dolibarr'; // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); // Name of image file used for this module. From d5e80506cc6a627a08ea4eacdb1ca634d3255c1b Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Mon, 28 Nov 2022 10:30:12 +0100 Subject: [PATCH 2/5] NEW : StockTransfer module as STABLE --- htdocs/core/modules/modStockTransfer.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php index 6c8f068adf6..becad7f57e8 100644 --- a/htdocs/core/modules/modStockTransfer.class.php +++ b/htdocs/core/modules/modStockTransfer.class.php @@ -63,7 +63,7 @@ class modStockTransfer extends DolibarrModules // Used only if file README.md and README-LL.md not found. $this->descriptionlong = "StockTransfer description (Long)"; // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z' - $this->version = 'development'; + $this->version = 'dolibarr'; // Url to the file with your last numberversion of this module //$this->url_last_version = 'http://www.example.com/versionmodule.txt'; From fdb89b9c05ecbf4132533640a3fa01919abf3b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 29 Nov 2022 09:54:35 +0100 Subject: [PATCH 3/5] fis warnings --- htdocs/core/tpl/objectline_view.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 03e98e1147d..c0a542479c6 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -234,14 +234,14 @@ if (($line->info_bits & 2) == 2) { } } -if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0 && empty($conf->global->SUPPLIER_HIDE_SUPPLIER_OBJECTLINES)) { +if ($user->hasRight('fournisseur', 'lire') && isset($line->fk_fournprice) && $line->fk_fournprice > 0 && empty($conf->global->SUPPLIER_HIDE_SUPPLIER_OBJECTLINES)) { require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; $productfourn = new ProductFournisseur($this->db); $productfourn->fetch_product_fournisseur_price($line->fk_fournprice); print '
'; print ''.$langs->trans('Supplier').' : '.$productfourn->getSocNomUrl(1, 'supplier').' - '.$langs->trans('Ref').' : '; // Supplier ref - if ($user->rights->produit->creer || $user->rights->service->creer) { // change required right here + if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) { // change required right here print $productfourn->getNomUrl(); } else { print $productfourn->ref_supplier; From 9c64b7baca862681cfdffc5a4aa79e259e83a711 Mon Sep 17 00:00:00 2001 From: atm-steve Date: Tue, 29 Nov 2022 10:01:07 +0100 Subject: [PATCH 4/5] add parameters to getnomurl function to enable and disable alias --- htdocs/commande/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index a093743b072..05cd7d345ea 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -1945,7 +1945,7 @@ if ($resql) { $companystatic->town = $obj->town; $companystatic->country_code = $obj->country_code; if (!isset($getNomUrl_cache[$obj->socid])) { - $getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer'); + $getNomUrl_cache[$obj->socid] = $companystatic->getNomUrl(1, 'customer', 100, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1); } $generic_commande->id = $obj->rowid; From a69f38370df3048fc0ab06048830b746dbd41f3b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 29 Nov 2022 10:39:11 +0100 Subject: [PATCH 5/5] Update modStockTransfer.class.php --- htdocs/core/modules/modStockTransfer.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php index becad7f57e8..279add98bad 100644 --- a/htdocs/core/modules/modStockTransfer.class.php +++ b/htdocs/core/modules/modStockTransfer.class.php @@ -63,7 +63,7 @@ class modStockTransfer extends DolibarrModules // Used only if file README.md and README-LL.md not found. $this->descriptionlong = "StockTransfer description (Long)"; // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z' - $this->version = 'dolibarr'; + $this->version = 'experimental'; // Url to the file with your last numberversion of this module //$this->url_last_version = 'http://www.example.com/versionmodule.txt';