From 3e2de0d3855e7cd2f370698e07437343e760de2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 10 May 2025 23:55:25 +0200 Subject: [PATCH 1/5] fix input (#34092) --- htdocs/product/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 6f873bd888b..476614ad7da 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1712,7 +1712,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio if (getDolGlobalString('PRODUCT_USE_UNITS')) { print ''.$langs->trans('DefaultUnitToShow').''; print ''; - print $form->selectUnits(GETPOSTISSET('unit') ? GETPOST('unit', 'alpha') : (GETPOST('unit', 'alpha') ?: '0'), 'units'); + print $form->selectUnits(GETPOSTISSET('units') ? GETPOST('units', 'alpha') : (GETPOST('units', 'alpha') ?: '0'), 'units'); print ''; } From a1bb0de6f4297d0c54ca8214dd6f3dea53a6ec9d Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Sun, 11 May 2025 12:13:28 +0200 Subject: [PATCH 2/5] Debug v22 --- htdocs/theme/md/style.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 5339d3b8b0b..eda5ab8557a 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -8626,7 +8626,7 @@ table.jPicker { } div.tmenucenter { - max-width: px; /* size of viewport */ + max-width: px; /* size of viewport */ text-overflow: clip; } .menuhider div.tmenucenter { From b1ea2c38af25d4854dab30a81f3cf52101e3b111 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Sun, 11 May 2025 12:13:29 +0200 Subject: [PATCH 3/5] Debug v22 From a9a2ff560a88472e49dc0343719606a281163765 Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Sun, 11 May 2025 12:26:36 +0200 Subject: [PATCH 4/5] FIX Can set the default value of nature of thirdparty --- htdocs/societe/card.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 20afd8e6ca5..78b29b6c3a3 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -1483,8 +1483,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio break; } - $selectedprospect = (GETPOSTISSET('prospect') ? GETPOSTINT('prospect') : $selectedprospect); - $selectedcustomer = (GETPOSTISSET('customer') ? GETPOSTINT('customer') : $selectedcustomer); + $selectedprospect = ((GETPOSTISSET('prospect') || $action == 'create') ? GETPOSTINT('prospect') : $selectedprospect); + $selectedcustomer = ((GETPOSTISSET('customer') || $action == 'create') ? GETPOSTINT('customer') : $selectedcustomer); + $selectedsupplier = ((GETPOSTISSET('supplier') || $action == 'create') ? GETPOSTINT('supplier') : $object->fournisseur); + print ''; if ($conf->browser->layout != 'phone') { print ''.$form->editfieldkey('', 'customerprospect', '', $object, 0, 'string', '', 0).''; @@ -1502,8 +1504,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio if ((isModEnabled("fournisseur") && $user->hasRight('fournisseur', 'lire') && !getDolGlobalString('MAIN_USE_NEW_SUPPLIERMOD')) || (isModEnabled("supplier_order") && $user->hasRight('supplier_order', 'lire')) || (isModEnabled("supplier_invoice") && $user->hasRight('supplier_invoice', 'lire')) || (isModEnabled('supplier_proposal') && $user->hasRight('supplier_proposal', 'lire'))) { // Supplier - $selected = (GETPOSTISSET('supplier') ? GETPOSTINT('supplier') : $object->fournisseur); - print ''; + print ''; } // Add js to manage the background of nature if ($conf->use_javascript_ajax) { From a11e7db31c6fc4ff643dfd47d9be455be552734d Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Sun, 11 May 2025 12:31:55 +0200 Subject: [PATCH 5/5] FIX Can set default value of the nature of member --- htdocs/adherents/card.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index 3e9335a30d1..adede9add85 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1054,7 +1054,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { $morphys = array(); $morphys["phy"] = $langs->trans("Physical"); $morphys["mor"] = $langs->trans("Moral"); - $checkednature = (GETPOSTISSET("morphy") ? GETPOST("morphy", 'alpha') : $object->morphy); + $checkednature = ((GETPOSTISSET("morphy") || $action == 'create' )? GETPOST("morphy", 'alpha') : $object->morphy); + print ''.$langs->trans("MemberNature")."\n"; print ''; print '';