From a6d17f7397ead9356c318cc9361d8ef7a8aa2df3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 15 Oct 2024 16:40:20 +0200 Subject: [PATCH 1/2] add extrafields count in variants setup (#31388) --- htdocs/variants/lib/variants.lib.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/htdocs/variants/lib/variants.lib.php b/htdocs/variants/lib/variants.lib.php index 0f173333c9e..a725d071a01 100644 --- a/htdocs/variants/lib/variants.lib.php +++ b/htdocs/variants/lib/variants.lib.php @@ -61,7 +61,12 @@ function productAttributePrepareHead($object) */ function adminProductAttributePrepareHead() { - global $langs, $conf; + global $langs, $conf, $db; + + $extrafields = new ExtraFields($db); + $extrafields->fetch_name_optionals_label('product_attribute'); + $extrafields->fetch_name_optionals_label('product_attribute_value'); + $langs->load("products"); $h = 0; @@ -74,11 +79,19 @@ function adminProductAttributePrepareHead() $head[$h][0] = DOL_URL_ROOT.'/variants/admin/product_attribute_extrafields.php'; $head[$h][1] = $langs->trans("ProductAttributeExtrafields"); + $nbExtrafields = $extrafields->attributes['product_attribute']['count']; + if ($nbExtrafields > 0) { + $head[$h][1] .= '' . $nbExtrafields . ''; + } $head[$h][2] = 'product_attribute'; $h++; $head[$h][0] = DOL_URL_ROOT.'/variants/admin/product_attribute_value_extrafields.php'; $head[$h][1] = $langs->trans("ProductAttributeValueExtrafields"); + $nbExtrafields = $extrafields->attributes['product_attribute_value']['count']; + if ($nbExtrafields > 0) { + $head[$h][1] .= '' . $nbExtrafields . ''; + } $head[$h][2] = 'product_attribute_value'; $h++; From be50b4910310cfe542d02d4e6883e73cea616a18 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux Date: Tue, 15 Oct 2024 16:41:58 +0200 Subject: [PATCH 2/2] societe: fix warning during tests (#31387) 1) /home/alexandre/workspace/dolibarr/htdocs/societe/class/societe.class.php:1299 Attempt to read property "country_id" on null Triggered by: * BookKeepingTest::testBookKeepingCreate (6 times) /home/alexandre/workspace/dolibarr/test/phpunit/BookKeepingTest.php:53 * SocieteTest::testSocieteCreate (6 times) /home/alexandre/workspace/dolibarr/test/phpunit/SocieteTest.php:87 * SocieteTest::testSocieteFetch (6 times) /home/alexandre/workspace/dolibarr/test/phpunit/SocieteTest.php:114 * SocieteTest::testSocieteMerge (12 times) /home/alexandre/workspace/dolibarr/test/phpunit/SocieteTest.php:450 * SocieteTest::testSocieteUpdate (6 times) /home/alexandre/workspace/dolibarr/test/phpunit/SocieteTest.php:143 --- htdocs/societe/class/societe.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index c1efa366118..26192dc3ce0 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -18,7 +18,7 @@ * Copyright (C) 2019-2024 Frédéric France * Copyright (C) 2020 Open-Dsi * Copyright (C) 2022 ButterflyOfFire - * Copyright (C) 2023 Alexandre Janniaux + * Copyright (C) 2023-2024 Alexandre Janniaux * Copyright (C) 2024 William Mead * Copyright (C) 2024 MDW * @@ -1319,7 +1319,7 @@ class Societe extends CommonObject $vallabel = $this->$keymin; if ($i > 0) { - if ($this->isACompany()) { + if ($mysoc != null && $this->isACompany()) { // Check for mandatory prof id (but only if country is same than ours) if ($mysoc->country_id > 0 && $this->country_id == $mysoc->country_id) { $idprof_mandatory = 'SOCIETE_'.$key.'_MANDATORY';