From 7dd7c8111518cbbe04b87a3da6619c60f0098fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alo=C3=AFs=20Micard?= Date: Fri, 9 Jun 2023 10:04:09 +0200 Subject: [PATCH 1/4] FIX: Deadlock over llx_actioncomm --- htdocs/install/mysql/migration/17.0.0-18.0.0.sql | 6 ++++++ htdocs/install/mysql/tables/llx_actioncomm.key.sql | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql index a2d1267c81e..8e111c22f86 100644 --- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql +++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql @@ -460,3 +460,9 @@ insert into llx_c_invoice_subtype (entity, fk_country, code, label, active) VALU ALTER TABLE llx_partnership ADD COLUMN email_partnership varchar(64) after fk_member; ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_statut (statut); + +-- Drop the composite unique index that exists on `llx_actioncomm` to rebuild a new one without unique feature. +-- The old design introduced a deadlock over traffic intense Dolibarr instance. +-- VMYSQL4.1 DROP INDEX uk_actioncomm_ref on llx_table; +-- VPGSQL8.2 DROP INDEX uk_actioncomm_ref; +ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_ref (ref, entity); diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 944471620ae..34c72373223 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -29,4 +29,4 @@ ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_recurid (recurid); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_ref_ext (ref_ext); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_percent (percent); -ALTER TABLE llx_actioncomm ADD UNIQUE INDEX uk_actioncomm_ref (ref, entity); +ALTER TABLE llx_actioncomm ADD INDEX uk_actioncomm_ref (ref, entity); From 2457dc9a17f9f97d5faf27bd33d752c97c60ace2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alo=C3=AFs=20Micard?= Date: Fri, 9 Jun 2023 10:07:51 +0200 Subject: [PATCH 2/4] Fix index name --- htdocs/install/mysql/tables/llx_actioncomm.key.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql index 34c72373223..3859f90c78d 100644 --- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql +++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql @@ -29,4 +29,4 @@ ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_recurid (recurid); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_ref_ext (ref_ext); ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_percent (percent); -ALTER TABLE llx_actioncomm ADD INDEX uk_actioncomm_ref (ref, entity); +ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_ref (ref, entity); From bda7be03608bc03d2354d2aadd0f927e4ac86c17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alo=C3=AFs=20Micard?= Date: Fri, 9 Jun 2023 10:49:27 +0200 Subject: [PATCH 3/4] Remove quote --- htdocs/install/mysql/migration/17.0.0-18.0.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql index 8e111c22f86..f26e2f80848 100644 --- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql +++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql @@ -461,7 +461,7 @@ ALTER TABLE llx_partnership ADD COLUMN email_partnership varchar(64) after fk_me ALTER TABLE llx_contratdet ADD INDEX idx_contratdet_statut (statut); --- Drop the composite unique index that exists on `llx_actioncomm` to rebuild a new one without unique feature. +-- Drop the composite unique index that exists on llx_actioncomm to rebuild a new one without unique feature. -- The old design introduced a deadlock over traffic intense Dolibarr instance. -- VMYSQL4.1 DROP INDEX uk_actioncomm_ref on llx_table; -- VPGSQL8.2 DROP INDEX uk_actioncomm_ref; From 6e7aab7c817e666c9e6c8cb392a1217ab147d535 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 9 Jun 2023 11:26:28 +0200 Subject: [PATCH 4/4] Fix background of virtual card on dark mode --- htdocs/public/users/view.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/htdocs/public/users/view.php b/htdocs/public/users/view.php index c28175b898d..2df1404ab92 100644 --- a/htdocs/public/users/view.php +++ b/htdocs/public/users/view.php @@ -207,15 +207,25 @@ $arrayofcss = array(); $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '
' : '').'
'; llxHeader($head, $object->getFullName($langs).' - '.$langs->trans("PublicVirtualCard"), '', '', 0, 0, '', '', '', 'onlinepaymentbody'.(GETPOST('mode')=='preview' ? ' scalepreview cursorpointer virtualcardpreview' : ''), $replacemainarea, 1, 1); +print ' + +'; + print ''."\n"; print '
'."\n"; + print '
'."\n"; print ''."\n"; print ''."\n"; print ''."\n"; print ''; print "\n"; -print ''."\n"; // Output html code for logo print '
';