From 61c935b8270fd3ce5697a36ab1aa2cb1072540f7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 2 Mar 2026 20:06:19 +0100 Subject: [PATCH 1/2] Debug v23 --- htdocs/commande/card.php | 2 +- htdocs/core/actions_builddoc.inc.php | 2 +- htdocs/langs/en_US/cashdesk.lang | 1 - htdocs/langs/en_US/main.lang | 3 +++ htdocs/langs/en_US/suppliers.lang | 1 - htdocs/theme/eldy/global.inc.php | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 93865df4b5b..054f415dfc7 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -159,7 +159,7 @@ $usercanclose = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !empt $usercanvalidate = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'validate'))); $usercancancel = ((!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $usercancreate) || (getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && $user->hasRight('commande', 'order_advance', 'annuler'))); $usercansend = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'send')); -$usercangeneretedoc = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'generetedoc')); +$usercangeneratedoc = (!getDolGlobalString('MAIN_USE_ADVANCED_PERMS') || $user->hasRight('commande', 'order_advance', 'generetedoc')); $usermustrespectpricemin = ((getDolGlobalString('MAIN_USE_ADVANCED_PERMS') && !$user->hasRight('produit', 'ignore_price_min_advance')) || !getDolGlobalString('MAIN_USE_ADVANCED_PERMS')); $usercancreatepurchaseorder = ($user->hasRight('fournisseur', 'commande', 'creer') || $user->hasRight('supplier_order', 'creer')); diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php index 240d05242fb..9d0b3de0f79 100644 --- a/htdocs/core/actions_builddoc.inc.php +++ b/htdocs/core/actions_builddoc.inc.php @@ -58,7 +58,7 @@ if (!empty($permissioncreate) && empty($permissiontoadd)) { } // Build doc -if ($action == 'builddoc' && ($permissiontoadd || !empty($usercangeneretedoc))) { +if ($action == 'builddoc' && ($permissiontoadd || !empty($usercangeneratedoc))) { if (is_numeric(GETPOST('model', 'alpha'))) { setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Model")), null, 'errors'); } else { diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 6953aa32c96..0c3aff21a17 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -71,7 +71,6 @@ EnableBarOrRestaurantFeatures=Enable features for Bar or Restaurant ConfirmDeletionOfThisPOSSale=Do your confirm the deletion of this current sale ? ConfirmDiscardOfThisPOSSale=Do you want to discard this current sale ? NoClientErrorMessage=Please select a customer first -History=History ValidateAndClose=Validate and close Terminal=Terminal NumberOfTerminals=Number of Terminals diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index f9d1e630464..7d70cb0fac7 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1413,3 +1413,6 @@ Why=Why since=since SignatureID=Signature except=except +DUPLICATA=DUPLICATA +ErrorFailedTriggerCall=Failed to call trigger +History=History diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index 96e98f98df8..087eff8637e 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -5,7 +5,6 @@ SupplierInvoices=Vendor invoices ShowSupplierInvoice=Show Vendor Invoice NewSupplier=New vendor NewSupplierInvoice = New vendor invoice -History=History ListOfSuppliers=List of vendors ShowSupplier=Show vendor BuyingPriceMin=Best buying price diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 5a553bdf592..cd3da9ebd5f 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4228,7 +4228,7 @@ div.popuptab { /* ============================================================================== */ div.tabsAction { - margin: 20px 0em 30px 0em; + margin: 20px 0em 40px 0em; padding: 0em 0em; text-align: right; } From fffbf75d33280472d641e40e4ebae83fd6406ff1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 3 Mar 2026 13:11:03 +0100 Subject: [PATCH 2/2] Fix migration --- htdocs/install/mysql/migration/22.0.0-23.0.0.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/install/mysql/migration/22.0.0-23.0.0.sql b/htdocs/install/mysql/migration/22.0.0-23.0.0.sql index 5059558a70b..39c4ad26c52 100644 --- a/htdocs/install/mysql/migration/22.0.0-23.0.0.sql +++ b/htdocs/install/mysql/migration/22.0.0-23.0.0.sql @@ -319,11 +319,14 @@ ALTER TABLE llx_oauth_token ADD COLUMN tokenstring_refresh text NULL AFTER token ALTER TABLE llx_oauth_token ADD COLUMN expire_at datetime NULL AFTER lastaccess; ALTER TABLE llx_blockedlog ADD COLUMN linktoref text; +ALTER TABLE llx_blockedlog DROP FOREIGN KEY fk_linktoref; ALTER TABLE llx_blockedlog MODIFY COLUMN linktoref text; ALTER TABLE llx_blockedlog ADD COLUMN linktype varchar(16); ALTER TABLE llx_blockedlog ADD COLUMN module_source varchar(32) DEFAULT '' AFTER action; ALTER TABLE llx_blockedlog ADD COLUMN amounts_taxexcl double(24,8) DEFAULT NULL AFTER amounts; +-- VMYSQL4.3 ALTER TABLE llx_blockedlog ADD INDEX idx_linktoref (linktoref(255)); + -- Incoterms 2025 and specific terms -- DAT is replaced by DPU - but not deactivating for existing installations @@ -371,6 +374,8 @@ ALTER TABLE llx_blockedlog ADD INDEX idx_entity_action (entity,action); ALTER TABLE llx_blockedlog DROP COLUMN signature_line; ALTER TABLE llx_blockedlog ADD COLUMN actionrefisunique varchar(16) DEFAULT NULL; +ALTER TABLE llx_blockedlog ADD INDEX idx_ref_object (ref_object); + ALTER TABLE llx_accounting_bookkeeping ADD COLUMN matching_general tinyint DEFAULT 0 NOT NULL AFTER multicurrency_code; ALTER TABLE llx_accounting_bookkeeping_tmp ADD COLUMN matching_general tinyint DEFAULT 0 NOT NULL AFTER multicurrency_code; @@ -394,11 +399,6 @@ CREATE TABLE llx_expensereport_det_extrafields ) ENGINE=innodb; -ALTER TABLE llx_blockedlog ADD INDEX idx_ref_object (ref_object); -ALTER TABLE llx_blockedlog DROP FOREIGN KEY fk_linktoref; --- VMYSQL4.3 ALTER TABLE llx_blockedlog ADD INDEX idx_linktoref (linktoref(255)); - - ALTER TABLE llx_fichinterdet ADD COLUMN special_code integer DEFAULT 0 AFTER fk_parent_line; ALTER TABLE llx_fichinterdet ADD COLUMN product_type integer DEFAULT 0 AFTER special_code;