From 0099fbbd2c4276062e14bd6f010781f4092c97c5 Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux Date: Mon, 14 Oct 2024 12:21:59 +0200 Subject: [PATCH 01/72] accountingjournal: add create() method Adding a create method ensure we create the accountingjournal in a uniform way, and allow creating the journals in tests without getting out-of-sync. --- .../class/accountingjournal.class.php | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index 4135e982d14..29eb4086fe1 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -2,6 +2,7 @@ /* Copyright (C) 2017-2022 OpenDSI * Copyright (C) 2024 MDW * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024 Alexandre Janniaux * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -103,6 +104,50 @@ class AccountingJournal extends CommonObject $this->ismultientitymanaged = 0; } + /** + * Create a new Accounting Journal. + * + * @param User $user the user that created the journal, currently unused + * @return int Return integer <0 on error, or the ID of the created object + */ + public function create($user) + { + $valid_nature = array(1, 2, 3, 4, 5, 8, 9); + if (!in_array((int) $this->nature, $valid_nature)) { + $this->error = get_class($this)."::Create Error invalid field nature '" . strval($this->nature) . "'"; + dol_syslog($this->error, LOG_ERR); + return -1; + } + + $sql = "INSERT INTO ".MAIN_DB_PREFIX."accounting_journal"; + $sql .= " (entity, code, label, nature, active)"; + $sql .= " VALUES (" + . ((int) $this->entity) .",'" + . $this->db->escape($this->code) ."','" + . $this->db->escape($this->label) ."'," + . ((int) $this->nature) ."," + . ((int) $this->active) .")"; + + dol_syslog(get_class($this)."::create", LOG_DEBUG); + $resql = $this->db->query($sql); + if (!$resql) { + $this->error = get_class($this)."::Create Error: " . $this->db->lasterror(); + dol_syslog($this->error, LOG_ERR); + return -1; + } + + $id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_journal"); + if ($id <= 0) { + $this->error = get_class($this)."::Create Error " . $id . ": " . $this->db->lasterror(); + dol_syslog($this->error, LOG_ERR); + return -2; + } + + $this->id = $id; + $this->rowid = $id; + return $id; + } + /** * Load an object from database * From 9e00b5ec0ecfd29ba94eff7c5a94a261a180ff7e Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Thu, 28 Nov 2024 12:08:22 +0100 Subject: [PATCH 02/72] FIX output dir --- .../mymodule/doc/pdf_standard_myobject.modules.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php index aa2406f6cc8..90eeab74229 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php @@ -263,18 +263,18 @@ class pdf_standard_myobject extends ModelePDFMyObject */ //if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva; - - if (getMultidirOutput($object)) { + $dir_output = getMultidirOutput($object, $object->module) . '/' . $object->element; + if ($dir_output) { $object->fetch_thirdparty(); $dir = null; // Definition of $dir and $file if ($object->specimen) { - $dir = getMultidirOutput($object); + $dir = $dir_output; $file = $dir."/SPECIMEN.pdf"; } else { $objectref = dol_sanitizeFileName($object->ref); - $dir = getMultidirOutput($object)."/".$objectref; + $dir = $dir_output."/".$objectref; $file = $dir."/".$objectref.".pdf"; } if ($dir === null) { @@ -837,7 +837,7 @@ class pdf_standard_myobject extends ModelePDFMyObject // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps /** - * Return list of active generation modules + * Return list of active generation models * * @param DoliDB $db Database handler * @param int<0,max> $maxfilenamelength Max length of value to show From 98c8a1766689dca350bbfbba7a7162952eace589 Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Tue, 3 Dec 2024 11:56:36 +0100 Subject: [PATCH 03/72] try to fix phpstan error --- .../core/modules/mymodule/doc/pdf_standard_myobject.modules.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php index 90eeab74229..c24df9a986e 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php @@ -264,7 +264,7 @@ class pdf_standard_myobject extends ModelePDFMyObject //if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva; $dir_output = getMultidirOutput($object, $object->module) . '/' . $object->element; - if ($dir_output) { + if (!empty($dir_output)) { $object->fetch_thirdparty(); $dir = null; From 5340f9f8c52c032fe5935e101a85b50b52d4feaa Mon Sep 17 00:00:00 2001 From: Christophe Battarel Date: Thu, 5 Dec 2024 16:47:34 +0100 Subject: [PATCH 04/72] Update pdf_standard_myobject.modules.php --- .../modules/mymodule/doc/pdf_standard_myobject.modules.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php index c24df9a986e..f9f2a2762bf 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php @@ -263,8 +263,10 @@ class pdf_standard_myobject extends ModelePDFMyObject */ //if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva; - $dir_output = getMultidirOutput($object, $object->module) . '/' . $object->element; + $dir_output = getMultidirOutput($object, $object->module); if (!empty($dir_output)) { + $dir_output .= '/' . $object->element; + $object->fetch_thirdparty(); $dir = null; From a1a102b4e4ba92fd1b674cc7aa96c19c87bac5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9=20Cendrier?= Date: Thu, 12 Dec 2024 14:34:49 +0100 Subject: [PATCH 05/72] FIX: $dir cannot be null, commenting wrong test --- .../modules/mymodule/doc/pdf_standard_myobject.modules.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php index 3e9bfac76cf..1f227a8be10 100644 --- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php +++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php @@ -279,9 +279,9 @@ class pdf_standard_myobject extends ModelePDFMyObject $dir = $dir_output."/".$objectref; $file = $dir."/".$objectref.".pdf"; } - if ($dir === null) { - return 0; - } + // if ($dir === null) { + // return 0; + // } if (!file_exists($dir)) { if (dol_mkdir($dir) < 0) { $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir); From 8e427353e08c5ec6f18ce7a7adc948af2cf80f9c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 9 Jan 2025 07:39:24 +0100 Subject: [PATCH 06/72] FIX avoid to show html entities --- htdocs/user/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 7c6ad95a238..1b0b28bbb83 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2063,7 +2063,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; if (!empty($object->api_key)) { print ''; - print showValueWithClipboardCPButton($object->api_key, 1, $langs->trans("Hidden")); // TODO Add an option to also reveal the hash, not only copy paste + print showValueWithClipboardCPButton($object->api_key, 1, $langs->transnoentities("Hidden")); // TODO Add an option to also reveal the hash, not only copy paste print ''; } print ''; From 4934a335b0bed1d8a36c1808c606d119b277a42d Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 9 Jan 2025 10:09:23 +0100 Subject: [PATCH 07/72] FIX use transnoentities to avoid html entities --- htdocs/user/card.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 1b0b28bbb83..b1f82031b6b 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1211,7 +1211,7 @@ if ($action == 'create' || $action == 'adduserldap') { // We do not use a field password but a field text to show new password to use. $valuetoshow .= ($valuetoshow ? ' + '.$langs->trans("DolibarrPassword") : '').''; if (!empty($conf->use_javascript_ajax)) { - $valuetoshow .= img_picto($langs->trans('Generate'), 'refresh', 'id="generate_password" class="linkobject paddingleft"'); + $valuetoshow .= img_picto($langs->transnoentities('Generate'), 'refresh', 'id="generate_password" class="linkobject paddingleft"'); } } } @@ -1235,7 +1235,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; print ''; if (!empty($conf->use_javascript_ajax)) { - print img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject paddingleft"'); + print img_picto($langs->transnoentities('Generate'), 'refresh', 'id="generate_api_key" class="linkobject paddingleft"'); } print ''; } else { @@ -2626,7 +2626,7 @@ if ($action == 'create' || $action == 'adduserldap') { if ($permissiontoeditpasswordandsee) { $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').''; if (!empty($conf->use_javascript_ajax)) { - $valuetoshow .= img_picto((getDolGlobalString('USER_PASSWORD_GENERATED') === 'none' ? $langs->trans('NoPasswordGenerationRuleConfigured') : $langs->trans('Generate')), 'refresh', 'id="generate_password" class="paddingleft'.(getDolGlobalString('USER_PASSWORD_GENERATED') === 'none' ? ' opacitymedium' : ' linkobject').'"'); + $valuetoshow .= img_picto((getDolGlobalString('USER_PASSWORD_GENERATED') === 'none' ? $langs->transnoentities('NoPasswordGenerationRuleConfigured') : $langs->transnoentities('Generate')), 'refresh', 'id="generate_password" class="paddingleft'.(getDolGlobalString('USER_PASSWORD_GENERATED') === 'none' ? ' opacitymedium' : ' linkobject').'"'); } } else { $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass); From 41b07d1630a9707f0cc201f70ef2b06cd98ee40a Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 9 Jan 2025 10:36:48 +0100 Subject: [PATCH 08/72] FIX compatibility with externals modules --- htdocs/user/card.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index b1f82031b6b..9ee8f3d2b91 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1980,7 +1980,7 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; // Date login validity - print ''.$langs->trans("RangeOfLoginValidity").''; + print ''.$langs->trans("RangeOfLoginValidity").''; print ''; if ($object->datestartvalidity) { print ''.$langs->trans("FromDate").' '; @@ -2043,9 +2043,9 @@ if ($action == 'create' || $action == 'adduserldap') { // Other form for user password $parameters = array('valuetoshow' => $valuetoshow, 'caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend); $reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook - if ($reshook > 0) { + if ($reshook === 1) { $valuetoshow = $hookmanager->resPrint; // to replace - } else { + } elseif (empty($reshook)) { $valuetoshow .= $hookmanager->resPrint; // to add } @@ -2057,6 +2057,11 @@ if ($action == 'create' || $action == 'adduserldap') { print ''."\n"; } + // for compatibility with externals modules + if ($reshook > 1) { + print $hookmanager->resPrint; + } + // API key if (isModEnabled('api') && ($user->id == $id || $user->admin || $user->hasRight("api", "apikey", "generate"))) { print ''.$langs->trans("ApiKey").''; From 7618df8726d9564d60b1f70cf28263e9fe1d2f05 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 9 Jan 2025 11:04:32 +0100 Subject: [PATCH 09/72] FIX remove html entities --- htdocs/user/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 9ee8f3d2b91..816cd95db31 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2656,7 +2656,7 @@ if ($action == 'create' || $action == 'adduserldap') { if ($permissiontoeditpasswordandsee || $user->hasRight("api", "apikey", "generate")) { print ''; if (!empty($conf->use_javascript_ajax)) { - print img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject paddingleft"'); + print img_picto($langs->transnoentities('Generate'), 'refresh', 'id="generate_api_key" class="linkobject paddingleft"'); } } print ''; From d37d2c0f2d91f400699fe140ef1528aee80808c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 9 Jan 2025 18:08:40 +0100 Subject: [PATCH 10/72] fix phpstan --- htdocs/public/payment/paymentok.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php index b70871bdf2d..3ddf784f0e1 100644 --- a/htdocs/public/payment/paymentok.php +++ b/htdocs/public/payment/paymentok.php @@ -5,7 +5,7 @@ * Copyright (C) 2021-2023 Waël Almoman * Copyright (C) 2021 Maxime Demarest * Copyright (C) 2021 Dorian Vabre - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -174,6 +174,7 @@ $error = 0; // Check if we have redirtodomain to do. $ws_virtuelhost = null; +$doactionsthenredirect = 0; if ($ws) { $doactionsthenredirect = 1; include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; From 8c6b3291f531a290bd96dd17c36dd35447f669a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 9 Jan 2025 18:10:18 +0100 Subject: [PATCH 11/72] Update paymentko.php --- htdocs/public/payment/paymentko.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php index f8460f8a799..4e3cc764659 100644 --- a/htdocs/public/payment/paymentko.php +++ b/htdocs/public/payment/paymentko.php @@ -2,7 +2,7 @@ /* Copyright (C) 2001-2002 Rodolphe Quiedeville * Copyright (C) 2006-2013 Laurent Destailleur * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -145,6 +145,7 @@ $object = new stdClass(); // For triggers */ // Check if we have redirtodomain to do. +$doactionsthenredirect = 0; if ($ws) { $doactionsthenredirect = 1; } From d1051db8560d495156f1ba63cbc81d908db5afbc Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Thu, 9 Jan 2025 20:16:46 +0100 Subject: [PATCH 12/72] Fix php warning --- htdocs/reception/class/reception.class.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php index 34f3d736857..55072848b4a 100644 --- a/htdocs/reception/class/reception.class.php +++ b/htdocs/reception/class/reception.class.php @@ -827,8 +827,11 @@ class Reception extends CommonObject if ((!getDolGlobalInt('STOCK_SUPPORTS_SERVICES') && $origin_line->product_type > 0) || $origin_line->product_type > 1) { continue; } - - $qty_wished[$origin_line->fk_product] += $origin_line->qty; + if (array_key_exists($origin_line->fk_product, $qty_wished)) { + $qty_wished[$origin_line->fk_product] += $origin_line->qty; + } else { + $qty_wished[$origin_line->fk_product] = $origin_line->qty; + } } // compare array From 3f7d5cf790b9f5d074e02f71bd0301b3d0cff4c1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 10 Jan 2025 00:33:51 +0100 Subject: [PATCH 13/72] NEW add hook 'addMoreInformationsBlock' --- htdocs/user/card.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 816cd95db31..84da0249955 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2088,6 +2088,13 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; print ''; + // Other informations block + $parameters = array('caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend); + $reshook = $hookmanager->executeHooks('addMoreInformationsBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + if ($reshook > 0) { + print $hookmanager->resPrint; + } + print ''; print ''; From 8d11c1625f366601d5708631e2096c6494440c94 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 10 Jan 2025 03:04:55 +0100 Subject: [PATCH 14/72] FIX wrong hook name --- htdocs/user/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 84da0249955..3a5987bf59f 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2088,9 +2088,9 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; print ''; - // Other informations block + // Other informations bloc $parameters = array('caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend); - $reshook = $hookmanager->executeHooks('addMoreInformationsBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('addMoreInformationBloc', $parameters, $object, $action); // Note that $action and $object may have been modified by hook if ($reshook > 0) { print $hookmanager->resPrint; } From f8b957fd0d68a7366e44da455d2f7f5a1f5f5862 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 10 Jan 2025 03:10:01 +0100 Subject: [PATCH 15/72] FIX tu veux ou tu veux pas ? --- htdocs/user/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 3a5987bf59f..7db5b6ba454 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2090,7 +2090,7 @@ if ($action == 'create' || $action == 'adduserldap') { // Other informations bloc $parameters = array('caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend); - $reshook = $hookmanager->executeHooks('addMoreInformationBloc', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('addMoreInformationBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook if ($reshook > 0) { print $hookmanager->resPrint; } From 5ab7e9ec3fdaa634de7e92d72cec94ed423bcbe6 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 10 Jan 2025 03:21:20 +0100 Subject: [PATCH 16/72] FIX use the right hook name --- htdocs/user/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 7db5b6ba454..e2992a25f46 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2088,9 +2088,9 @@ if ($action == 'create' || $action == 'adduserldap') { print ''; print ''; - // Other informations bloc + // Add more object block $parameters = array('caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend); - $reshook = $hookmanager->executeHooks('addMoreInformationBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('addMoreObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook if ($reshook > 0) { print $hookmanager->resPrint; } From ad249cec23c051a7a84f15a4bec5a2fa172e11f4 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 10 Jan 2025 05:26:52 +0100 Subject: [PATCH 17/72] Translate step of accountancy closure --- htdocs/accountancy/closure/index.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php index e40c0606b84..245e8e05d9f 100644 --- a/htdocs/accountancy/closure/index.php +++ b/htdocs/accountancy/closure/index.php @@ -1,6 +1,7 @@ - * Copyright (C) 2024 Frédéric France +/* Copyright (C) 2019-2023 Open-DSI + * Copyright (C) 2024 Frédéric France + * Copyright (C) 2025 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -39,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php'; */ // Load translation files required by the page -$langs->loadLangs(array("compta", "bills", "other", "accountancy")); +$langs->loadLangs(array("accountancy", "bills", "compta", "exports", "other")); $action = GETPOST('action', 'aZ09'); $confirm = GETPOST('confirm', 'aZ09'); @@ -410,7 +411,7 @@ if (empty($current_fiscal_period)) { // Step 2 $head = array(); $head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id']; - $head[0][1] = $langs->trans("Step").(getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '1' : '2').' - '.$langs->trans("AccountancyClosureStep2"); + $head[0][1] = $langs->trans("Step"). ' ' . (getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '1' : '2').' - '.$langs->trans("AccountancyClosureStep2"); $head[0][2] = 'step2'; print dol_get_fiche_head($head, 'step2', '', -1, ''); @@ -433,7 +434,7 @@ if (empty($current_fiscal_period)) { // Step 3 $head = array(); $head[0][0] = DOL_URL_ROOT . '/accountancy/closure/index.php?fiscal_period_id=' . $current_fiscal_period['id']; - $head[0][1] = $langs->trans("Step").(getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '2' : '3').' - '.$langs->trans("AccountancyClosureStep3"); + $head[0][1] = $langs->trans("Step"). ' ' . (getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE") ? '2' : '3').' - '.$langs->trans("AccountancyClosureStep3"); $head[0][2] = 'step3'; print dol_get_fiche_head($head, 'step3', '', -1, ''); From 113360b0f1fe583d1a1ec5ee0c18ec6e147c7de7 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 10 Jan 2025 06:46:26 +0100 Subject: [PATCH 18/72] NEW Loan - Add total on each payment to see the global amount off the reimbursement --- htdocs/loan/card.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index acc4c969e4d..33ba7e40e00 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2014-2025 Alexandre Spangaro * Copyright (C) 2015-2024 Frédéric France * Copyright (C) 2017 Laurent Destailleur * Copyright (C) 2020 Maxime DEMAREST @@ -694,6 +694,7 @@ if ($id > 0) { print ''.$langs->trans("Insurance").''; print ''.$langs->trans("Interest").''; print ''.$langs->trans("LoanCapital").''; + print ''.$langs->trans("Total").''; print ''; $conf->cache['bankaccount'] = array(); @@ -718,6 +719,7 @@ if ($id > 0) { print ''.price($objp->amount_insurance, 0, $outputlangs, 1, -1, -1, $conf->currency)."\n"; print ''.price($objp->amount_interest, 0, $outputlangs, 1, -1, -1, $conf->currency)."\n"; print ''.price($objp->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency)."\n"; + print ''.price($objp->amount_insurance + $objp->amount_interest + $objp->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency)."\n"; print ""; $total_capital += $objp->amount_capital; $i++; @@ -726,15 +728,17 @@ if ($id > 0) { $totalpaid = $total_capital; if ($object->paid == 0 || $object->paid == 2) { - print ''.$langs->trans("AlreadyPaid").' :'.price($totalpaid, 0, $langs, 0, -1, -1, $conf->currency).''; - print ''.$langs->trans("AmountExpected").' :'.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).''; + print ''.$langs->trans("AlreadyPaid").' :'.price($totalpaid, 0, $langs, 0, -1, -1, $conf->currency).' '; + print ''.$langs->trans("AmountExpected").' :'.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).' '; $staytopay = $object->capital - $totalpaid; print ''.$langs->trans("RemainderToPay").' :'; print ''; print price($staytopay, 0, $langs, 0, -1, -1, $conf->currency); - print ''; + print ''; + print ' '; + print ''; } print ""; print ''; From 3854719ee9fa46aff19ef75e5345f98ec0fd2290 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 10 Jan 2025 06:58:51 +0100 Subject: [PATCH 19/72] FIX phpstan --- htdocs/public/payment/paymentko.php | 1 + htdocs/public/payment/paymentok.php | 1 + 2 files changed, 2 insertions(+) diff --git a/htdocs/public/payment/paymentko.php b/htdocs/public/payment/paymentko.php index f8460f8a799..6c63bc291ab 100644 --- a/htdocs/public/payment/paymentko.php +++ b/htdocs/public/payment/paymentko.php @@ -145,6 +145,7 @@ $object = new stdClass(); // For triggers */ // Check if we have redirtodomain to do. +$doactionsthenredirect = 0; if ($ws) { $doactionsthenredirect = 1; } diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php index b70871bdf2d..907d6fc0505 100644 --- a/htdocs/public/payment/paymentok.php +++ b/htdocs/public/payment/paymentok.php @@ -174,6 +174,7 @@ $error = 0; // Check if we have redirtodomain to do. $ws_virtuelhost = null; +$doactionsthenredirect = 0; if ($ws) { $doactionsthenredirect = 1; include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; From 04f3f56978970c50f4fea1fabd5ff49bacd08843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 10 Jan 2025 13:27:58 +0100 Subject: [PATCH 20/72] fix phpstan --- htdocs/public/payment/newpayment.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index fcff7afc7d6..3010abe863e 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -6,8 +6,8 @@ * Copyright (C) 2018-2021 Thibault FOUCART * Copyright (C) 2021 Waël Almoman * Copyright (C) 2021 Dorian Vabre - * Copyright (C) 2024 Frédéric France - * Copyright (C) 2024 MDW + * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -232,7 +232,7 @@ $urlko = $urlwithroot.'/public/payment/paymentko.php?'; if ($ws && !defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { // So defined('USEEXTERNALSERVER') should be set but is not always include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; - $tmpwebsite = new WebSite($db); + $tmpwebsite = new Website($db); $tmpwebsite->fetch(0, $ws); $urlok = $tmpwebsite->virtualhost.'/public/payment/paymentok.php?'; $urlko = $tmpwebsite->virtualhost.'/public/payment/paymentko.php?'; From ca4840dd4a2560c6264551837435c1858bae3374 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 10 Jan 2025 13:59:16 +0100 Subject: [PATCH 21/72] Fix php-stan --- htdocs/public/payment/newpayment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index fcff7afc7d6..78f321ba802 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -232,7 +232,7 @@ $urlko = $urlwithroot.'/public/payment/paymentko.php?'; if ($ws && !defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { // So defined('USEEXTERNALSERVER') should be set but is not always include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; - $tmpwebsite = new WebSite($db); + $tmpwebsite = new Website($db); $tmpwebsite->fetch(0, $ws); $urlok = $tmpwebsite->virtualhost.'/public/payment/paymentok.php?'; $urlko = $tmpwebsite->virtualhost.'/public/payment/paymentko.php?'; From 148deff4ee86f6ece2ecb6da6833708979cd2299 Mon Sep 17 00:00:00 2001 From: Alexandre SPANGARO Date: Fri, 10 Jan 2025 14:02:13 +0100 Subject: [PATCH 22/72] Fix php-stan --- htdocs/public/payment/newpayment.php | 2 +- htdocs/public/payment/paymentok.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index fcff7afc7d6..78f321ba802 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -232,7 +232,7 @@ $urlko = $urlwithroot.'/public/payment/paymentko.php?'; if ($ws && !defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { // So defined('USEEXTERNALSERVER') should be set but is not always include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; - $tmpwebsite = new WebSite($db); + $tmpwebsite = new Website($db); $tmpwebsite->fetch(0, $ws); $urlok = $tmpwebsite->virtualhost.'/public/payment/paymentok.php?'; $urlko = $tmpwebsite->virtualhost.'/public/payment/paymentko.php?'; diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php index b70871bdf2d..907d6fc0505 100644 --- a/htdocs/public/payment/paymentok.php +++ b/htdocs/public/payment/paymentok.php @@ -174,6 +174,7 @@ $error = 0; // Check if we have redirtodomain to do. $ws_virtuelhost = null; +$doactionsthenredirect = 0; if ($ws) { $doactionsthenredirect = 1; include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; From ef4697cba31b703933eb8ac640edd14534fe7369 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 10 Jan 2025 16:54:21 +0100 Subject: [PATCH 23/72] FIX phpstan: wrong case --- htdocs/public/payment/newpayment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php index fcff7afc7d6..78f321ba802 100644 --- a/htdocs/public/payment/newpayment.php +++ b/htdocs/public/payment/newpayment.php @@ -232,7 +232,7 @@ $urlko = $urlwithroot.'/public/payment/paymentko.php?'; if ($ws && !defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { // So defined('USEEXTERNALSERVER') should be set but is not always include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php'; - $tmpwebsite = new WebSite($db); + $tmpwebsite = new Website($db); $tmpwebsite->fetch(0, $ws); $urlok = $tmpwebsite->virtualhost.'/public/payment/paymentok.php?'; $urlko = $tmpwebsite->virtualhost.'/public/payment/paymentko.php?'; From d33e2748f1bd0725712fa7799a089236c950e329 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Fri, 10 Jan 2025 18:24:50 +0100 Subject: [PATCH 24/72] Debug v21 - Fix for pb with different encoding rules --- htdocs/core/class/commonobject.class.php | 1 + htdocs/core/lib/security.lib.php | 72 +++++++++++++++++++----- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 6ee17c17e72..b3586d333c7 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -10361,6 +10361,7 @@ abstract class CommonObject if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass')) { // @phan-suppress-next-line PhanUndeclaredProperty $fieldvalues['pass_crypted'] = dol_hash($this->pass); + // TODO Add value $fieldvalues['pass_encoding'] of encoding; } if (array_key_exists('ref', $fieldvalues)) { $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index f016a3e610d..b83bfb48829 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -237,18 +237,28 @@ function dolDecrypt($chain, $key = '') * @param string $type Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4': for OpenLdap, '5':sha256, '6':password_hash). * Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'. * @param int $nosalt Do not include any salt - * @return string Hash of string + * @param int $mode 0=Return encoded password, 1=Return array with encoding password + encoding algorithm + * @return string|array Hash of string or array with pass_encrypted and pass_encoding * @see getRandomPassword(), dol_verifyHash() */ -function dol_hash($chain, $type = '0', $nosalt = 0) +function dol_hash($chain, $type = '0', $nosalt = 0, $mode = 0) { // No need to add salt for password_hash if (($type == '0' || $type == 'auto') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_hash')) { if (strpos($chain, "\0") !== false) { // String contains a null character that can't be encoded. Return an error instead of fatal error. - return 'Invalid string to encrypt. Contains a null character.'; + if ($mode == 1) { + return array('pass_encrypted' => 'Invalid string to encrypt. Contains a null character', 'pass_encoding' => ''); + } else { + return 'Invalid string to encrypt. Contains a null character.'; + } + } + + if ($mode == 1) { + return array('pass_encrypted' => password_hash($chain, PASSWORD_DEFAULT), 'pass_encoding' => 'password_hash'); + } else { + return password_hash($chain, PASSWORD_DEFAULT); } - return password_hash($chain, PASSWORD_DEFAULT); } // Salt value @@ -257,25 +267,61 @@ function dol_hash($chain, $type = '0', $nosalt = 0) } if ($type == '1' || $type == 'sha1') { - return sha1($chain); + if ($mode == 1) { + return array('pass_encrypted' => sha1($chain), 'pass_encoding' => 'sha1'); + } else { + return sha1($chain); + } } elseif ($type == '2' || $type == 'sha1md5') { - return sha1(md5($chain)); + if ($mode == 1) { + return array('pass_encrypted' => sha1(md5($chain)), 'pass_encoding' => 'sha1md5'); + } else { + return sha1(md5($chain)); + } } elseif ($type == '3' || $type == 'md5') { // For hashing with no need of security - return md5($chain); + if ($mode == 1) { + return array('pass_encrypted' => md5($chain), 'pass_encoding' => 'md5'); + } else { + return md5($chain); + } } elseif ($type == '4' || $type == 'openldap') { - return dolGetLdapPasswordHash($chain, getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5')); + if ($mode == 1) { + return array('pass_encrypted' => dolGetLdapPasswordHash($chain, getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5')), 'pass_encoding' => 'ldappasswordhash'.getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5')); + } else { + return dolGetLdapPasswordHash($chain, getDolGlobalString('LDAP_PASSWORD_HASH_TYPE', 'md5')); + } } elseif ($type == '5' || $type == 'sha256') { - return hash('sha256', $chain); + if ($mode == 1) { + return array('pass_encrypted' => hash('sha256', $chain), 'pass_encoding' => 'sha256'); + } else { + return hash('sha256', $chain); + } } elseif ($type == '6' || $type == 'password_hash') { - return password_hash($chain, PASSWORD_DEFAULT); + if ($mode == 1) { + return array('pass_encrypted' => password_hash($chain, PASSWORD_DEFAULT), 'pass_encoding' => 'password_hash'); + } else { + return password_hash($chain, PASSWORD_DEFAULT); + } } elseif (getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'sha1') { - return sha1($chain); + if ($mode == 1) { + return array('pass_encrypted' => sha1($chain), 'pass_encoding' => 'sha1'); + } else { + return sha1($chain); + } } elseif (getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'sha1md5') { - return sha1(md5($chain)); + if ($mode == 1) { + return array('pass_encrypted' => sha1(md5($chain)), 'pass_encoding' => 'sha1md5'); + } else { + return sha1(md5($chain)); + } } // No particular encoding defined, use default - return md5($chain); + if ($mode == 1) { + return array('pass_encrypted' => md5($chain), 'pass_encoding' => 'md5'); + } else { + return md5($chain); + } } /** From 79808c660b5cfc000f62aea6558563d197ff84ad Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Fri, 10 Jan 2025 18:48:20 +0100 Subject: [PATCH 25/72] Debug v21 - Fix missing the pass_encoding table --- htdocs/core/class/commonobject.class.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index b3586d333c7..9b3e3bcd46c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -10360,8 +10360,12 @@ abstract class CommonObject } if (array_key_exists('pass_crypted', $fieldvalues) && property_exists($this, 'pass')) { // @phan-suppress-next-line PhanUndeclaredProperty - $fieldvalues['pass_crypted'] = dol_hash($this->pass); - // TODO Add value $fieldvalues['pass_encoding'] of encoding; + $tmparray = dol_hash($this->pass, '0', 0, 1); + $fieldvalues['pass_crypted'] = $tmparray['pass_encrypted']; + if (array_key_exists('pass_encoding', $fieldvalues) && property_exists($this, 'pass_encoding')) { + $fieldvalues['pass_encoding'] = $tmparray['pass_encoding']; + } + var_dump($fieldvalues); } if (array_key_exists('ref', $fieldvalues)) { $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data From 6635b063920e2b97d5610df72e99a16ae5714c28 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Fri, 10 Jan 2025 18:49:25 +0100 Subject: [PATCH 26/72] Fix vardump --- htdocs/core/class/commonobject.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 9b3e3bcd46c..e4ab9a505d1 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -10365,7 +10365,6 @@ abstract class CommonObject if (array_key_exists('pass_encoding', $fieldvalues) && property_exists($this, 'pass_encoding')) { $fieldvalues['pass_encoding'] = $tmparray['pass_encoding']; } - var_dump($fieldvalues); } if (array_key_exists('ref', $fieldvalues)) { $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data From 5cca1c1dd62a543e6b0523b719f581aea454947b Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Fri, 10 Jan 2025 19:02:52 +0100 Subject: [PATCH 27/72] Doc --- htdocs/core/lib/security.lib.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index b83bfb48829..82d4c00c9e6 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -234,7 +234,14 @@ function dolDecrypt($chain, $key = '') * If constant MAIN_SECURITY_SALT is defined, we use it as a salt (used only if hashing algorithm is something else than 'password_hash'). * * @param string $chain String to hash - * @param string $type Type of hash ('0':auto will use MAIN_SECURITY_HASH_ALGO else md5, '1':sha1, '2':sha1+md5, '3':md5, '4': for OpenLdap, '5':sha256, '6':password_hash). + * @param string $type Type of hash: + * 'auto' or '0': will use MAIN_SECURITY_HASH_ALGO else md5 + * 'sha1' or '1': sha1 + * 'sha1md5' or '2': sha1md5 + * 'md5' or '3': md5 + * 'openldapxxx' or '4': for OpenLdap + * 'sha256' or '5': sha256 + * 'password_hash' or '6': password_hash * Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'. * @param int $nosalt Do not include any salt * @param int $mode 0=Return encoded password, 1=Return array with encoding password + encoding algorithm @@ -244,7 +251,7 @@ function dolDecrypt($chain, $key = '') function dol_hash($chain, $type = '0', $nosalt = 0, $mode = 0) { // No need to add salt for password_hash - if (($type == '0' || $type == 'auto') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_hash')) { + if (($type == '0' || $type == 'auto') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_hash')) { if (strpos($chain, "\0") !== false) { // String contains a null character that can't be encoded. Return an error instead of fatal error. if ($mode == 1) { @@ -338,7 +345,8 @@ function dol_hash($chain, $type = '0', $nosalt = 0, $mode = 0) */ function dol_verifyHash($chain, $hash, $type = '0') { - if ($type == '0' && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_verify')) { + if ($type == '0' && getDolGlobalString('MAIN_SECURITY_HASH_ALGO') == 'password_hash' && function_exists('password_verify')) { + // Try to autodetect which algo we used if (! empty($hash[0]) && $hash[0] == '$') { return password_verify($chain, $hash); } elseif (dol_strlen($hash) == 32) { From 62c543ef1782c7d26ae91785ddea1e3f75c54eda Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 10 Jan 2025 23:34:45 +0100 Subject: [PATCH 28/72] FIX remove specific hook return --- htdocs/user/card.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/htdocs/user/card.php b/htdocs/user/card.php index e2992a25f46..d535cc0ddc6 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -2043,9 +2043,9 @@ if ($action == 'create' || $action == 'adduserldap') { // Other form for user password $parameters = array('valuetoshow' => $valuetoshow, 'caneditpasswordandsee' => $permissiontoeditpasswordandsee, 'caneditpasswordandsend' => $permissiontoeditpasswordandsend); $reshook = $hookmanager->executeHooks('printUserPasswordField', $parameters, $object, $action); // Note that $action and $object may have been modified by hook - if ($reshook === 1) { + if ($reshook > 0) { $valuetoshow = $hookmanager->resPrint; // to replace - } elseif (empty($reshook)) { + } else { $valuetoshow .= $hookmanager->resPrint; // to add } @@ -2057,11 +2057,6 @@ if ($action == 'create' || $action == 'adduserldap') { print ''."\n"; } - // for compatibility with externals modules - if ($reshook > 1) { - print $hookmanager->resPrint; - } - // API key if (isModEnabled('api') && ($user->id == $id || $user->admin || $user->hasRight("api", "apikey", "generate"))) { print ''.$langs->trans("ApiKey").''; From 714df27e95dc63d1a3b5feb0aea4b45a058c63fb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Jan 2025 00:05:58 +0100 Subject: [PATCH 29/72] Debug v21 --- htdocs/commande/list.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 4797d6635db..cf144d8d151 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -2704,7 +2704,7 @@ while ($i < $imaxinloop) { // Date creation if (!empty($arrayfields['c.datec']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser'); print ''; if (!$i) { @@ -2714,7 +2714,7 @@ while ($i < $imaxinloop) { // Date modification if (!empty($arrayfields['c.tms']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_modification), 'dayhour', 'tzuser'); print ''; if (!$i) { @@ -2724,7 +2724,7 @@ while ($i < $imaxinloop) { // Date cloture if (!empty($arrayfields['c.date_cloture']['checked'])) { - print ''; + print ''; print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser'); print ''; if (!$i) { From 2e0950da3d354727d5a3324150540efb41985b4f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Jan 2025 00:30:05 +0100 Subject: [PATCH 30/72] Fix setup of const --- htdocs/core/modules/DolibarrModules.class.php | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index 93a4121f9a4..b440a0bd1bc 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -1876,34 +1876,39 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it $val = ''; } - $sql = "SELECT count(*) as nb"; - $sql .= " FROM ".MAIN_DB_PREFIX."const"; - $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'"; - $sql .= " AND entity = ".((int) $entity); + if (!empty($name)) { + $sql = "SELECT count(*) as nb"; + $sql .= " FROM ".MAIN_DB_PREFIX."const"; + $sql .= " WHERE ".$this->db->decrypt('name')." = '".$this->db->escape($name)."'"; + $sql .= " AND entity = ".((int) $entity); - $result = $this->db->query($sql); - if ($result) { - $row = $this->db->fetch_row($result); + $result = $this->db->query($sql); + if ($result) { + $row = $this->db->fetch_row($result); - if ($row[0] == 0) { // If not found - $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)"; - $sql .= " VALUES ("; - $sql .= $this->db->encrypt($name); - $sql .= ",'".$this->db->escape($type)."'"; - $sql .= ",".(($val != '') ? $this->db->encrypt($val) : "''"); - $sql .= ",".($note ? "'".$this->db->escape($note)."'" : "null"); - $sql .= ",'".$this->db->escape($visible)."'"; - $sql .= ",".$entity; - $sql .= ")"; + if ($row[0] == 0) { // If not found + $sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name, type, value, note, visible, entity)"; + $sql .= " VALUES ("; + $sql .= $this->db->encrypt($name); + $sql .= ", '".$this->db->escape($type)."'"; + $sql .= ", ".(($val != '') ? $this->db->encrypt($val) : "''"); + $sql .= ", ".($note ? "'".$this->db->escape($note)."'" : "null"); + $sql .= ", '".$this->db->escape($visible)."'"; + $sql .= ", ".((int) $entity); + $sql .= ")"; - if (!$this->db->query($sql)) { - $err++; + if (!$this->db->query($sql)) { + $err++; + } else { + // Set also the variable in running environment + $conf->global->$name = $val; + } + } else { + dol_syslog(__METHOD__." constant '".$name."' already exists", LOG_DEBUG); } } else { - dol_syslog(__METHOD__." constant '".$name."' already exists", LOG_DEBUG); + $err++; } - } else { - $err++; } } From fa16f56b32b1ce6a134a082654fbdf217a4b8d38 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Jan 2025 02:00:17 +0100 Subject: [PATCH 31/72] Fix warning phpstan --- htdocs/core/lib/security.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 82d4c00c9e6..6a0e5de24da 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -245,7 +245,7 @@ function dolDecrypt($chain, $key = '') * Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'. * @param int $nosalt Do not include any salt * @param int $mode 0=Return encoded password, 1=Return array with encoding password + encoding algorithm - * @return string|array Hash of string or array with pass_encrypted and pass_encoding + * @return string|array Hash of string or array with pass_encrypted and pass_encoding * @see getRandomPassword(), dol_verifyHash() */ function dol_hash($chain, $type = '0', $nosalt = 0, $mode = 0) From a355dbb6606869b3bb545ddafd610ee00c8c9c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Sat, 11 Jan 2025 09:04:55 +0100 Subject: [PATCH 32/72] fix phpstan --- dev/build/phpstan/phpstan-baseline.neon | 18 --------- dev/tools/phan/baseline.txt | 2 +- htdocs/core/modules/modProduct.class.php | 48 ++++++++++++------------ 3 files changed, 26 insertions(+), 42 deletions(-) diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index c06023c7b89..358d3b26b80 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -13848,24 +13848,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/modPrelevement.class.php - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 1 - path: ../../../htdocs/core/modules/modProduct.class.php - - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 1 - path: ../../../htdocs/core/modules/modProduct.class.php - - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 2 - path: ../../../htdocs/core/modules/modProduct.class.php - - message: '#^Property DolibarrModules\:\:\$import_convertvalue_array \(array\\>\) does not accept non\-empty\-array\\>\.$#' identifier: assign.propertyType diff --git a/dev/tools/phan/baseline.txt b/dev/tools/phan/baseline.txt index 65d97c5a1e7..598f3de73fe 100644 --- a/dev/tools/phan/baseline.txt +++ b/dev/tools/phan/baseline.txt @@ -188,7 +188,7 @@ return [ 'htdocs/core/modules/facture/doc/pdf_sponge.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchProperty', 'PhanUndeclaredProperty'], 'htdocs/core/modules/facture/modules_facture.php' => ['PhanPluginUnknownPropertyType'], 'htdocs/core/modules/fichinter/mod_pacific.php' => ['PhanPossiblyUndeclaredVariable'], - 'htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php' => ['PhanPluginUnknownPropertyType', 'PhanUndeclaredProperty'], + 'htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php' => ['PhanUndeclaredProperty'], 'htdocs/core/modules/hrm/mod_evaluation_advanced.php' => ['PhanUndeclaredProperty'], 'htdocs/core/modules/import/import_csv.modules.php' => ['PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchProperty'], 'htdocs/core/modules/import/import_xlsx.modules.php' => ['PhanTypeMismatchProperty'], diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index a2de9b27688..86cf51eb430 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -8,7 +8,8 @@ * Copyright (C) 2014 Christophe Battarel * Copyright (C) 2014 Cedric Gross * Copyright (C) 2020-2021 Alexandre Spangaro - * Copyright (C) 2024 MDW + * Copyright (C) 2024 MDW + * Copyright (C) 2025 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -78,29 +79,30 @@ class modProduct extends DolibarrModules $this->langfiles = array("products", "companies", "stocks", "bills"); // Constants - $this->const = array(); - $r = 0; + $this->const = [ + [ + "PRODUCT_CODEPRODUCT_ADDON", + "chaine", + "mod_codeproduct_leopard", + 'Module to control product codes', + 0, + ], + [ - $this->const[$r][0] = "PRODUCT_CODEPRODUCT_ADDON"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "mod_codeproduct_leopard"; - $this->const[$r][3] = 'Module to control product codes'; - $this->const[$r][4] = 0; - $r++; - - $this->const[$r][0] = "PRODUCT_PRICE_UNIQ"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "1"; - $this->const[$r][3] = 'pricing rule by default'; - $this->const[$r][4] = 0; - $r++; - - /*$this->const[$r][0] = "PRODUCT_ADDON_PDF"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "standard"; - $this->const[$r][3] = 'Default module for document generation'; - $this->const[$r][4] = 0; - $r++;*/ + "PRODUCT_PRICE_UNIQ", + "chaine", + "1", + 'pricing rule by default', + 0, + ], + /*[ + "PRODUCT_ADDON_PDF", + "chaine", + "standard", + 'Default module for document generation', + 0, + ],*/ + ]; // Boxes $this->boxes = array( From 714aa5b52920ca2308437f33ee03e10f1b01ad19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Sat, 11 Jan 2025 09:14:43 +0100 Subject: [PATCH 33/72] fix phpstan --- dev/build/phpstan/phpstan-baseline.neon | 18 -------- htdocs/core/modules/modProduct.class.php | 28 +++++++----- htdocs/core/modules/modProductBatch.class.php | 45 +++++++++---------- 3 files changed, 40 insertions(+), 51 deletions(-) diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index 358d3b26b80..9c9fbf33bfd 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -13872,24 +13872,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/modProduct.class.php - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 1 - path: ../../../htdocs/core/modules/modProductBatch.class.php - - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 1 - path: ../../../htdocs/core/modules/modProductBatch.class.php - - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 2 - path: ../../../htdocs/core/modules/modProductBatch.class.php - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' identifier: assign.propertyType diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 86cf51eb430..8984086d664 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -165,17 +165,25 @@ class modProduct extends DolibarrModules $this->menu = 1; // This module adds menu entries. They are coded into menu manager. /* We can't enable this here because it must be enabled in both product and service module and this creates duplicate inserts $r=0; - $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode - 'type'=>'left', // This is a Left menu entry - 'titre'=>'ProductVatMassChange', - 'url'=>'/product/admin/product_tools.php?mainmenu=home&leftmenu=admintools', - 'langs'=>'products', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. - 'position'=>300, - 'enabled'=>'isModEnabled("product") && preg_match(\'/^(admintools|all)/\',$leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. - 'perms'=>'1', // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules - 'target'=>'', - 'user'=>0); // 0=Menu for internal users, 1=external users, 2=both + $this->menu[$r] = array( + // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode + 'fk_menu' => 'fk_mainmenu=home,fk_leftmenu=admintools', + // This is a Left menu entry + 'type' => 'left', + 'titre' => 'ProductVatMassChange', + 'url' => '/product/admin/product_tools.php?mainmenu=home&leftmenu=admintools', + // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory. + 'langs' => 'products', + 'position' => 300, + // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected. + 'enabled' => 'isModEnabled("product") && preg_match(\'/^(admintools|all)/\',$leftmenu)', + // Use 'perms'=>'$user->hasRight("mymodule","level1","level2")' if you want your menu with a permission rules + 'perms' => '1', + 'target' => '', + // 0=Menu for internal users, 1=external users, 2=both + 'user' => 0 $r++; + ); */ $usenpr = 0; diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php index b0c6a41ea8b..e64ffe6c7c4 100644 --- a/htdocs/core/modules/modProductBatch.class.php +++ b/htdocs/core/modules/modProductBatch.class.php @@ -1,9 +1,10 @@ - * Copyright (C) 2004-2012 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2013-2014 Cedric GROSS - * Copyright (C) 2024 MDW +/* Copyright (C) 2003 Rodolphe Quiedeville + * Copyright (C) 2004-2012 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2013-2014 Cedric GROSS + * Copyright (C) 2024 MDW + * Copyright (C) 2025 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -74,27 +75,25 @@ class modProductBatch extends DolibarrModules $this->requiredby = array(); // List of module ids to disable if this one is disabled $this->conflictwith = array(); // List of module class names as string this module is in conflict with $this->phpmin = array(7, 0); // Minimum version of PHP required by module - $this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module $this->langfiles = array("productbatch"); // Constants - // Constants - $this->const = array(); - $r = 0; - - $this->const[$r][0] = "PRODUCTBATCH_LOT_ADDON"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "mod_lot_free"; - $this->const[$r][3] = 'Module to control lot number'; - $this->const[$r][4] = 0; - $r++; - - $this->const[$r][0] = "PRODUCTBATCH_SN_ADDON"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "mod_sn_free"; - $this->const[$r][3] = 'Module to control serial number'; - $this->const[$r][4] = 0; - $r++; + $this->const = [ + [ + "PRODUCTBATCH_LOT_ADDON", + "chaine", + "mod_lot_free", + "Module to control lot number", + 0, + ], + [ + "PRODUCTBATCH_SN_ADDON", + "chaine", + "mod_sn_free", + "Module to control serial number", + 0, + ], + ]; $this->tabs = array(); From 6d845eefa1aca98c1d35fe1bfb992bbd6bcc38fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Sat, 11 Jan 2025 09:16:13 +0100 Subject: [PATCH 34/72] fix phpstan --- htdocs/core/modules/modProduct.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 8984086d664..7b87d30b1f4 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -164,7 +164,7 @@ class modProduct extends DolibarrModules $this->menu = 1; // This module adds menu entries. They are coded into menu manager. /* We can't enable this here because it must be enabled in both product and service module and this creates duplicate inserts - $r=0; + $r = 0; $this->menu[$r] = array( // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode 'fk_menu' => 'fk_mainmenu=home,fk_leftmenu=admintools', @@ -182,8 +182,8 @@ class modProduct extends DolibarrModules 'target' => '', // 0=Menu for internal users, 1=external users, 2=both 'user' => 0 - $r++; ); + $r++; */ $usenpr = 0; From 44bfbb7f4a58d0c2b5a5ee1afaecfd508aeac6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Sat, 11 Jan 2025 09:24:21 +0100 Subject: [PATCH 35/72] fix phpstan --- dev/build/phpstan/phpstan-baseline.neon | 42 --------- htdocs/core/modules/modProjet.class.php | 120 ++++++++++++------------ 2 files changed, 60 insertions(+), 102 deletions(-) diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index 9c9fbf33bfd..656834fd772 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -13872,48 +13872,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/modProduct.class.php - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 1 - path: ../../../htdocs/core/modules/modProjet.class.php - - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 1 - path: ../../../htdocs/core/modules/modProjet.class.php - - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 1 - path: ../../../htdocs/core/modules/modProjet.class.php - - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 1 - path: ../../../htdocs/core/modules/modProjet.class.php - - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 2 - path: ../../../htdocs/core/modules/modProjet.class.php - - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 1 - path: ../../../htdocs/core/modules/modProjet.class.php - - - - message: '#^Property DolibarrModules\:\:\$const \(array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\) does not accept non\-empty\-array\, 5\?\: string, 6\?\: int\<0, 1\>\}\>\.$#' - identifier: assign.propertyType - count: 7 - path: ../../../htdocs/core/modules/modProjet.class.php - - message: '#^Property DolibarrModules\:\:\$import_convertvalue_array \(array\\>\) does not accept non\-empty\-array\\>\.$#' identifier: assign.propertyType diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index 77247881f2a..3019a0f590d 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -1,13 +1,13 @@ - * Copyright (C) 2004-2014 Laurent Destailleur - * Copyright (C) 2004 Sebastien Di Cintio - * Copyright (C) 2004 Benoit Mortier - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2013 Florian Henry - * Copyright (C) 2014 Charles-Fr BENKE - * Copyright (C) 2023 Gauthier VERDOL - * Copyright (C) 2024 Frédéric France +/* Copyright (C) 2003-2005 Rodolphe Quiedeville + * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2004 Sebastien Di Cintio + * Copyright (C) 2004 Benoit Mortier + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2013 Florian Henry + * Copyright (C) 2014 Charles-Fr BENKE + * Copyright (C) 2023 Gauthier VERDOL + * Copyright (C) 2024-2025 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -74,57 +74,57 @@ class modProjet extends DolibarrModules $this->langfiles = array('projects'); // Constants - $this->const = array(); - $r = 0; - - $this->const[$r][0] = "PROJECT_ADDON_PDF"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "baleine"; - $this->const[$r][3] = 'Name of PDF/ODT project manager class'; - $this->const[$r][4] = 0; - $r++; - - $this->const[$r][0] = "PROJECT_ADDON"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "mod_project_simple"; - $this->const[$r][3] = 'Name of Numbering Rule project manager class'; - $this->const[$r][4] = 0; - $r++; - - $this->const[$r][0] = "PROJECT_ADDON_PDF_ODT_PATH"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/projects"; - $this->const[$r][3] = ""; - $this->const[$r][4] = 0; - $r++; - - $this->const[$r][0] = "PROJECT_TASK_ADDON_PDF"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = ""; - $this->const[$r][3] = 'Name of PDF/ODT tasks manager class'; - $this->const[$r][4] = 0; - $r++; - - $this->const[$r][0] = "PROJECT_TASK_ADDON"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "mod_task_simple"; - $this->const[$r][3] = 'Name of Numbering Rule task manager class'; - $this->const[$r][4] = 0; - $r++; - - $this->const[$r][0] = "PROJECT_TASK_ADDON_PDF_ODT_PATH"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/tasks"; - $this->const[$r][3] = ""; - $this->const[$r][4] = 0; - $r++; - - $this->const[$r][0] = "PROJECT_USE_OPPORTUNITIES"; - $this->const[$r][1] = "chaine"; - $this->const[$r][2] = "1"; - $this->const[$r][3] = ""; - $this->const[$r][4] = 0; - $r++; + $this->const = [ + [ + "PROJECT_ADDON_PDF", + "chaine", + "baleine", + "Name of PDF/ODT project manager class", + 0, + ], + [ + "PROJECT_ADDON", + "chaine", + "mod_project_simple", + "Name of Numbering Rule project manager class", + 0, + ], + [ + "PROJECT_ADDON_PDF_ODT_PATH", + "chaine", + "DOL_DATA_ROOT/doctemplates/projects", + "", + 0, + ], + [ + "PROJECT_TASK_ADDON_PDF", + "chaine", + "", + "Name of PDF/ODT tasks manager class", + 0, + ], + [ + "PROJECT_TASK_ADDON", + "chaine", + "mod_task_simple", + "Name of Numbering Rule task manager class", + 0, + ], + [ + "PROJECT_TASK_ADDON_PDF_ODT_PATH", + "chaine", + "DOL_DATA_ROOT/doctemplates/tasks", + "", + 0, + ], + [ + "PROJECT_USE_OPPORTUNITIES", + "chaine", + "1", + "", + 0, + ], + ]; // Boxes $this->boxes = array( From 1652b5b17862daa83a2b7750184e7e7ae1aa1a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Sat, 11 Jan 2025 09:53:00 +0100 Subject: [PATCH 36/72] fix phpstan --- dev/build/phpstan/phpstan-baseline.neon | 138 ------------------ .../core/modules/asset/mod_asset_standard.php | 7 +- htdocs/core/modules/bom/mod_bom_standard.php | 5 +- .../modules/cheque/mod_chequereceipt_mint.php | 5 +- .../modules/commande/mod_commande_marbre.php | 5 +- .../modules/delivery/mod_delivery_jade.php | 5 +- .../expedition/mod_expedition_safor.php | 5 +- .../expensereport/mod_expensereport_jade.php | 5 +- htdocs/core/modules/fichinter/mod_pacific.php | 5 +- .../modules/hrm/mod_evaluation_standard.php | 5 +- htdocs/core/modules/mrp/mod_mo_standard.php | 5 +- .../modules/payment/mod_payment_cicada.php | 4 + .../product_batch/mod_lot_standard.php | 5 +- .../modules/product_batch/mod_sn_standard.php | 5 +- .../modules/project/mod_project_simple.php | 5 +- .../modules/project/task/mod_task_simple.php | 5 +- .../modules/propale/mod_propale_marbre.php | 5 +- .../mod_stocktransfer_standard.php | 5 +- .../mod_commande_fournisseur_muguet.php | 5 +- .../mod_supplier_payment_bronan.php | 5 +- .../mod_supplier_proposal_marbre.php | 5 +- .../core/modules/ticket/mod_ticket_simple.php | 5 +- .../workstation/mod_workstation_standard.php | 5 +- .../partnership/mod_partnership_standard.php | 4 + 24 files changed, 93 insertions(+), 160 deletions(-) diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index 656834fd772..8b899bab9aa 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -12162,12 +12162,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php - - - message: '#^Property mod_asset_standard\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/asset/mod_asset_standard.php - - message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#' identifier: function.alreadyNarrowedType @@ -12276,24 +12270,12 @@ parameters: count: 1 path: ../../../htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php - - - message: '#^Property mod_bom_standard\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/bom/mod_bom_standard.php - - message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#' identifier: function.alreadyNarrowedType count: 1 path: ../../../htdocs/core/modules/cheque/doc/pdf_blochet.class.php - - - message: '#^Property mod_chequereceipt_mint\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/cheque/mod_chequereceipt_mint.php - - message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\, Commande given\.$#' identifier: argument.type @@ -12486,12 +12468,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php - - - message: '#^Property mod_commande_marbre\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/commande/mod_commande_marbre.php - - message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\, Contrat given\.$#' identifier: argument.type @@ -12630,12 +12606,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/delivery/doc/pdf_typhon.modules.php - - - message: '#^Property mod_delivery_jade\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/delivery/mod_delivery_jade.php - - message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#' identifier: function.alreadyNarrowedType @@ -12792,12 +12762,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/expedition/doc/pdf_rouget.modules.php - - - message: '#^Property mod_expedition_safor\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/expedition/mod_expedition_safor.php - - message: '#^Parameter \#3 \$posy of method pdf_standard_expensereport\:\:tablePayments\(\) expects int, float given\.$#' identifier: argument.type @@ -12852,12 +12816,6 @@ parameters: count: 6 path: ../../../htdocs/core/modules/expensereport/doc/pdf_standard_expensereport.modules.php - - - message: '#^Property mod_expensereport_jade\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/expensereport/mod_expensereport_jade.php - - message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\, Facture given\.$#' identifier: argument.type @@ -13344,12 +13302,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php - - - message: '#^Property mod_pacific\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/fichinter/mod_pacific.php - - message: '#^Variable \$max might not be defined\.$#' identifier: variable.undefined @@ -13374,12 +13326,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php - - - message: '#^Property mod_evaluation_standard\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/hrm/mod_evaluation_standard.php - - message: '#^Call to function is_array\(\) with non\-empty\-list\ will always evaluate to true\.$#' identifier: function.alreadyNarrowedType @@ -14286,12 +14232,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/mrp/doc/pdf_vinci.modules.php - - - message: '#^Property mod_mo_standard\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/mrp/mod_mo_standard.php - - message: '#^Negated boolean expression is always true\.$#' identifier: booleanNot.alwaysTrue @@ -14310,12 +14250,6 @@ parameters: count: 2 path: ../../../htdocs/core/modules/oauth/stripelive_oauthcallback.php - - - message: '#^Property mod_payment_cicada\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/payment/mod_payment_cicada.php - - message: '#^Variable \$response might not be defined\.$#' identifier: variable.undefined @@ -14424,18 +14358,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/product/modules_product.class.php - - - message: '#^Property mod_lot_standard\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/product_batch/mod_lot_standard.php - - - - message: '#^Property mod_sn_standard\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/product_batch/mod_sn_standard.php - - message: '#^Call to function is_array\(\) with array will always evaluate to true\.$#' identifier: function.alreadyNarrowedType @@ -14508,12 +14430,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/project/doc/pdf_timespent.modules.php - - - message: '#^Property mod_project_simple\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/project/mod_project_simple.php - - message: '#^Call to function is_array\(\) with array will always evaluate to true\.$#' identifier: function.alreadyNarrowedType @@ -14556,12 +14472,6 @@ parameters: count: 2 path: ../../../htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php - - - message: '#^Property mod_task_simple\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/project/task/mod_task_simple.php - - message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\, Propal given\.$#' identifier: argument.type @@ -14748,12 +14658,6 @@ parameters: count: 2 path: ../../../htdocs/core/modules/propale/doc/pdf_cyan.modules.php - - - message: '#^Property mod_propale_marbre\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/propale/mod_propale_marbre.php - - message: '#^Call to function is_object\(\) with object will always evaluate to true\.$#' identifier: function.alreadyNarrowedType @@ -15042,12 +14946,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php - - - message: '#^Property mod_stocktransfer_standard\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php - - message: '#^Parameter \#1 \$object of method CommonDocGenerator\:\:get_substitutionarray_each_var_object\(\) expects array\, FactureFournisseur given\.$#' identifier: argument.type @@ -15312,12 +15210,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php - - - message: '#^Property mod_commande_fournisseur_muguet\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php - - message: '#^Variable \$max might not be defined\.$#' identifier: variable.undefined @@ -15366,12 +15258,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/supplier_payment/doc/pdf_standard_supplierpayment.modules.php - - - message: '#^Property mod_supplier_payment_bronan\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php - - message: '#^Parameter \#1 \$line of method CommonDocGenerator\:\:get_substitutionarray_lines\(\) expects CommonObjectLine, CommonObject\|stdClass given\.$#' identifier: argument.type @@ -15522,24 +15408,12 @@ parameters: count: 1 path: ../../../htdocs/core/modules/supplier_proposal/doc/pdf_zenith.modules.php - - - message: '#^Property mod_supplier_proposal_marbre\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php - - message: '#^Variable \$contactobject might not be defined\.$#' identifier: variable.undefined count: 1 path: ../../../htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php - - - message: '#^Property mod_ticket_simple\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/ticket/mod_ticket_simple.php - - message: '#^Variable \$contactobject might not be defined\.$#' identifier: variable.undefined @@ -15576,12 +15450,6 @@ parameters: count: 1 path: ../../../htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php - - - message: '#^Property mod_workstation_standard\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/core/modules/workstation/mod_workstation_standard.php - - message: '#^Negated boolean expression is always false\.$#' identifier: booleanNot.alwaysFalse @@ -24144,12 +24012,6 @@ parameters: count: 2 path: ../../../htdocs/partnership/class/partnershiputils.class.php - - - message: '#^Property mod_partnership_standard\:\:\$prefix has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/partnership/core/modules/partnership/mod_partnership_standard.php - - message: '#^If condition is always false\.$#' identifier: if.alwaysFalse diff --git a/htdocs/core/modules/asset/mod_asset_standard.php b/htdocs/core/modules/asset/mod_asset_standard.php index d3db8afc832..04e924a1c45 100644 --- a/htdocs/core/modules/asset/mod_asset_standard.php +++ b/htdocs/core/modules/asset/mod_asset_standard.php @@ -1,8 +1,8 @@ * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2022-2024 Frédéric France - * Copyright (C) 2022 Frédéric France + * Copyright (C) 2022-2025 Frédéric France + * Copyright (C) 2022-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -39,6 +39,9 @@ class mod_asset_standard extends ModeleNumRefAsset */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'ASSET'; /** diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php index e4d93ed4014..d4c75c1068d 100644 --- a/htdocs/core/modules/bom/mod_bom_standard.php +++ b/htdocs/core/modules/bom/mod_bom_standard.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -37,6 +37,9 @@ class mod_bom_standard extends ModeleNumRefBoms */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'BOM'; /** diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php index be85808b48d..7facfcedfbb 100644 --- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php +++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -37,6 +37,9 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'CHK'; /** diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php index 348f0839022..34ad5e13b4c 100644 --- a/htdocs/core/modules/commande/mod_commande_marbre.php +++ b/htdocs/core/modules/commande/mod_commande_marbre.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -37,6 +37,9 @@ class mod_commande_marbre extends ModeleNumRefCommandes */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'CO'; /** diff --git a/htdocs/core/modules/delivery/mod_delivery_jade.php b/htdocs/core/modules/delivery/mod_delivery_jade.php index 37e6112b81c..50cd56bda13 100644 --- a/htdocs/core/modules/delivery/mod_delivery_jade.php +++ b/htdocs/core/modules/delivery/mod_delivery_jade.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -59,6 +59,9 @@ class mod_delivery_jade extends ModeleNumRefDeliveryOrder */ public $name = 'Jade'; + /** + * @var string prefix + */ public $prefix = 'BL'; diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php index 55f109e47d5..6ddd5231a67 100644 --- a/htdocs/core/modules/expedition/mod_expedition_safor.php +++ b/htdocs/core/modules/expedition/mod_expedition_safor.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -36,6 +36,9 @@ class mod_expedition_safor extends ModelNumRefExpedition */ public $version = 'dolibarr'; + /** + * @var string prefix + */ public $prefix = 'SH'; /** diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php index 60600810b1f..886f671a9cf 100644 --- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php +++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -36,6 +36,9 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'ER'; /** diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php index 15ee3e339b3..f6eaa326c75 100644 --- a/htdocs/core/modules/fichinter/mod_pacific.php +++ b/htdocs/core/modules/fichinter/mod_pacific.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005-2008 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2013 Juanjo Menent - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -38,6 +38,9 @@ class mod_pacific extends ModeleNumRefFicheinter */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'FI'; /** diff --git a/htdocs/core/modules/hrm/mod_evaluation_standard.php b/htdocs/core/modules/hrm/mod_evaluation_standard.php index 56555a4b8f7..70a65e99913 100644 --- a/htdocs/core/modules/hrm/mod_evaluation_standard.php +++ b/htdocs/core/modules/hrm/mod_evaluation_standard.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -38,6 +38,9 @@ class mod_evaluation_standard extends ModeleNumRefEvaluation */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'EVAL'; /** diff --git a/htdocs/core/modules/mrp/mod_mo_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php index 599ceef2c0d..039ec18eb61 100644 --- a/htdocs/core/modules/mrp/mod_mo_standard.php +++ b/htdocs/core/modules/mrp/mod_mo_standard.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -37,6 +37,9 @@ class mod_mo_standard extends ModeleNumRefMos */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'MO'; /** diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php index e8dfe7810a4..e9e3a414949 100644 --- a/htdocs/core/modules/payment/mod_payment_cicada.php +++ b/htdocs/core/modules/payment/mod_payment_cicada.php @@ -1,6 +1,7 @@ * Copyright (C) 2024 MDW + * Copyright (C) 2025 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -36,6 +37,9 @@ class mod_payment_cicada extends ModeleNumRefPayments */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'PAY'; /** diff --git a/htdocs/core/modules/product_batch/mod_lot_standard.php b/htdocs/core/modules/product_batch/mod_lot_standard.php index b3f8f9d99c2..209a811120c 100644 --- a/htdocs/core/modules/product_batch/mod_lot_standard.php +++ b/htdocs/core/modules/product_batch/mod_lot_standard.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2021 Christophe Battarel - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -38,6 +38,9 @@ class mod_lot_standard extends ModeleNumRefBatch */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'LOT'; /** diff --git a/htdocs/core/modules/product_batch/mod_sn_standard.php b/htdocs/core/modules/product_batch/mod_sn_standard.php index 4c4ab482bc0..b59e77a3e94 100644 --- a/htdocs/core/modules/product_batch/mod_sn_standard.php +++ b/htdocs/core/modules/product_batch/mod_sn_standard.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2021 Christophe Battarel - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -38,6 +38,9 @@ class mod_sn_standard extends ModeleNumRefBatch */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'SN'; /** diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php index 5319b83156e..d6ad1781294 100644 --- a/htdocs/core/modules/project/mod_project_simple.php +++ b/htdocs/core/modules/project/mod_project_simple.php @@ -1,7 +1,7 @@ * Copyright (C) 2010 Laurent Destailleur - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -39,6 +39,9 @@ class mod_project_simple extends ModeleNumRefProjects */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'PJ'; /** diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php index ed85363c7af..3647b6104fa 100644 --- a/htdocs/core/modules/project/task/mod_task_simple.php +++ b/htdocs/core/modules/project/task/mod_task_simple.php @@ -1,7 +1,7 @@ * Copyright (C) 2010 Laurent Destailleur - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -39,6 +39,9 @@ class mod_task_simple extends ModeleNumRefTask */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'TK'; /** diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php index b6396ca96a0..4d2042dfa40 100644 --- a/htdocs/core/modules/propale/mod_propale_marbre.php +++ b/htdocs/core/modules/propale/mod_propale_marbre.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -39,6 +39,9 @@ class mod_propale_marbre extends ModeleNumRefPropales */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'PR'; /** diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php index 2df9df5bbc5..e2f2335cb82 100644 --- a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php +++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2021 Gauthier VERDOL - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -39,6 +39,9 @@ class mod_stocktransfer_standard extends ModeleNumRefStockTransfer */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'ST'; /** diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php index 2e5efa815f1..1599ca8e222 100644 --- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php +++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -56,6 +56,9 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders */ public $name = 'Muguet'; + /** + * @var string prefix + */ public $prefix = 'PO'; // PO for "Purchase Order" diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php index 98a512c4246..8d9192cc6ff 100644 --- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php +++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -37,6 +37,9 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'SPAY'; /** diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php index 4c4c2486a29..ca34cc22b9f 100644 --- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php +++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -39,6 +39,9 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'RQ'; // RQ = Request for quotation /** diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php index 59db009125f..576da3eff83 100644 --- a/htdocs/core/modules/ticket/mod_ticket_simple.php +++ b/htdocs/core/modules/ticket/mod_ticket_simple.php @@ -1,7 +1,7 @@ * Copyright (C) 2010 Laurent Destailleur - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -38,6 +38,9 @@ class mod_ticket_simple extends ModeleNumRefTicket */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'TS'; /** diff --git a/htdocs/core/modules/workstation/mod_workstation_standard.php b/htdocs/core/modules/workstation/mod_workstation_standard.php index e8f51af201c..7950cd488f2 100644 --- a/htdocs/core/modules/workstation/mod_workstation_standard.php +++ b/htdocs/core/modules/workstation/mod_workstation_standard.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2020 Gauthier VERDOL - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -38,6 +38,9 @@ class mod_workstation_standard extends ModeleNumRefWorkstation */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'WKSTATION'; /** diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php b/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php index 710fbc60d38..90c84a2909f 100644 --- a/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php +++ b/htdocs/partnership/core/modules/partnership/mod_partnership_standard.php @@ -2,6 +2,7 @@ /* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2024 MDW + * Copyright (C) 2025 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,6 +38,9 @@ class mod_partnership_standard extends ModeleNumRefPartnership */ public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * @var string prefix + */ public $prefix = 'PSHIP'; /** From c28f5ba1be8c8097776d26af134160fb7dd85627 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Sat, 11 Jan 2025 09:58:01 +0100 Subject: [PATCH 37/72] fix phpstan --- htdocs/core/modules/asset/mod_asset_standard.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/modules/asset/mod_asset_standard.php b/htdocs/core/modules/asset/mod_asset_standard.php index 04e924a1c45..9e6f8e128ea 100644 --- a/htdocs/core/modules/asset/mod_asset_standard.php +++ b/htdocs/core/modules/asset/mod_asset_standard.php @@ -2,7 +2,6 @@ /* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2022-2025 Frédéric France - * Copyright (C) 2022-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify From b4babd6fcb4ea851b15f243a858eb82836ce36ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Sat, 11 Jan 2025 10:46:57 +0100 Subject: [PATCH 38/72] fix phpstan --- dev/build/phpstan/phpstan-baseline.neon | 16 ++-------------- htdocs/ecm/dir_card.php | 3 ++- htdocs/product/price.php | 16 ++++++++-------- htdocs/product/reassortlot.php | 5 +++-- 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index 8b899bab9aa..a82935c45fc 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -16903,8 +16903,8 @@ parameters: path: ../../../htdocs/ecm/dir_add_card.php - - message: '#^Variable \$extrafields might not be defined\.$#' - identifier: variable.undefined + message: '#^Parameter \#1 \$object of function ecm_prepare_head expects EcmDirectory, CommonObject given\.$#' + identifier: argument.type count: 1 path: ../../../htdocs/ecm/dir_card.php @@ -24918,12 +24918,6 @@ parameters: count: 8 path: ../../../htdocs/product/price.php - - - message: '#^Variable \$db might not be defined\.$#' - identifier: variable.undefined - count: 1 - path: ../../../htdocs/product/price.php - - message: '#^Variable \$extrafield_values might not be defined\.$#' identifier: variable.undefined @@ -25026,12 +25020,6 @@ parameters: count: 1 path: ../../../htdocs/product/reassortlot.php - - - message: '#^Variable \$extrafields might not be defined\.$#' - identifier: variable.undefined - count: 2 - path: ../../../htdocs/product/reassortlot.php - - message: '#^Variable \$type might not be defined\.$#' identifier: variable.undefined diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php index b81fe141b32..fcfff57f74a 100644 --- a/htdocs/ecm/dir_card.php +++ b/htdocs/ecm/dir_card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/htmlecm.form.class.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 2ca40d0bad0..c0d130de0db 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -11,7 +11,7 @@ * Copyright (C) 2015-2023 Alexandre Spangaro * Copyright (C) 2015 Marcos García * Copyright (C) 2016 Ferran Marcet - * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2018-2025 Frédéric France * Copyright (C) 2018 Nicolas ZABOURI * Copyright (C) 2024 MDW * Copyright (C) 2024 Mélina Joum @@ -45,13 +45,6 @@ require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_expression.cl require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; -$prodcustprice = null; -if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) { - require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php'; - - $prodcustprice = new ProductCustomerPrice($db); -} - /** * @var Conf $conf * @var DoliDB $db @@ -61,6 +54,13 @@ if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT * @var User $user */ +$prodcustprice = null; +if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES') || getDolGlobalString('PRODUIT_CUSTOMER_PRICES_AND_MULTIPRICES')) { + require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php'; + + $prodcustprice = new ProductCustomerPrice($db); +} + // Load translation files required by the page $langs->loadLangs(array('products', 'bills', 'companies', 'other')); diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php index 7093fedc7b4..d2f3caf3442 100644 --- a/htdocs/product/reassortlot.php +++ b/htdocs/product/reassortlot.php @@ -7,7 +7,7 @@ * Copyright (C) 2016 Ferran Marcet * Copyright (C) 2019 Juanjo Menent * Copyright (C) 2021 Noé Cendrier - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,6 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php'; /** * @var Conf $conf * @var DoliDB $db + * @var ExtraFields $extrafields * @var HookManager $hookmanager * @var Translate $langs * @var User $user @@ -54,7 +55,7 @@ $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choi $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print') -$mode = GETPOST('mode', 'aZ'); +$mode = GETPOST('mode', 'aZ'); $sref = GETPOST("sref", 'alpha'); $snom = GETPOST("snom", 'alpha'); From b0b02794ee5df988347faed59e2bc3ebfdcdb89a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 11 Jan 2025 11:55:12 +0100 Subject: [PATCH 39/72] fix phpstan and phan --- htdocs/core/lib/security.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php index 6a0e5de24da..b5ed5542749 100644 --- a/htdocs/core/lib/security.lib.php +++ b/htdocs/core/lib/security.lib.php @@ -245,7 +245,7 @@ function dolDecrypt($chain, $key = '') * Use 'md5' if hash is not needed for security purpose. For security need, prefer 'auto'. * @param int $nosalt Do not include any salt * @param int $mode 0=Return encoded password, 1=Return array with encoding password + encoding algorithm - * @return string|array Hash of string or array with pass_encrypted and pass_encoding + * @return string|array{pass_encrypted:string,pass_encoding:string} Hash of string or array with pass_encrypted and pass_encoding * @see getRandomPassword(), dol_verifyHash() */ function dol_hash($chain, $type = '0', $nosalt = 0, $mode = 0) From 22a5a1566bfaaf72020d52ebd39a2f3b5f8248e2 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sat, 11 Jan 2025 12:29:24 +0100 Subject: [PATCH 40/72] Debug v21 --- htdocs/langs/en_US/website.lang | 3 +++ htdocs/website/websiteaccount_card.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index 01949332498..9ad0baadeac 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -359,3 +359,6 @@ LoginCheckout=Login & Proceed to checkout paymentSuccessProcessed=Your payment has been successfully processed. youWillBeRedirectedToOrderPage=You will be redirected to the order details page shortly. WebPortalSetupNotComplete=Web portal setup is not complete +DeleteWebsiteaccount=Delete website account +ConfirmDeleteWebsiteAccount=Are you sure you want to delete this account. +ConfirmDeleteWebsiteAccount2=If this account was used to login on the public portal or any otherweb site powered by Dolibarr, the login may be no more possible. diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php index 846b1e57d44..b0b00dcb2e3 100644 --- a/htdocs/website/websiteaccount_card.php +++ b/htdocs/website/websiteaccount_card.php @@ -300,7 +300,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // Confirmation to delete if ($action == 'delete') { - $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsiteAccount'), $langs->trans('ConfirmDeleteWebsiteAccount'), 'confirm_delete', '', 0, 1); + $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsiteAccount'), $langs->trans('ConfirmDeleteWebsiteAccount').'
'.$langs->trans('ConfirmDeleteWebsiteAccount2'), 'confirm_delete', '', 0, 1); } // Call Hook formConfirm From 62aa865982479a3afe2e9d4d9e04b1df4f635ba1 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sat, 11 Jan 2025 13:00:58 +0100 Subject: [PATCH 41/72] Trans --- htdocs/langs/en_US/website.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index 9ad0baadeac..63725bae5cc 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -257,6 +257,7 @@ logOutFromYourCustomerAccount=Log out from your customer account filteredByVersion=Filtered by version removeFilter=Remove filter viewMyCart=View my shopping cart +Shipping=Shipping freeShipping=Free shipping! noProducts=No products nbrItemsInCart=There are 0 items in your cart. From 0a47582428f2ac9ea8951094234b458bfe69c4b6 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sat, 11 Jan 2025 14:14:05 +0100 Subject: [PATCH 42/72] Fix lang after html in website pages --- htdocs/core/lib/website2.lib.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php index adb2cec459a..80d6d7a735d 100644 --- a/htdocs/core/lib/website2.lib.php +++ b/htdocs/core/lib/website2.lib.php @@ -164,6 +164,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage, $shortlangcode = substr($objectpage->lang, 0, 2); // en_US or en-US -> en } if (empty($shortlangcode)) { + // Take the language of website $shortlangcode = substr($object->lang, 0, 2); // en_US or en-US -> en } @@ -186,7 +187,8 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage, if (getDolGlobalString('WEBSITE_FORCE_DOCTYPE_HTML5')) { $tplcontent .= "\n"; } - $tplcontent .= ''."\n"; + // If a language was forced on page, we use it, else we use the lang of visitor else the lang of web site + $tplcontent .= 'lang ? ' lang="'.substr($objectpage->lang, 0, 2).'"' : 'shortlang ? \' lang="\'.$weblangs->shortlang.\'"\' : \'\' ?>').'>'."\n"; $tplcontent .= ''."\n"; $tplcontent .= ''.dol_string_nohtmltag($objectpage->title, 0, 'UTF-8').''."\n"; $tplcontent .= ''."\n"; From 915e6c863202fdc82d804c905796a0554b06ecba Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sat, 11 Jan 2025 14:53:29 +0100 Subject: [PATCH 43/72] Add missing data and escape html --- dev/tools/codespell/codespell-lines-ignore.txt | 1 + htdocs/opensurvey/results.php | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev/tools/codespell/codespell-lines-ignore.txt b/dev/tools/codespell/codespell-lines-ignore.txt index b7cfa4033c0..687afec36f4 100644 --- a/dev/tools/codespell/codespell-lines-ignore.txt +++ b/dev/tools/codespell/codespell-lines-ignore.txt @@ -174,3 +174,4 @@ print ''.$langs->trans("NbOfMembers").' format == "D") { $sumfor = array(); $sumagainst = array(); $compteur = 0; -$sql = "SELECT id_users, nom as name, id_sondage, reponses"; +$sql = "SELECT id_users, nom as name, id_sondage, reponses, tms, date_creation"; $sql .= " FROM ".MAIN_DB_PREFIX."opensurvey_user_studs"; $sql .= " WHERE id_sondage = '".$db->escape($numsondage)."'"; dol_syslog('sql='.$sql); @@ -850,7 +850,10 @@ while ($compteur < $num) { } // Name - print ''.dol_htmlentities($obj->name).''."\n"; + $tooltip = $obj->name.'
'.$langs->trans("DateCreation").': '.dol_print_date($obj->date_creation, 'dayhour'); + print ''; + print dolPrintHTML($obj->name); + print ''."\n"; // si la ligne n'est pas a changer, on affiche les données if (!$testligneamodifier) { From da7675c822e236da6cd7bc06ee24e9e5e2beca65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20France?= Date: Sat, 11 Jan 2025 17:45:29 +0100 Subject: [PATCH 44/72] fix phpstan --- dev/build/phpstan/phpstan-baseline.neon | 18 ------------------ htdocs/includes/odtphp/Segment.php | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index a82935c45fc..4e98d2d655e 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -21108,12 +21108,6 @@ parameters: count: 1 path: ../../../htdocs/includes/odtphp/Segment.php - - - message: '#^Property Segment\:\:\$name has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/includes/odtphp/Segment.php - - message: '#^Property Segment\:\:\$odf has no type specified\.$#' identifier: missingType.property @@ -21126,18 +21120,6 @@ parameters: count: 1 path: ../../../htdocs/includes/odtphp/Segment.php - - - message: '#^Property Segment\:\:\$xml has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/includes/odtphp/Segment.php - - - - message: '#^Property Segment\:\:\$xmlParsed has no type specified\.$#' - identifier: missingType.property - count: 1 - path: ../../../htdocs/includes/odtphp/Segment.php - - message: '#^Class SegmentIterator implements generic interface RecursiveIterator but does not specify its types\: TKey, TValue$#' identifier: missingType.generics diff --git a/htdocs/includes/odtphp/Segment.php b/htdocs/includes/odtphp/Segment.php index 3e8675c65a9..95b1c75d35c 100644 --- a/htdocs/includes/odtphp/Segment.php +++ b/htdocs/includes/odtphp/Segment.php @@ -16,8 +16,24 @@ class SegmentException extends Exception */ class Segment implements IteratorAggregate, Countable { + /** + * @var string + */ protected $xml; + + /** + * @var string + */ + protected $savxml; + + /** + * @var string + */ protected $xmlParsed = ''; + + /** + * @var string + */ protected $name; protected $children = array(); protected $vars = array(); @@ -30,7 +46,7 @@ class Segment implements IteratorAggregate, Countable * * @param string $name name of the segment to construct * @param string $xml XML tree of the segment - * @param string $odf odf + * @param Odf $odf odf */ public function __construct($name, $xml, $odf) { From 013687b6dad96f8d4af88e768630c7171160a05e Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 03:20:22 +0100 Subject: [PATCH 45/72] Update logo --- htdocs/theme/dolibarr_preferred_partner.png | Bin 8381 -> 48313 bytes htdocs/theme/dolistore_logo.jpg | Bin 14843 -> 30976 bytes htdocs/theme/dolistore_logo.png | Bin 9666 -> 28538 bytes htdocs/theme/dolistore_logo.svg | 213 ++++++++------------ 4 files changed, 80 insertions(+), 133 deletions(-) diff --git a/htdocs/theme/dolibarr_preferred_partner.png b/htdocs/theme/dolibarr_preferred_partner.png index f0826b26e70921c661fec02fe46bda7b25fe2e9b..1ffb119adfb21ec0b74d1c73c8306498b4a60fb0 100644 GIT binary patch literal 48313 zcmZ6z2|SeR`#=6jrKFKlq9WzUmZDUau~sTOA<9}rvP2j=BZ-g-S+cgEkbNE7ND;C` z$TF7DSjHB{&i{HweSYWrpV#XgdY*f^?rV8p+dUp@s9oO8c#si6kll(`E?z|tMt20E z7v8ZQp6p3j@P{8e?XFyRK#;So=znxfM=v-d$Pq;GqP(_CEQM5dmBW&7k`lvOe|cqx zi3C~DEce}-}J>y`$Idk ztU}q6gCPs+)eV)e(x<{xPtSTKSPW9B=U`_YUp&yu5^qdO})6mi*ps4gD;CAh7#wi*|Dz3ViYWHozWQqccSA7*;yS+SJbK zbe@r&KUJ#`TKql%9f0&i=J26EeI0Q**$D;xO9Z>{n&qgWGrV53t)};GZpBoMQq(07 z@2_}H+5CF8cXAxHn4fbiIv2mLNkxB2Tp)y!?L*66%g6UkSt=*Yw#cKekrC$G>gZ25 ztMkX2GCfu9r_b#~|1I~Lg8r0aRxKJ@%4b%@d~jw!pGTehGk%a_HmDFqc_FkD zmQVS!zuxZ61>$wYZ0=_|hCJ3>q{)Mw#j1x6wskod82_2Va~*hO&DMxML5Pe|G{zBg zHRdROpfDarFaEG=aFbnG_XFe0exIsUK2D;|cw{x`z0tSf{Br2_=n;`4385bM4ptYg zcczTjJG6?zl2J?wO-9Sla351X(lm*P*sM-%tZeL8M3>$>yV5dMaWdfKq?d!IYdI=C zrZ2z^`_RH9hiO&DO)aEPqU@}iK2@u_u#%Ry?OV*`?fd*Nvdj)u$|1v1j@9OSAi9#I z3-A;{rbX)FMNT^Jy}+hiA?ORzo~AUaoipNHdgF+h9Oip6i5lRVf ztn~FzJB<}5IIS_GB#0n&@x-SdUm`6NgLrg1BFPC#+hLJJV;HX%Rw@wZdwD5pXt?s* z2P;o>JU)J9Kxsxi{A=Uo1nP&If>2?jyx&e-rfTLka-we&Q^KWv%8T?@yzD`;{D**D_$dk0 zR0==)e1p>`InlHqSu=ftZD!jrS}|%<4PA{89&U=cpA8EXIpA_;P6x)D7Q7e|skQ&R z>1Q)_lO2=EUX7W;O__`qaJZ;+unL8q%LhxEEK}Tj!~bY38?XD83t3Y0vksv_d3$Ar z>#9KlQ6Vt)`abCt6VVB?rnQ_?D5;2^c@Ce5Ss5-{SX~Jhx*9qZnQH5$?Cwi?2~GelE~+YnkE|6a`q_d$=%df z?B!k3)e&RUA$?^e!>bWL;2WDFPMMro^dUEFw=7Lr5Wi^3&gsv;^O^>E*ibF6yR-%A zcTXj_J_kJDm}>_Zm`!Ury4_Z+)_io&+()m_pq8U3+mK|H&b|Ga1)-(N_iwZ{NY%b) zodS!VJ6*fda&+WFU)WbAe|GU!j^f#6(9+Mq3i{`?d476>m}$=##oo7uGctug;b>8T zwtg$1#Urf4#^@0IgK%lONekiHl~mjPIwTh&ust|#{BU`J@g|@X!@(4!zNYb1Tyt{J zYHRQs6@h6@7dyi;%f@)iX~wRB&*38uS|4*wL7h?X6V}O9{6FY0MD8fSy80X1!w#EQ3(1&%b&)75xH(4o5_EV0>BD}mLl%y0a=kZ<^h4d40Qx6HMwb+t{VfJplxoJ;q$eA3f#ZIrezqV7|64{Ma%t$4G{?aS~RzakK!5SQ`d0mbF zsD_-d=O(Hk$RdPe_|c^#AQ07QxhW4pPP}}v;D4BrY?+xFla^`=z6h3_dz8bs0Dg6x z42B8Jc>?T8w&JV(A4l9O-(H#=H~mWzNLIu~UlB|hG#-v0DEj{S3PIq{`gdVA@TWXA zW(|#d@UK;5f(o>{jHD^L*l}|2ekQ&8q}@*m-orgAtpEWEiFbX{5>qd0kMfT{vsNv^DOB} zGL#kk;k8L19Jc6b9FLd|sZ^T>aup8wB{yZ$~!tV$1EPJ-^n{IVQFX1>}qyIbY5p7z`&Jd4@ zDwI=yPYJ;p(Uis^7XkO*`L2JDk_^waXh+%Mw3p+? z%#9?0xmo}4V%0iinL}*vDf!b@Ko=nArl5?ia)!L@`H<--$3A=TptKJdD-z#oq$9RM zi!ar2@WRR>6}Sy{@e~kjx~G>$Ru(4*snL``{>~A(X_7=X;7NLwB?=1YR`Ekwj!1j; zpA*MJ;Az5nE=-7~Fh!UUTj9`EBS{9U|LyFJGMiw{8?Ea!OG_{MzlA6>^mne2{w#s! zU?y?6Py<>xDAfo8C00?5#>50j>b83Hi|#xt~zZE_NXlptDIW7H?B)E z^vxgT&7v7IQz&rKbFKjOx0@rh{$-U}A)Ef6M9)PW__Tc22=(kBCA`1ZA|n_MXf1-n9ZssY8R(CeYz;i{(@xmq%8D*o0a z$S5{9mu926%A+Y1w8b9(_P+ID#dK{D{so!Y#Q*q%CgP92NJ4zg{@9j#7#G^dc=0F4hUqsbnV)!|Jmi|(P3p!Y$4lX2Q1##H|r_%#d5I4??P*qDaGQtJoY##ElxiIiWap%pOL)_JcwumeJ65%egNS*bA-G*Of7?Ho&h)p1ED zJk@Ttknh(z7@+|seAcEDAf_YkwMjN4%N#!ho4Kf==iv#0L|}raMiJL)#2oy2N>NR9 zh9;(deMp2%n2dCsa`kCyze<>&Tv03tTRlCffgt6Hc!5@$iUYvH)MjnWuuag3R4ty;Fm!tAM9?%L9rYiJP2Fmj9P2g%)S5EuRcFcjcDA9B6 zGPuZTreA+zW_U_W1?M1gNneLVp(!qHAd-fMq%;XDLc+`W|KMoL{^k>ta zbfDoD>WXL|d<{BL5PZu2?}<_LBn=GUF>w#1Dk8^f{&TDgv?s~5A|pCcL>vfJ0l53S z3NpP1ee&c_x($z+0zoOX9RIphctWc|YR#qoQQFO^{W2((se}Kad-I9(pZpt!v2OuZ zB~yw}Gur$t9zdU17pBIr{fAMgXBN2~qqylHXe04lD29zu|8w5WCk3?loCeP5!1BwG z{H5Rj%az0$pz28H`#+vapBtY;0&8@4Y9qV_SRAdlmtF^Y#jJ=a2NjD>Mp#-FR=UjmO9FHtc%^tRC1O$I`Iiz5Qikc z-Ii8(CfcFIy`d#S(mBx2jnLpB;Mcphd~Qkkz?@)h18GWi8{`p>`VSr2AOEuzN+fMf z8)wnQ%ON)K1N!^kp72`z-16jm$LyRBh{d3^@Au>3r~&x(Tid}76ObU{~fG9zfevv*VeKd=Q93FdA% z?{#<%g{VIMCVu?Ku?aBOk5yZX5+?BXms&$ zVG?~hF>Pvfy>FwN@Lu1KjNRvj+6^PPcBYc z&}p={IMYR0y;eRq;5nC4!5J3{3FX9P_!?`80>`-$L!_o`xcI$tNVWP~+d^ zpX46LTgc&o+o20d7n=3GpVl%HU4$ZKW%-J~ME*{(62MQ5#GkN9@tpQrSjm22er|Ty zyVZET&?%|8r1n*iNAw=IVbQIL!IQJ28As05FY-Bj?Drh>#8PWx)xi|@F6hk6-tM~9 z?X^0v(;1?(PMlI?w&pZP+3-*DJxea_#(F5;AtU(>9@kgaGfEE!W zMYqc4+?uqmy?p|+$G|BwCU0Bw=Nn;kDsp1k4iUn~P9>-}n=0?cT4+){&fHe-?<43a z_*?3hO{JXh44L5Jm8!N?Suop5IF##e3C$t1SSYs`L6PXCaI4G*K2!;^J4m3WCRZZ@ zMRQ${4LxTq`Hi(;8_R!240meN?d$g`Uk+|D#mA4=#pNbNo~0ZI@93c=wr17K>KkJE z`%r5Egjm~CSNl!u$0arze=M@RzL*S-N_N?bfAH7ya|L-gD+-q2p zmGF`?-P}UnaFar)U(_Md02YWxdQ?}XK8*e1o|yms+L{Ny zqVI;t2K`jw>QO~J!+1z%Mis(keIAd=q)<(jIhig2o-bYfN-g(<3LLS_ku9voP{2%V zB2V4>is-Rx#iBbPE=Vccfx8;G0;P^~wGcF~M-P1uL@U1TohsO98z@9PUAq5FO@Lt} zZjx?QC{Xl*o!FW~@v5tsW|t?{Bs^k!)YqR5jN5O%@3)+8ehI#YxrLM-n_@Uq&XuH| zY${t9Kli<5Zg_1`G`gn5{mPPisA-rb0MVq)apU$<>=lN&2Mp71>~+^YAci74er}3d z-pLfZGhRgMoHErnhj020)PHAfb)L^ps#HQaD%>OWN*$D}F)}no*7y1gUB%wxo}gb+ zb-(2av`V(!VUzRwq%KeOX(gczkG|ix$5JfVprhZiX0ns6r1ml=BKUPo5qs~Nr#&I?#uvssi36VJ1d&g zu`fGF<8eRvnk|%D5$TQxK2SuBpn9$l?DmyIu`B(e^MK2b7cykad*&a1@Vj3P59Raw zv)r{%X9z0YQ&N<~iCRu!->4;#wRd>DPtaNq!i*MMc%dq{7WH$dZ}u6_1@UATYD5lS z)>Ytxn4&o;^_god_icmN8?Sa8Q+GQ*3JF#J%(<}AhDiEZr39j{)7}W`pv+NOs$?yA zYMGQcs;ir)tCx=WUJ(|<>y#|_QAQ%-*z|eTu1_@H(RRumKO;2$ zdPq^7^g?C>!dF)9>BDNMw8C5XrZ4acW#7Uo z_8ya%i0_v8v^)J_4m;D+g^4UQkR>iUSs5AgE`6}ur{_n4@>(WD6537EpyB0y`Vfi9im%5)i23q!q=)@J3uK|B#dU4mI?t^OCCl+uEVRXlaJPV@vj zKC|4ytq&7k8&AC9n9|~0awsCj-r>OjLAeD!9ewt0dFEr(h<51?nO zvQ8??xZ#*KkADtzk9HE52bY3+-47*q?`5c#n=Z`br$)ES^n4n!WZ$ZPtVXeOuU?5Q z_fMf(*hHJy=UVp{ zh0FNJj>_cPhOYi|Or8CqZQ77dcknQ0|#_IDq|RTz9bNQYu;lDQsT7~RX8 zuD|BNdcn?QkM)aK%x(3=B8d8e@~pC1We)t)y3gfVQqV2qjOf=um5T@<^E8jM|0rY^ zbd#Cx(_XPd#)?$N8lM`ylb({zyZ`O@U|qO;VEfxc+D@$c$M_&C8}UOMOL=}x%zkf( zo()P2ChP>wrIUfLoEA*(SD@J)`{Soc^jSD)6hV^*N-Xs)H}PEKf%amSQ@cMllQ>7p z?Y)_+Ei485S9q{Vvxsa***)Qw@_Qew6LtW-V*6wcL~$NhUW}gnw9aL($yC3oUmp|R z0JUafN%R_D)k0-emL7WDco|4l=0Gew3R-&m^u=9}K@-6vOrUcmmQy=RPjdL7jSaV9 zG{uEQL#{*FwN?QKlPnWyjXs8prpF);taI91s>`TMJE zd+4LLT)t$*A^4I92y=!to}p`~7rwM)5px)j0m8%{LrmGPIGOB$RzkE2@^U;u1@sEb z^85*&m`Xgm!Ir94&fg`0Q!!x>3e1ImwuxE#En(JmX3hZWnx~4kZcjQC`}?xWK%5j%Qy9URzy%sS)oDK) z%QM=p(f8I+dAC%fTIg{r^nyVAkWSa=-I63<;yxj1M{gZ*#<|a=y9=gG>WSVF?Xnd? z^o$}qNGmuNEtgTq!phoNWt_u2PR4C3H-!e+Z6`6uz8Zy7=@0TJ!4;_&Mh|t+dMZBI zIm`RK#%wq!kBml>Cr{p56J@%zP+s=fS3wAJE4L|NwxG=`wSh31oDj3uv9BLk%tH}v zSIP#BCI||2X?4dfra5OCTF3Mkvp?i9l&F))zBz>VQ$dTA2bJI^WG9@}==~S>-c~o+ zL- z5Bi;A4^FlHrP%wTQC=2&t}nF0Wz>H!v`F+Huk+fAHrmo{{GB?La;7yPZ~zIm6S&}l z%7r%4UV~2;&$y(2;PGA*dN4nF?z`cqqubbnCq3O?m}NTdUxuO{dpH=uAWy}MM!Ndg zOL31T>*u9vg_ClLpIrFCrm_w~Yojb<$*4DHfHK~O@WxTHQpe0MnyTrGJh64vdM{7V|eIHcSPw$1& zKxofJ&F$AFbh`2<3zmqYBjse$#hXmq->mc&U%~D?CUWVq;_5!#}bs}yX?@v|d zBKH!XM7oj^;rCjDsl#W6ETbKI*s^QYI5xfk?1rs)|?MWlKQ z)1g8m!U$20uHrg0A;JoV!$(D&#Dex)cF5CLQLA6_p?h}+f8_fYl0w_A6(4=SH;63G z8M%2)a>v}`k7)34A`LoS!L^pqZo432X^Ur8aSpq~qM*(mCcQ~}x5{sDw=19!f=;rn z71e8U?16AO%JZhTb=iU^`1D-Rb)BPU#%;kEmff$EdNF=(5Mc$eSf z^c`piOeb<)8em&kiAtR;`5~O-fGm(#_|Os``@eiE{I^RS5ih8f^C}ELcxQ4Ju=y=o zNV)#W7stK}W^pv-o461bK1?M@?E*!1M003bZ%xrnM-q|!^?;qXcDD)et4(9kOd}#N z9t*5W8}{M~gYLOdyj5kQ%i#tGIBE45B)7@$QQJMRc+NQeW=jtOn6J0nPksBV)R;)c z45-SR!o)Wno)L!OjdVQ;56+E4iWD3=8ow_O+UVX%BRfCQ_R`T@eA_{||CPJ;+5kUs zwhIE5Z>lqXn%7^dm0cHSv{Ps7N{5=2h&hz7DW}*O&*6?C_L+J47_>A8ZNanih$u*a?_({@dQgN7BqZV4l~`4}=+M&ONN{qV?Xc-HE4? z53(Z)>g}p9s|1R8v?+H4+_uQ}`|zObFDie{wom%zZ=>#!Ds~7bUk*8ejrqo2l8-@K z`Ijc3wi*u&8V;4Zdf05Cfdp4%@J6$80HY>n4U9FzU-LD0YAu?5AxvrALoEhUq(L5c zXzrc>)!)bOk*yX(dWU1QcVKhDJChR7dX!Yd`|;yScEWoW13&Wlng#5nd2z+wh{nn} z@J?DH!kqY8d()CVV$MF7^<0jifs0v;z31nb#cVq~{9#VZ?&rk;O`?F)?jxm+m}HbI zWdJxaC`wnpg;tk{!pTQImkI7iECog3psoBKIdBh;s7`S@o_%x2$x!PT7`h(y1u4tJ zeHR2ScJ7S|gbr_1IB+yMdF5(ZK+w&8d$bLRT!Xt42^3!8kMmj#EC2q!Sz9G?fT30aa)3JsE4FDq3lMh_Y@CQ#+uRy5>H}e)BQ)c zjTZ(8w-H+@Z`X1^B@Cd>HaCnaM}iVI6y`;OgI@DZ%K?(C=ot=sYr#=ZMLw=3Krl zIuS+fuvAW|;9cr~i-IYz-DmhY16MsPwVsNh5}KAV470tJ`HxtZk~?V(y{i`g%gOl) zTYUQQ&juI2?R6Pj+*+)Y^* zVn9rg^nY*f=+$vDjl-(jvoLq~q;x-?FWJ{la`4iZWU%uloQ%k{3fuS3o|Gx|9O;fK0-i= zm|FIM*8b%k6`z>(FcClbv-pfO^wS3O43_f_lQZ`NZ0xi(kbUZ!ZoQ?w-VOB!Z9f9t zb9=OOKjr+|?{YGQS1nf!jUwPCBz;i@^kz*zN=bu97=*ii9e+fM8xZomB_%VSWhhDf z@jnRQnQ&s8r`f7nVZ@>GwBw&pfM-9uH|6>vtHhfwP;yYiK4Ei%j3{|PC-it4X~PDt zw1uIoL^<*;#kp)%T26BR0VO9;_v;Du3yxt_CTpbq=5a=s^cws0d;YJYYnE|tO0a;b z=)~QHCE)N|_4jBcnP*8ulHrZm=t8HUlbFi~jqS@sOK^wVNRr|VsiP@9&R_l$Ye{ti5m+739)d42I;Anf~jjcT5V5udBWx? z-N8;IM}n2j-f;X?>$#i5g!kF)g;iOx)i7BNCR-h!c-ZuQzYH75#p{};G=#tYibfCs zP4B)3?ArABTa6?%E*A>62I?pBFznHL56y!x2&6zdwso^c5c-P3Rau*u=sN?mC??QM z!cEOb=BjS^T9P9M&lTk?MuDTa9Ap^dO)p`7H@$1FGR^j%f73rgAG5y_x?Mz10MQu5 zUvL9bODO3C+|gN2)qnAG>xpLP82bSzUt|elzN=n_9=IVLX7CEPDMFIoxl9rnjghE}7K$5JpGVE6&X` zjl7BDfv&2Ep1=Jwx<|jx@HT90P)O4EO)nRmq_lC?STx|LP4-vN9SOib__-Cguj~2o z!|L%zGRw?MCU&s06K_80$NSLryxuwfK$Jg3F2Tp}s^a{G)y%l!1ilCM-#<*s2w&&M z$1VL*VuVVR$7IdM>g>Hi${upgjYhW41MlL)60mnN$Hw$WIo|oUt^;*719FDUdEV8s z7Gz{GgsY4zI}Mjm?yHS*Iah+i>tN;3Ym z;iXSPSWtVpW0Rck(sWlW+!NyHO?F{ia?>n-kRPJfwFz>(GCQU!jkxB7q;pYsBN!$uNon2DA8*Yh$*lV*WPw zfIkIkcCONNV9l`EGS;6b3+85DdLZPbB5p@Wn)I~I1y26Q<2{}2XRt_CZV3g+0?{sh zWtLql_|n*X)YH{e-;5#guBU)1*WCzCr2mRa0{A@f_>zHl2h9BY#k+FC>HFj!b4>p# z=~@u?KahB2qB5tR!htT+ub+WZ@g(;`Y-J4v(Qa_MC~W76)i~Nw45}v^fKUJJ*0gRv@q_w|L3f|NUBhu~pB}$K%~Tff5s-n06c;aFiI%2fie~ zT1B}|FYARf{pww#_++>9@?AGC%EVk1f_>d-`_2zk4xhpzbKixq2=Q^04D4wqrPWa! znO3&;(*}pZ{~L9iAu%kulMX+T?<>i{`{oWrB+ARvm&k(7YUbj1t2+-6zRXX^F&Ck? z6Z*wD-W?AIQtC?2*}QDZ*OFFcc$m{u{cCAUAizrL&@b7IRsD&MXM{S=#&>a_OyswY z(EmBD>*CnzwT^LY?et*imPoNze~uW zm;2DwdR0wg%f(X8keBu}`%(IuLqF|LbzMLeLA1mvM%_D)LAA6)US4G|=@RI{$-5`r zGji$WKC9%=FIIubP=n3jd^f(&3NOcH`0%m4=jmDuLiuWSrVaMPX*zW775AYshJo@U zocE(qaqs$IE)FO%$uvnK!|J|opfq@G*)7m|mKk0wgWP3+A-jVpa5yn5JQzcP=c0i*8LtK93EbH)7-Zkg zmz+rA;K`4y+%Uc7_nXIe1q}3=rWsnL$8U48)rrEkDS)SxyU#e0kpk+&!EWHpwxWE5 z2_gE(fM#I8;zz;;-bG*hG>$S&v;jl3&o2}unURr#j>(cJ8TEWnJHy>M^hg}}qAU?- zaCQemd?jNBb6vZQjyFEe|IB8EM~qLCa%IG_uh(p=JB98F0SskK2Ztn{5X$+wGZrppU8tnE~E5QD7;uC_9ZBO z+Ko(m28;;DSzUDfqyKMxB~(%Np=!e0dGv>I$<(mm9sVzN-+LbJoSTDgc-HZIA;gZN z(5?M;=wUz&MM$$>ROYw-=!ESVqW_XahRhV<_;g;F_$>;(Ktf~Di{g3=q7kLcz#RB% zbJ^0s06?OC4!8(`zkqJ7Z3g-TS9ktNc0a7R;*jTx$-)-CX8poCsll_&#tp7SBR}-r zmFl$B@q@)S#`>tw=sAOxI~M)|q0UyT$|$@Uwcme+wM9N#-~9Ba~zb(cze|C0Z*TSR{Us#AVlt9P#NM{x*g?c6AxCdBk%JYMOZ)H zZX{8^8bX1%Cjk2UX)Fc(Aa@wuoPnT9?x`X87@bYm5tT|!im_wmB^L9$ zi!W8a|9*ORhkzFTf7%VlXDnPs-eyg;?1nQC8-czfVW39Sh7@Ap9!`*N*)RW2`askpA}PzGuP4pzs@ z0GcSb;yC;F#r8g8yH43Qg2}8!*KJ*~NT+V!31kehTQH2|7Fe$UJF?2Cmy|}%qHYLI z&Ug9?My{>BlMXY$=!|c)e*w;tIAhQya?NGim7%lZx_z?ra*t8sV*r_g6mSTC!(9nu z3k&gPFmJ>-YX=jGJYdwy$t@DM&1XMyk;#Np8mQCGIBEW8_ESRH#^%2^Q9P2 zPd##dGe)ZTOCufSqWmH7-#?5#=oVdG)F6(g=hAb0*+MVp3_1kUwBJ4*H}PDJrz4Cw z=@ZGN6y^)Az=gzJXe>ptU=TmbtTD|t@$n-lI8y$;se=iPZS=Vk(3^jRDy!d1^Anz2 zcSS&ehJe%7gQNZlUiudP;;&G1IkIaPLL%owN1)#YR&D&uI*G)A2{vE&!?>fc&BS-9 zHc{@Mr?E&IYG*`HRzw)!4jCzKyI=mL5n%%uzz~<(R>&Wy zN3oxFg6o#+fY?FD<;ymHzugcl;s;0TMI+!F1_VHW#LE!q{YGtA7mQgr`Zj}jHk>WB z;0q=z1#A~7I0w26G3|4E9A4{C$jkD5H|UhmL;hPAuMv;3ff3S`7E>HP#Q!r< zX5Z13Y3VKDchKFo|21&kRb7~y__UKwa%c@rb{aAEx72JaBMk;GK92wQ=Y@;u-I-4( zD%RuWSLOxJO)==Q*xSGMuoDDSb;!TbXuM1Y|A&t>oa;Y;;v_zkz!CDY64h#kQM#3? z|Iya(J_%f`gzWFTRer2+jwt0WEwM0Be#(-4r$UCqiq2a6t_-Ve%|yrisdeXpPt`N` zi=haLp9p@_Vv!Evdtd-yHR91KK33tB4Z8D6N~Y>Ow4D|s{JFfAZJu-fWD0lbZvq|Y z#~wD#ZFcfbZEZ*!UNv3StDN9PL{`T|&8mp7-_Rhym`!Q1zeR$FiY! zf}DA+e#z$2w^{UOP1}7L{S#zemKksEpGUEK^GILy{jC@jUXuy z^CJ{K0U~JO=HCUdhS-t-)!D@~@(&fEabFPqNN557&=_Nmr=TkamKMT(EliJ?{d`w~ z%fE$>bn5@;yv#KW-JNYaMU39@tN(U9BuvFiSBe#vl~4|qPBMRifWHpvn} zsJS;9HzMK&9I7;D1=sln3_hD*@a$QiSGX$lqtouY!H0<1e>xV+o7atQq#*phIb=(L zCv+NcaqI~9PYG^YH%Cu*uwHR2ecSP|h4+TjWnUZRGo=(hsh)`8O#q2;buC1f1h~Wi zH$YFFQ2)4WlOO9H9H6iw%$BfG24#Xz$%_&p0WliuZ@a5CfB8&i9sr~^vBEgf=gmp> zD?_m3a530>akS70_e|75FhuLP&CwrITgh`W=Q;}5bOL)7R?1WXU07HucxztCW^n(M zLCYr|%KA5=@{LbHaLjVbvSOd?=u3NR%>8x~)EwiOKE9fKqjiuzal3aD_`hZCIiU~X zIHo|GSZ$wU1;AmqLDF4`3V~^7GvTyhkNqqg#@4+K1K)wGP_AVI^QnT@hM=b0KeF86cDAyCQYvvu*!!c8ov)&^4gCUbmwAYM*% z<1$)*>gd1aj79VKYcd}SH6`y#cf`DiZPfAb%z^7N``~*FMonuanZ^O$*nCohaqZ(@PJn z`|Z@T`@DMGnl^f;Hau^uk33yqvF{$V>XsF2#K_Gn#ZX2EBDAi~twNL2!j82s$^@i$ z>;~8bz%&<2t{v-HvThaO`tCk@C$~V=nftiZ2jm5S17;TcLo9_8ZX_P=-gqp72jmOE z-Jz#zW(Bdx#ZMRVTGRf$MJnf-vGJuKd%RbBPu`k!FKJ|gjD6lcpy5oD0`3_G)Hu;C z$&$4~W9O|3tMM zvsjUt9jzyDc4oX@9c?iLT$8(3_OxLjU!j`L|6{bH$|Lfk>6iz3dpf`S`Lf>2pW;Hv z3Hcp5F>kBizn~uVe8!0vT+{zH+r55zp!MUanlk{52$IsGwq)?oLZFchiJ{R8fpQTuZC*xwy%vmNC}7v&$C^>KI*VPX7`3z@#7JJ%mEGFV@-oIl3$9YYJO?7 z7~-DUzyX&I-^y)v+yK;lfpc z!WTJ%WJ*p9oaF8W>+%}pUqJmZzIO#h!rTiKaJHHM{!Et6lHR2yBO&ZAcKHm)S+Drm zsteW_@$_6@MBkk&rmy=}T_*$*5j6pNmp}Oj=oP*86b7x=&V1M6gkA65!dmm2gGKC^ zC;Q|B@K9D_0yY}=g&=8y5uVgorpu}i$pUIt&p7*$z!PS!!41i-n&ZQLP&S_Ge&3QS zG8{IW?d)KX;rr|RdP(?u{I&yVEww3osnjij(@eJxihfNq_gSn-UY_e6RvkH98PeHK z(Q&?GFA7|4S4Nr=>~Gl10y?#ns~10bX3CD{6nF>AgcR<5G7@nhMS8uJf2%5V>s_71 zHuC(LYyl+?vdHq)yyAo3O3~`I1b)gbB*6Xz1BawJD9v3~PZ3Dx${i0))E*8KO@qKz zPB{GBx8?`JHNS%tQhZ6Dl0_yzo%8?Qg+b&p`91F6f^d-ft#`z9k&diQaeQkC)-!7N z-D5`w!Qn7i2P6X@VGRFu>fE-87B|j{6?bsMFCjRYsDjw)SKyo^*hKTLAPR!L zZ?mmty68q@O6O6fj+5I}!b~;%A&dirD+CTd4sfnL^-kN})4`Hs>rkwW%}ZUwxz)F8 zGBw!(MIQxFFWomcT6Qmv^X)BawnV|tpm>(LcscdFAp4B!VGc+^aAyD*Sb00??q-7& z&|re$vuN=)1aEYASHe?Ry!8n9&TwgoNcEUs3P!%gnbZ|d=oqIA=W`H7TiYfS*s2-( z&ptCveLZpjT848qsyJl%6|q%c?V|lV9?%Tt%u6*@*^ro5{yq)J+jGuZ)<|m7E zIECAQp>~dCIkTU7Bk^$KO!%UanwWswc~=N1lOy`{;hvVTEy{>vYJ;LP5f`M2%hwhS z$c@kS;Ey0BMs_vCDDwB(830q=HSP|4?*-?qcp~Q4%GJf8Pf&`~{^TZ5bKhzQ<34gS z@s(j8RJpV>6g}6GQW3kdWj<7M~~`ixjScTa&BZ<5^Y7CT|kC+?Zq~UQS=TB|O#O{JS)Zv%3lQ|a8h?>lmDb;zYl1=(T zLDD65&qAs|!70Rj;vo~&FZ-!o32i(Q+vg$ehQCVl+1(@%G%WDkhoxumWmFAOK5Ow5 zNL9td?yAc>>0n8-r?3pemdxdF-b3w-65m11F-Fke5Zss;>mtDhD*-N%arAiKPBz~h zseA^RG=O?-OYjp4pP=e8r}Q`s4b%A>-}sTv=*WiKoj$h!u|4EEvJYE!`wNU7s2`9G z8TOor8Ro+s%5Wgt8MQJGX-F}+=*~LIy@MtT@jZm8`S-6TI2_NWxJGm0f9m~caNyei zsMApK&~u2CF|E_qpVyTH0}X(!j7VnCNNMTn%FpRKe;l!q|>?g-8UQY;c8b_u{H-<0>z3$INqNe2`AXo$e`t6wZ30IPR;;;RMUhw!ym+!nRjB z;Hz>zT~T9-kBmI-B=$*t$32o|z@4J`a?Z9OOD+y$taakJ(w8fRB*Flh$F|DMlA1EN zm3$Tov=r+I&VB<_v%uVraC1LQJ$m%{djl+m}Jf5v2KME|ey@ zkL|lUnz32nhVKd*F7!mECBEW*>W4c=g<8M%O7#M#_%J|&$2*g zY_992Kr~vgyPSFMp?Kgw$>tHyp4&owo@U=8uK+m$e;%N#YfYnJtP3rvf_l!#hpWoE z`#n3az26A#uztQ-utra@g$)!v^nJWV%i(lq2WC0v6KMM93b|BSSJO4>)<9H&0*V?M z<-M;XZy2B_uqc{|rMzBCNAnJalA}X{&PXe7lT8FDIeR}Hc?LY1thqme%lQI@BG8Xf z^MSXgT@UBb6A#Rd@o3AVE#P39pBpJMGF+&xlr$`WCagVfd*IxN-Ha=0pLRd+q#wKd zX7#|$iflkD*n1O^fb<(n`mPDF*nxMhtoyk}9sy9(mx4!S0oS^i40r>{kwskjdNCP2+jFSgXv8|B2>>oY z2Ey*~02fFQB{oYzf(t{^EP<`{7Op_d#oU0RuNe6$>1Coi^V}q`q;x&&L|7~xLa4IH zorK~P{$DgY65nn$^zt@ZtfYQQlqy>-(*bdu<~Z9L;1U)`|B)A2OVs$G=~)_zFN;15 znTGIe@aF<>jzkve%m|0uO$J`;2x%Z1scWsLDFZt&VJ{2x>GAETxylR69sx~i#>RWY zm5DPd?MB1v;ed(((<+cRSTKBnI@>-_;*5_@`yK1i89ue~Bq~%H01LOMmUWIF=+y7l`LQvSowr9P936p2tsrY1Yqhh2ZY{@9Ve=lghPfe^ccyg%`;o?x zTJ6C`R6CBK%>k@FkP9~Fc#XE-ZP+gjbqEZ5t+DC{Kt<|)iZ~R0fRVA^;2?)44yK2) z$emodsS)2h83tZ6ZtnWGStoQF8Lb6k==SXA0#ZXP;XM7psM3eQdhkUr8%rj}_HNIs zK%xVPc28iuV+X8=el8b+KeW3vPC-^5!|EBm5!Hz%WoxStn>a%0(BShgh3ntKG6;}^ z!zUcv4K&pe;)G6IE~s3yL)nQZ@|AA-Ensw#Zwx6$z&G1}7Bgsy2Bb7@7e0%6>mBMq zO)gN`*eJ(>g2gS`MBqvexal}(kcB}uqA~Zj`|t?@Yy^LG>6XU3w)?ieksnZW#8x>Q zn8Pwar$^fbv;{LOg!qj*+=E8d6^IIQ0~XI>8LV&8Fake$b-(GZK`6La0`&LGVNx8! zWZCdM(7v`3(FoqC!yt3I?pu~+xQ+NO(+auh*$_Ovcx;O*?0_JCE?+Uv;4gz6`3xPo zPrt(dKla}HpX&F29Df*52q#6usH0FJrR;Hpq%w+9am*xS?|mwAN~nl3j+ID-vX7Av zNt_e1k6GD!@6Y|A=j-?Z7>b zFSihaFptdt^$bP{J=cuFh6j{bHEGWpX;j7j7C{>^R)&CSp?+-%@F0YV%ZDNVa$pk* zUg^OM3OcNA;g0|ALuP@ch$f4PHv`_#Z*E{z@uq1r)$M-zx}Sn3ER zL9ibyy_5IHo{6~^wp~fSTiEh71DFUK&UhJQtu`3&SL_%n@2GEA>#{%dRiZdth=cYB zK0wOA7~5_Oz!)exBXvp^F9T9$gTa7rfOuDr^WrXp1xwMLd2OC&+_$kelknG4$j3bz zD~{kiel4-pI)QUFmD-m+&Bg|}a7D|j1*n?CNGJW)q}jxeSkFGQYa1F750F9-+WaAG z_pRW>CSTH|Q1A#$AZVjeO`-xA7YKff+l*LOY(>1U6x^&MWrv33x9Kdl@iHL<=VgT+ zEl@7TFbK4JnKjB%i3k9SA}@cYeK$o@&1mq=y_~o6EFNuNuU@}3hK;QRw>mQfPGec0 z$DGjkmxfFSCV0qPgBo$s=OOZy85>XnCoUiByzNRV0`VJp8cb zx-%g|NgQAo?muv&!J`gmt_Pn15)f>Ft4wsK0(*WLEv#|Anft^Sp@pX3;a8KVK0LE~ zqS~HgtFQ^x2P7T}K~=yM=6Ykiz(36rRK7fuKI7TNYNyZ~hN++}FTL0FaS&~Q!Z;MN zWztOH(jryWuE=GrJ=zxEdl5`56$9Z2nkdJsxATE0?H-T?4xDS21LX-0Z7;{T_uB(u zZPoBI?-$_Zo?O(g#uXg(Is50I7EBHA-1OP=J$~vrXeZ;@JrfuqpHHz)YEW{+t(I*- z5$fxd4=b_*G6UW+HlHl0ez2n?ZtONM#-sfZkw}b1rMCR%lgfH59?cLto`W;P|G*XcBnep7esks+*7)n+ zq^`&lGUBOHOF7bzP_+T=y*(DLXd#Jg;btEmMu!3(kAr&ZJ>LQuKEC@6J|JTtt#HZs z@akC1ybja2L6tyI!*5iPfWonB=@ zytw_S2zhKv%R%4$A5_=Xd(ChBrGA z+#;|^;#lnhn%|bMWaVA4Ff>4OsstJ^VY$F<2d?hRxPHk;8{6KE zar%LjOJkg##WRF`Tjl6POM0Lx;ejIL0E#XLgF^XXN~U-)l$!XG9XdjL(BR=#1P3zX z*=^1P2vfYBAzbWuk^Rg`pbEkQW(YX|?6@P6&{hNWa}KSF*ZWZ4^Tj3PAO&T{%QBa! z{O^5Y0rOD3E63p3G(yn^``z#+5F!PqP2_BS<3ox+-qjxbND_H^2l7felDd%vna(=U ztATU6Afr3zC|wLpjUE*ega~HRhm0wJjNZpL?Q|=Uwi3cPK~e|1r4FYdNtOI^!pon% z<>R{so};v>@~{#Jv~Xrn^E=otE|2W4cBM$(5nlE5GdDr?BX04citBf%BPYmQuOaO| z`nEo=wh{CN)Tp5$${H;ysookIU9A5J-uqm+othEot?TGa!WB;WB7P_ZxD)xIRU+|x zYUC313Fz)dpXNwB2zjhI8bn;XM?io?nG((y*N$FLVgHCq;%+^bWO)UKxO;C&yor&! z0*=ZKGmZMduJE`bvN9%%oybu=>;o|VG&<=o=KQ@AV0%RY)fLZ$bYRhEi19EW*uP&ssRrUD;SimoNcZ84rfaHNv@IEAwOTpn|ID{rQ z^C*Tb_uHadU2WWB`3O5l-~Uqqgfj1ftx!_V6d3T>k53Hxx41JM1|30TB1rIwwoXfV zzvlz74+q5-46d~2yngRm`3Ei4t8!v6Ss<2MwhWp31tFgXFpF+bYo?2`QE}4fihG#K zM@H~u53wzrtY_Da&99oX0M5MD=yFZ-#&FnHl;3NKBK#+m6-;gg578?#hYeYAAq%a> zKYz=qgnix3gAB0;9aw;lAWU9s0R^BcLDMAYMz2S=x-Egh%C=s#x{|(<1Hz|2P)1X; zU{0`8AZtHG+w2GvQ)NHOCKOEg>Q7_Eb5wOp+}sIvfO9v9GtNM73q&so&_Ccen+wUY z997pJAOgP%iJye#Nh1JJvI%mX8?h za5mpU3lBJ)BHd{3VFUZ+$FPig6?6pXr&i_V?2>Hai#Brv6Y9G4Rv4sx5(gkg(iID$ zP~f>O^}-8Jn;>ie5+*uUp6rVKwD1XPyP?DaIGgsPtN~OoO9c2%gV;_0DHAzJs_nB! zP<&|hN$ysZjol@Eh%V8+J3;ng2(ggD{?l^YW$-g_Nj%`r*vQFwtGcWk^y&dzN20>r z8f5MZ{!z#$D~Kd<^WONSyPp@;MZBGFs@tEX$8m`GIE%K9@AW!SSvl5hXs|F zE#e0xACuy)*HUhv2kxuiA|P;^6uJhjIWi|2nD9AI=FvLnN4+ukhb29~%ckj>%RhwF zO7hgqStK}UFBuv7&j0v&6vA=davzSGnJnOYt6*3NU8l3jMpk;<+y}&UD0Gy#gto=C zt7uz73JY>;!BB;a4>JDvj2WTj0myFt7ayax8kH;OM=A_OYMjg;}ci3ei`gKeaFCk6Wh%ySU-!CP{Y zh-+-c&a@eK8JmgKD`nPM7~|kdw>XXAEL!Sdnh$!L=pg!JP#&Za!#T4MTQQ5F|dK2Io)gs*t{oCVf~@M)-C#C z0{HHj*te%LIbO4Z?}89`fTC2^O%Pr6oq9^0)})*^1rIzFZURUhZ-1ofE&SFu*7&2B z3T7!}<2ZPVyzT$=q(~bU+kHEju#__A#e?y{oUH4;9|QO zC=Cvjx$42d_Q6?uPl%i69NL(5Y%U2Wt`ZBC2XBK7=&E}2`|Wlu12j*B7+x;y>*_vN zrR75uUq@&cBNc{Uf~FRn?yh``SF73tR|YL9$MAt5+MtgsYIVE$4J42L^HfO{&1cEO zTC4M;j?D_yZewM{+)U?7<{#l&Z9Ord!l8zmJCstv0tzke8s|0Ym=Ee0`!c(|}{a_JvLyBFD zM~#YBbr)VML_<4E>&9Ql<~Zq{ag>xrWklrhsO#|kx+RN_LA|?=O+$#+<1%{DL|a>= zyt3a>&qhl)fyM%KEy*T?5SLm3>uObYElHqK(_f&>>j?=aC@1Vem4+#r4MWPc|4}R@ zerX@(r}5%i()!BYfHlct|F_#$qGNX}(UK+XH#_z;M&5$%#c$j{yPwcoxq?i2$k=qN zSLJ@PE<%u}=E-`|1LdkQ~{dw}+hpxZW@3P1x*lR77 z9{gL)=>0l>P&8ss?VJ?0`xrcWQtq^-h_da_`j&Z5*R>1j0C8L3-;St5ZVTy+R5y#oe0g&op6B`3=P?2do*xttHX92&!HQN zyUBq&Q6Z+}TIr@{1eySU*S}{%(EPGt?S2H&hTcZP^Y#9Y=q3n%1i%W*O0^cyQMK|= zO+Stb;L@9$2{}f8v|EkTe7^dqL4c=F^;fbHi&YW{fWx<<)XP9^a6S9wqE!hyro=jQ z8Ud{v%){V^J8TjBEF|J>#niz)u-q%?jLu^S=;_g^k( zesN`R61Fzwm;{7j<<-Wo)p_Nyb|HJ9j~-gjAi;{1^VpcMf{YNpH_PqVixAkM<1g_v z#Vlh`wiFUg<^RN#8Re5+inrsG*T1w*CFDhPV}@;HH(&B4YuK3lW)k^{niNHPgr!BP zRSCMzdp-PQrbpo)n4S+0N5kNn=VSbz@0rdi$0=a?@8A0zf zeLT9K?&(08hCyKficdHy1iExXr&0iZc&m&}Wco|`^X7~TVx5Vr>% zb_|Av2bmI#jDzVCwYvxCoD~X~<9t#})rX-51*;XK^mu2F@9CC(^Pc{<*Q6f?8Tl== zjc^)PeS|U=;36JyfuHlwi=%u}ow9-yvZ|Vb^_xWW8_nb zG7lk?7+5O^Rgf3|EAcGl=Mz_zpuv~&GJ_40%dQNLO0X>-iZQ^8JqqyS8mJP&rK1lJ zG9Yv3v$D7u3FuS6GT|Qf+|FpXEAA0G?*1SV+TgypcZ_ZmV`PX6hJI%%7by>ExE;lp zsLBhj9U?+R&nN-5XLO8nOl^64?;HvE9K8?bc`A^*bbjac}-RCn~k!X8mmCZ(k*|A&N~= z_WaOOt3M+9-pUUgbyyeagySEqb5ZNM72JEU33zUg&*!b!2qEkS@R1i}2M&o@EA*cT zau@D!5=6OuvNe?THI>AK5B`y>RlWSd?{y(zz}?DSV#mwEZXdapsy5{%PO9$IxNqqA&s`_KST9Z9o%^O?VQcto8Cp5y6>Km8w(vzh#cIu zB)E8m5jBe)&#QM_d9HPyFz^z+&mmX2TaGX=O76$Z&0jKsF38CEQzFoW8T%x>> zRC#z0L>nmNdmMc#qB`;nnaRL{a`2r5g3A(=%QH)^6x_Ib;Q}%?*}!-g>5W)$`GS`B zf>4JNz1)Q!7t(0uZ_$pKH%iwsX@PTtY}ua&r{q`=-`YV2!g`USna5%uP8wLp3P|jD zAslq(bH4jIMXVuTkX7hkN0!d|q)tFJlW^9nq2u!E?3Jfb?ifNvTKmsYY<2q~83Bmn z7a-w*Oevzr-8K`K_jxO*LdsAC=y`?_4+szX)Vk^rXs@IgpoJ7r{q-;I2+}zlmj~!8 zV@F*sL=HMa2zq-94C;SM!W*GuKXUg$ei$X+w&^%G8D+RLNMHvix3_I0X{g-?hTNrW z4O#4yWi>S<<*=jSWTigz8xk6Tv3g%_6qg!@@!Rq=q0QX8%hAEd?Jpy3F@x_1&})7W z&rv{PWTK#U)OGe42Jg2cr{J(ZLU4Fp8rF zbcLa8;ihal0zUUo>J7jVyX3Fgr8NZ<7)bUJR27eT&z!M)Gz{$@I1L)QqhA6(B4e& z12$~4_9}y6C$Rl~Ff42fsK@B#MXCxQZVzZFIJO`hyRF7W#QT$?!5)USKD=QdGtw3U zg;NtxkPC>j@=k3Hlt%}?NEVj2mc|Cu!bKxGiW#)HJMyAL;OkGE9^QK1l}ZQlHP)~9 zb5_-z^Rb1>-h=&_V&x2QfhS3h(4$zW*f+OzMQDf#xFkPysJ6Rfo0%RrLCNQz>xAI0 z@@6m)U&6%#%p}UEwdlSNlZBaqQFDl%(9`~O>-tD~$WdEl+Mz%=E_@Nx4Z#=oEm8X! zVFAY-N?FX@!-!~CMV?8_A_+pKCmGU#u-IXgMSLJs%~(iCHTi^IN^}t+Ga$l^+Barz zFbt)1E}VHPxdre+^mA4{$wReoyVR@n+_w`XUy-kIA~LBU(yWy0xX%jtS$>DXn`xRV z12^m`iuJ6^bH8tO>_8$w)U41JA}t_ygBjdI>V0zQbOWjrAn?_Ildb_Kg(20$gP8`+ zUj9f6_1f2|N*0P>;$Zr}=_J9cus8~~udOK@Jw5>@p>!xfbloo5)kDl*j zS~InA9>LQMe@l{Kb=;9d{}cYc@G>Uiq-5lw1IN@)>6_7=$h%L+%DPm=`Saog&WP@F z?`hHVZ~Tc(%zplv?;cx*e`xZoKIrJbGLhCJlR%I7NFBu^xXKAt1B%qEC~?@{^iCj9 zfOGCv*4;t&xwd-myq8hp^vK?*c^ha@bhy|`M@`I`Q+ULk?E=Y(@{Jun^qd$cE{w)~ z(paZ=ULgxd(7laUk+9U>_ttGHbVF&Qxo$G!&fEhENr0JCJ!t7nOFpl7y-prgqxz{__0;u{tEpkopXaxQ{S=WkMlqo1(Q~ zXAuLR`-dhrgeo<>QgvT0u}(B&Gz#j-C-7hqa0!45wi-Wu6-r%WPppoMV+biYz^h%~s??sC1*h`YpD1BQ&$s zg|Le%G->!9=ygFe9m0lpv9XwT<7;-;1|aPdq6hrSv&v7uvp~Lv9*H-V_efL~N@Yzf z+ufEI5A?;|Mt7R?F1%CtPf>F8oa2F>W%E=WTg~4C@ohFz82J zR*6d*BgF0T1$neyzrHJoRJR<39>L#&mH%Y6zWb^^jQv*QJ^>S!0lRZGZfd+Y*0p;xNcfUn+rf6mAL>@JZ%Rmm(!q6X}d z?-|X#+^Bc-o4lA26HdTWY6r62hu*bKOYMmwo298Xwm;JqQ{G!*oW)(&sE#1NpL2h_ z1gy-~t)+IoN(li(L-HUxlOb_H36&5L9oQ|lTYb-*t3^%X>m8bWcL;vo1;%3H7kTKA zr-nBbR`Ol>%1vn+d49#>mX#-WQ04#=HYnzz>hs6>15aH)`uqJTLpF!>=r8jt4-@UAyHuU)I{ zqb0RbvUC)L2eOUNvW0QQH1#UwCI*RKR%;(iLw5S2_%>}$WbgB4>v0ow>q#Z75O)ja z7nT8!+I!M@KtyTxxjehoPp*fk&I6oFj5A*2U91S(Phh<5#llFvTuycvQMvd+IH(}t z=`+A-Yrq4fw^13%G6Dkyl&O!JV zkT@j3?v&m%dLhn8KCH;gA6zb+UF-q0dGCsWUTr(Kn=TI9e!C9%htv!mgO8w0okq8E zx=;vKn!_~{V- z7ZV>guEGLM#%WVBzD?J9!Hg3eI2Ra220%B<+(cO|2qysg!CI~4IG&kmvv>%;!Z4+U zGFz7+U9ng6*?}q5D-vyCKvtv&FpzE1ikXIT3f)ea9U*aahk`bh3+ZJpDxi0Fj4zY# z)f{VsqfOZX+^bGJTPU6eGKk^X*n%`Qdoi(zX&)Hr5dW?lYF(g2hXP}XGDq=@G|L)z zpqh}ywZM3%#ZUkEvv3gLtHb7|M8J^PeP~jaKhO8G=Frp*-%dZZOJm76{ID0vg&oWY z4=ClBS@DdggUt-uB6SSr2N|IvWP@2^^e6a;JMRzP8f68eW{Sgz0YLLdVx37>tNZ9q zvb{(YMsQ4q_b96ssmSZ&fy#*Q9$Y z@{+^bk*7fVDPk*N>XR#GPRHhr1p6R73Pd0RdcXB4WiZER!0$3(PU{Zeiry}bJk9~& zPw26I&fWM#b%}}SIZ6r#Q*qg&O~moL>v!ZAkG@FtW&@@6ZfWfFZB@YHvnXXw&PS=y8Rz_cz2NDPP+p(lss z#$>Se7h360pQA=x1CfNs)GxHbx7jAJ{lNX4Gl6tBvbe4K4xM!U1*(PBn;waLK}vd} z+RL?a9%cabU1C&kmKiuPP3?G_S#`c#v9xY!iWmVBZ2raO!08rCOztt93P^w*=ggd?i zzNCbxV#ju{{lcq3N5UqI;p!}-?`-s_kja>2NsRAKbty#Qx|pg>Z~*H&Hj&5obclWn z2_k`t_maE>67p>lScr&81bsq{*{I5$l-7JsxS9B{8Ka9Zlm94X#6JbqOs{Nne9F22 zcs;QI<{fHtonEsB>21s4Te^IdQ;FS>QZwV-$OS( zV_$lcHw~|y*wncES0v5>Se&%%Gfa=1Dttt&BNjH6a@}bJ0bg5=?om>!x~j$-mC4N1 zj~~fog^#ShKG;4@`Ml=750k|b&7g0bHlCFv4I9=Z1T5R}{_6Tt_vsh#|L>$6Vd_;6 z%(N7C4>Xhhm@K z@J&-(H&{zhZA;h5oNdt`wlR?gfC=O07r|}vg_|5v7^gj$iyXZ7@(sbmQr?{DbkgrJ zq+D!e;9C?5N~c5iKAl?|{5@#mFCRh-h|Xm89#g_<18zV|=)%rRQ?n;N^QoU zp~_Z}a0g1lNBX{B;W?2Q0^{t|csJMT9GZwrDR<9MHKCkv5*`hfxC^lN!>Weo@?K74 zJIYd}CsW9ip9)DT7ZdIc0N%&3SpO4v)B)E659EkZO`7B2r@KdyWq@b6rRujzpL61I z6j@Vg&2Hl|SaHFAOZYDiNYRqPy|@78{FAX*L!(Pc-4rh@GqfFe$r_Z`p+Nb2_kb#O zxqQu*FJA^apyw%1$%DL0Kg49T2#QouKO!M)cg$c_e?K6b#obMYgc zz6OqbOXi2)st)_MYN^G&bYw(&4FS?W*IM&CRp|<5i8KwY;EHZ9xzKehUHt;j*3gM(*b2cpfL$meuOUykfvBG2EE?+7j4e&*M z08#37s({a`w%z?&wp_GljB)9tkWinF^kprXk(HfDc?9Y{qi8!O`sP7aQ8+ON&VGZ; zIg~MP^YKzASx2ycvEmPEFM_g#v&V(7O6T&nt=g?DKg}0pN@U`SV2iT{<=TAvB%klE z;`I9@(!g1*VHel@d0w4powD0EP>=SZMjO||KjKP3GRmtTKXBk?^M!YbsTzuPF-elJxE z$-AwF0iQ1gtnd95HHsm-(C2;!Azc9>4Xda$U#VNT2Ug{~xg67kQbtjH2)F?Wen0=r zVt-5n69=s;W@P$@q5@X7ndY8<*Kw?28K#odtDICT1yU0xi|mHxFB;mf`$cTV3;2|V zb}p@bo~(JOY=WHrQEBe|16_VB^s6fywG$woC^FT#(iDd>pWS|pl^J?*U-w&&-P<;f z;V%uJT>1PW?favH>fr0H`TX1o>Stt!%}(Oo_;yY}8V)hZ0Y*NR@zpioJuSRjBQJX* z-}R7$J~*vpw@j}agp{FfS)>pO^M0sQkYc4Hp~{8~8IL-jW3fI5QeD4;VpMp^yWM}`g%&2F_S z)R7T2Vg*tk#V7DZ!16a|`{06wVbek^2urj}FxtU;y`Zc+o7z3Xn}Wy3=sjYqjR++I~_TH5j<$V<~&%LDx6vxVskkj4E__U zFr0HY3PIR179N2w9}jb^90pS%^@s?$8{)f`H-Xy zV!8I|mR4@{?RN_yryqfruYd*eRHun~2%Cj?lualpZBwAx(kYLH%+_nF#Rb}&8_X2cQ;iNxdamau_!etwtYW1V7=p@rJpCuvv7i%jX3qq5yM z^phwkLh_FRLbT9RF!hFr(+#8x3F}laS|-rGriqgZf^0#JHe77|WrcCN%@d^JBam>G z#N9;Ko;n#-x0FjYb!ot?!6lP>CV=k>VxvUrjy^f$%gUBm}wt-J>2QbvIv=ORHskbsZv&n2*^d6N&* z;fl;ZB08XSWw9Y$h~FXP8pIvGO@gq{^l;gQ?P+{cAw!v{Jq6n~?>j9zdBaz3kT-Z1 zVurbg=wdyQaxuQd4AoF=x>Xmx1R;L67pO71XjWmVcB$a3Osv4-)zyzhH7lIIu;g&d zI=VaOR{VWL*JQ(vty!OhY`5#ynRGtUjvnmKVLvmF&cC;lG&MYd)slHA#sKC2*0Nm{ z?PKW@?2A`r@Ag>uQH!|temX&s$0UsZcHzZn970&YWq_~>#K(}&2HQ^w{%W%EGJWm0 zl00cg&i{G=@`d zJ=u8?lmrN=QyeD%oR(cc@q_QO6hxICkI+ratj~+A^qe&18d>86h_&QEE%dzL4y08N z;@hP7aN&aHIY%aQ_BKdObtW~y#bR3nMuKlXX&7&}IlG&lrZjo?Y|{NisD@fW?17xN zw@r2~TBj5U9S<*C8vY*m$8BX4IxGs8--*$~?p^$&2>D}P`9xg;aY8h=_|Zt&$U>b! z@gXEKXU}^R|K-X22IW{QU(8jJ)5-FbMc{Esl*dJG+kTpPmrrI^^BpnenqF4@ZKvb+ zwB(iUTBAF@U|6_9O%NF8lp*U_nT_p7TJ=(h^30#jZkfkvZVtu%zY_qQd9fxF<&lOR zRJ=)CKxWy(AipfLo$^5E-hhGBFv0%b+HLd*j`D<`pZ`KD=&k?$lpCylK$Cy}`{Nsr za>{>ya3K&A{qF}P_vQcn>i@9uKX&*(-uVAd9M(&>L^j(_>42DEzxuEoX$YF71eON{ z1p6y_0yd}T*7_<11M(&R=KMSj%^7%&bBoi%ejN*kG8R8bPtx+k{9A4g&aIg>H@D5U z-{Hk<+S#lreP8yUn<~zX3?Pw|MPv6C22Vbly{zmzPIi0+x$R|H#Q@JSid&W=D}sf79YpLO@UR8Eu|=s}#7P<56$s zKhjh*ZR_pX;5%0Av+CpHBDUHG2mLs?bZuzJ<65gx0!jIahpa?p-jCR(*pir(Cme0Jcuo_G9Z8sYJ2_5)3RKEe%pov7wS63Z&*W?x2|Y&=-LyZf@@t-?^7 z=Xb1=KczqLTst&mveDk+vv_FTa}xPx89n>ct}yCOY!;r!f84JmjM7un`S-$u7N3pK zfW^|)jQYIgPw=q*ldSlVfslX=jjDvt4?L!q*ZV$wS?Rd@-0VpNvGAJ&`|5n&Wq zpE~Zr7^Dqy7#v|8D3+R}z1u#?hkW%NziIB}z2SHxTb%S)eWl&VpzCYe=wr(-k#FJ6JJu!Nn@P${Tlp} zf8BD9rlNL9u>ZXyAFkLAo*hVzAAI}y1?18Zgh(7wsdxvsu9ol4IVl~`8qE25x&8T) zO1C`HVd|o^q9Z4Oml1GlG}G@3-fXZ+>0G|+8g=$`dAQF$%;qB^`lD<@XxK%bs$Sn^ zc~AZPxa#;@`v+59x(_Ob69Y7=Hi7Jae5GP`X9jPq_#r(tIDZpTnlpZJ>=HPt2+}cl zFvG5IA7&GaKK6aZ)5EaVRsn2^a zseZC|b6#QYmE@eR0#4=fiR7DwuAL7hc9xzN!y{Dd6UjD9Q%S!|Au@$May#Fp3oY46 zHY9P!G@W|~Hnrp97zc=v2q9{Np z`R3Hj=h^n5jNk;G@7{mpkZ-+S`itD^4SJ{-fKdIJG1CrQ5%I2^zZkz-4xdH#<~~R# zA0D1*x1*$t=-$C_j!mfR-z&BrKD+mQk6^NN-+FH0^ud9r`Oa3Ib?MwT365wClDNJ({KdnI>&qoG9sXH?p4MBgm&r(?fmHF^OAFKH|6tVOclL-N>_qH( zeVaMx6LfoSo4em6b27cl>G|_kvfGS7HT=Nd2>&V3Cq~9?vODgS8~+bGc$nEVOI1M# zGbD(FhOz16FP`qdHLYR5;4xS6ZuxHWS09M12l#(j3DOjoV>Y)BKda4krNf=TzutB- z6iPObp0c-H>!ST7w;c;eP$&jgmW#R#2DK|05#sbdQscn@E`{#W@rXU$p-ph9`uy$s`=k3Mgw`Lvs zI9P_iEA}gqls&7zEM5}3j(uP~Oi$=0-|1I4@^AXjZ!q2CuOCC=wha(wjnt6Dd^iOz z-1YWFJMT2s!QW0g#t-b}iNugbb*fh|wagmg5P9eBFZ+zw$u2hxF9^iQYVjH;8+kAS4`x!s$9}>sjVt(z;vY z@`nG&#o)_+q?`N5qaPa=4`@uc_I#~Z_TgUL!CVqYIX4hR8myM*b-`dZyZZ_?3p2YH zl2Si&VZu#T?`E3lB)3maSvQ+xyK?^;EY=djOxx60Tnq?Tdh>yDOi=XY2+QKm7cKr# zH+{n%6AL>w1gz6OIQfz_9BiJAtK71uZrK4`Lhf>shnm_Cs}v`F4vf&x9}gzRI5-}P zx^XUZ{^AbPn6^%S`zTmBVyI!Y<*(z;M~ms{+S_)(16gGy#PzsvfM|jg|IrP9QtJyP zr_GOk(~vB6gSKM3lw{kq8lfbwaXAQA^D!Z_=me;Al%Bs9H$`6MZunc+n)M!zVGYnu zi8p*Txy!%o$;c)}FAJ}Iwk;>8aq;g}ebxx+NlUJt&O9E`ypIp=dOs|D*Aft(PyOmE zMYfry_wJH@dU@r&LxbMQgixW&_|`K{r0*Sx0}irGX#C*+12&rhpTZmL*zT*raj{Is ze?>oBI+6mmyc4zO`Vn;w2RwI79zc5Lzb+4HF`StGzMSp_ydt1Y5deJZsg*eN9$~Z? zN}X#jy0EAZnV|%tCttm9SU!Hm{+8hizC=bbKqhRYdxLy0+Ups&SME8MA|c%k&iIt>kPu!3`MEMhzCEGqNbMwyVjq4NY zxe-4GPF~_RuPjfU_*nC7vkYta(rC*VvUIZ8{EpilbDK9r<2AFg#UbL>u`9!tt4 zF1S@6;%MY9(G8v;mETrrKRiQ9V|SrlMAH%oj`ek7wakpxROiTDj>c=Q1K*@yEtc4I z&e2i*cgBSqY3!z!&nG&vJ!m$CU5Ft})vq-GLH2@^vPEa)aj$)T4a)Pb9O|b~{))5H zgctR0jy;z=-}IQm5}#Hq%!vt&OB0f1`lrI9?wH>1xiF{L#?rR^Hlq8ZWm&{Px>)m# zljr>pqhEO0|K>a!Wnr>@cYyNw6vw*JpiEiXJ)f%luFh}|g^9|R9+OF#hqE_yQV(in zPL4#M^}glE$?bt?%ITEWpEimb-M6Kx?>syGCBYV3bL$)Fb!~~!W~uP2YC2QXQwb<6 z&oh}_g7{0q**btb)qjsyb74-_EAT7k?pgYgBqom=bJf-y%nJoVDFUJ74*D57?ANiXII+{|5k;(ELLQ;Xvs|2BM;d-HUS>I8#f_JmHybMcyEJ%e(Wk?eQ7 z(>){1L=4|>N1o-76^f|dS545iHC_Fx3N{Y2k5Y>n-#+=dtMBCrilu>knY$r<)@iF< zUgW;~zMQkls4tNF{qRj^5}Lq32<~zrQ3?vZns1&B`W>*^%Rsm%rx@_^9BI6(W?!|b zM+BS2_VKf~dW2-oB7p+U(JnK-QXTW{748NUEyTUm=Qc&!Thy(x{$o?UOyyqAq+;Rh zKj3UjVZ~3eoyn9Z{Bw|WtAm+^R2RPeW<v&@mA_M_HXjGyIe4_13~ZjG`Yn zK~m5P^Qppr@hBh9D(ZA9e(+Z5p>x|9jZ;oY|>AL)e9>iKu=?U`Be zl4HwYK@~fvuahle%-AUU-~L?fn>0>TzmgK%u~TluKkFYaUrY^Vj&`e=*8N1Ri>dki z?J^_sz`$cyzr@8oW1?=0z9ud&Q&wK!lwbS2*L>4QDsJuH;XKxL`Ea=uIIk83w)aBJ1w)damYmrOBIZ zE=2>MSEHhpTps8y<~T>DZ1+yFrz)NG(CKwir~JR9)Fs$D8?`Sl?hd1$94h^t6?onoWV|J;MSDku5)?KTS z#?_Yp-plvHHiiG(T)=84Ip>K+!FvXRqG5}|hKTCU=7RTLYnLDHPc#6%5Oq0#wVLRg zblH1iZY?P!KBlIa|D}?J$?S)KMa2q|Vl+3od8F(;gQy{l?9*2xQAMZ>``qW{(q~ux z?codt;OqmM{-WRUJaqwN-Pv$RPtK*AiQ z#XnT;1agH-Hp2!~jp%*Vd#(09*cfd*+b|tgqiFeaAd{xZVdKu9x*2wX2X|ZxP9y`) z^{FQeuAO#odAL!vgZ^PU?sll;o$L>g)j9mg?He^R8hkyHATWacjy07DyLyc#miA-F zKJ+?~ImKyV-MFJ$yTi&H z$QX+k(3kA08c)5UmiOV^Xuyhj>%l+kdgN#@#J*36v3w?@rb-7wJrtrgiXpTck1X>T z5uYLwWn8+0RpiD0gBYpzGKM-Bk(jc-#(419eHuiaDKV;|qXu;AQTgt)Gp_k3Gfj3x zzG#pw?yj5I71KhCsNwykupyNvB3{WanqGUwW0+6!^Q#`iATtVpE{ZgEThAaj}z$A2sRO=lpONiMe?&`4z^+)F>O zAetX9_~2vsYLy(_cj17Cjro%v@@3t9zEU$qqr#KNwd#J+TyB2eo%mpclxFXtsJrC^ zB<^z)Sn~aLWgDVuaF_o6`;zc%=A*9HgqNnV24YitLc4{*L$|_AJJ(cZ=@pdVMLiV6 zvF29>u6NW)?%DsMEbGm_hu)U=_}H#|m~94YH=bF;f-13c3DJu@5;(FhLS-6=sp+|$ zes87vO!((|T?V$VpBlc9*=EG}me%*S%H(TX85tJMrtOwfdM|k{wD%-~Ggv=Nu?Kgz zRJ{Zf6*KHTkyy={M`rn_9i^XKp#AI{+Uhv?V;GZ-We@ zVrQjqo=UQ-I_{Kk7G}n5$e!xMpc}lF9f2gM&2M9Iun1-P*MJv`y{3?%sgK+dyeU+L0+rS^ln`syva|Bu&yrx($f zW#0&5+9u@2?6~tMOGHeK$)E^5(`$QEJJ99cqv?OA3-;M~>eq{DM(?|jF8MIqO6PUh z-z*#UloVN=Gho%~mhYZ!kYJ~pTVEcpi>d5tk-fe}TJo2uTYS%igoMrnpF9Z?4@-B_ z=VYILHkbTYBJ+6fjw`}la(rcD-^&XCi#@l}{%VF=jNYvzSv(oc*PRIE{X(;RcyjO4 zW}0M8DdlwKUR<%(sVC4w0+KX$BPP2oulQV`z4og6uKDh)?Oa?)^J&nC7^mwlFD=(E zq+7?BJ%RbAckFF>R}~B}b6041`53mTa1X^PP}=TolH>N5h3}>oTPcH@GD~7DmZ_7d zW~C`6E!qSaG}Bbj5;3G~9E@g{gyaLJ44T+1L?xflm1lzv`S?SEN&W(>|A@WC{yx7z zyyz(J`^tmiZ;Q0N)gJH_G)<0Ws{C18KK6FLJ@!_{y|bspu8}qQV)`_%EFG)4zl>@y z?ik8BtIMBjRmVq#{&`rR$+V-cr`sX`pP?&UT#If7i}VtAUkQB|3}n0*dwZ{HFP*#I zqKgY^46UxrE_Je<@zshSWUn()5B$)@Yzw{vYsd=`2TfCxJ39~PAtBQ*x(!eB9+g+41laFxt zB708{ri5L*M>E=7FAdL*C7Uf;-N;CkzC!$L|J3fr=jWd@ioVVLMLjeNS%M7N_U+KNQ&x^iTi_y`P^Hg9^pyKkCas0t6HAO;CYmfX-Xs3pq& zR{qV0E_tk(Bn6AGNT20&c@aFBk4>TZJwtDs8 z4Cd@UWUPESeRcnK?{0w6==OfrhZ(hwe3j1!N;+=UjN>bxEo!+Q&|=ljv}HRq)=p#1h@8PJj=Ekxt?cBOsYj} z;y>E`>2`+P<$la&s4rd2cD!OO@Zponxm9*oHJd3%$Sxf4qUbdlF{~@L;(&fQe(Q?O zMK;yaf^D|OuqM?0C1q959B5*yW=sr@3tu@T#{cRZiIbYY%DE8O=q%cmGH~UobBtMf zF%ysZC7Ue*a#13ZmdqV9m;W4l6!RfED7`L>@!PM3$6hB*0Q3^Z+tUdFWv8+S~gcY;P$rLNDeX; zx&p~Xl%tB#Ws@fabu`k2CdX^egxS4E-F^-LSKOV$aJx^w+RfLlyD(NijX1lPBi}$Q zzG^sFyml~Dvi>r)eCK>wALJJLAS>keqCqcWuBpmvMCnw(#y_w6$Q7!~J};pM6RK@4 z!q!(NWHL0f2JVRW7C8yfVqeOz(H@g~Kc}+ZDNlE$Qyw}PsQT?-P`>owYp36|vtuXm z@&b9?Jgs{M?raqIfe0qq;uT%&O*mwCp1g!(8ZHjlw_MgEE*U!eYPWq`UUjUZsA%D1 znup>(tM?Ct&r|Zl`kV4}ng*8(cDk2Y_5ym8-i*g>rprc7ki6LD%gk<&2}+uSZ|f%nIY;WJ^SKdx3ui&`vZ4}S5L zl7o89P$#xcYT}bqq(ABF#)Iqa#i?He#goa^Ei|sOl%T~y%&+z391#~1Ssp^mzx?|D zk`Wj9l;3<@Wvp(!BpDuEXVz@8vq!j($^mAOG9q1f7--kifYP@LS^jTVX^%egju zW0<}zYx!>Oj+x&^**|};_k$N*cj=7pFW|smzSrJ;+|-urS%^XUP7QblTwv8Pnebeq@fWw0WjVbcjrI5G ztZev@+p4a=sO841=EF0{uv}_A;teg&u<61br2~8vtCSF^hMdH1a9y?f*!5=T6HR|% zIq;h3xkA+B;3Fn6aQOl00NcWcmb7-yjP;kU|ATXlC}&m%<)`0kZ93dV*#^VQw9}Qk zS#Y+?51k0^K0UuDj^;ZtgTyhx)B&PQm<`sFxBe1hSDf!>C0w$gL`S91a#I^AStage z9Xl(Ch73NheO968!C|wcFZ%BLcUD(~8H*^k!It#{tA#ICsWi3H>{DaE0bmfdc=dIw z;wIwDX7TNJ-o@Tok`zZR11{kb9HG#0XKbtT=MLwX?{i(%AE}H=5GP zvaQoLkm43=xo=E3-aQQ#8 znYj+dmNF^|VmDgmpcf5#Z=3`$R;eMq?%KW{n+Rzx`=kqb(|vc2^%shb>xWP3>ebX>9mKKeS*$nWDC^Rw$^uu^{bN$7^P2I<#15J}4`x&Jqs!xekz=P{+w=FK_Q~FD zDFesg28NKpLWkx3G3fD2+ZAyh8LNle0t=316Z!^}Cs~TMml=I#r82bt9tjxieRqZV z?lCi^-`V(iPAn3r9#;&7vSwAa{3Y}n%L&Vqbw}K*psS2t&2W-7#=Va|~G64%CQf{HL?p9jE za^T@h3bo3qw(UNAQ{r&$dm}i5c_x$eGKec!+=uDP)l7y}CPI!OCeD@a+iU3)*RSxU z$%J3U6Y4{rmt_H-IOKV9UGvsidMI_GKOCrp$NVAO0XXt@FhtI?Zaj_ zb&m(9`Urg6zF6dzJ^J#~mEQ_61n}6#E$;#sQ>Mo7`-)61X@f1{1jWNug+y>JgnR{2 zt_XXZ3T}kyV-4I`gfXuP`rsyh5I@i}gM(A36q$$c8l(hjMX;!gToxi=ToVJKjdGl} z9Qk5xymyZ^q5nKH4rWT(*x4r)e;lq1z^?&(@B{dGt!+B-Pu1#_or(H5NWV#BK$$aF zp0UOvkO|4X5JFw>2r5bb8N~CEmw*R?bi_PhtEI|xwO@9evGC0#aNl=6zaQBcbdKm{ zc{yUZ*|JseF)Qj`336+ykwMKDprhqCm=EvvpUC@NT4zl|MAB} z)yEEdP~1*_(-NBDWku876`~$=>K2!`J>OQpj;!#E;&WuIKh8B~?0Ft?=A&=>S2eZ7 z@z(RmEqefsTD~E;LI%+(mmnWj9ey0!dFcSi@VBz8+Y6CuX9t%moJnPVVC(;y7NV9V zD9LO05vYoDM2rS^a&O$>;jRtV_C>0c-e%_b-rqZ$P`$r@ZZ$ifMR{3Z^Igk~_WC zM-0*%)zrc|xy_b}>V2LWjt__#htc`Z25L!x;!Q>=&)=W0;J_efSVA!7K|sk_zM{S4=rP#Reps-7{J8d$T&B&L=Nr&Ux+3#4pBN+H4=zalF``>N z3=d)qT#1}(5&z7nUG*^1Y^C6|kz~LJ##Qd?8+VG%#b{ZbInud&Sw|c9ZTIBMqrWx1 z^ICoc&0M!TiJ_=N=`VT++0{U0;h4o1WxYjGU=>u>zXYOQ9a#L|dmTdQAn0YzZ!bC3;}bPZ z>B5&6wx>y~JA-Mj=ELrOj=Q}x=;gClv9xV_k}WJ@{4t7|lZ{Mts(+{3edNVyYdc)X zHla)))r2!BF%7b@q_|(${4&aYZtddZ^2&kr)*Cq19=z|Jopg?1ZcL9%@hjCkeYb|f zCNR-s3>=<*wV|7;BokS?YDkD)Y(wMI;oY61?bNEiTqzPQxw2bBjB(9rZ45*8X{t+MjV}5(O-C}CETW|o% zb2+3TdVKnJwA0KKza*(o^|a&p4_N}Ov$^@OAJL$Q#U zasCy3tz9+0kIGpI^jUrJsz17+@t!~QmY%_fy|eR(QA9lKWuJsYSTRP~c|ip%&*bpR z;+){!yH#@!`@w@$RLfomR7o9D7dcw~c_nanl5&mKpoAFp378ZdAz|>M&@1+kH`HlV z^>D1_nd>u(_cwCl@Jl-Vi#i<&p`~f|f45{tbP~{#aHyCAt+GrWyeU2;_8XJa@_t36 zd)v2=w*qlI)@E9}6sP)5OGACQPFvqloRTO^V=R#~{w+Fq@+PqlxCAeg&y2TA_(dHYL@O&_?R`*Q7B z!CXwksY&K5TYgfTb-JAo&8#}g6r7iGli1mcN7|cEK6{>Nb&x$364<0vasm4eY}KWy zRNxnRl`wEIlsP;kerHf4c_yoaWRoP!8>bKki4Fd^`c5f5X{5)>pF1x6Xip*Mz`2|; ziqGV@>ZJ3ZNgN1rzkM{XN4|7mcx^P*M0UzlloJ7OEBi~E zEbVN+8&44zED~{OS_Ja*1};B%Hk!|IumjZlZ7fQlL3>`CwrRgisN86!5tz~c1xc`v zPpp~wQ>Z}w4Jf@SS4aBiL^gG2MqA1F#}}Y!@iM|QV&Y7e#_aMFn|F`xaO;#e>c_gd zK8dxXl0}=h4HCVbU_yL}QGq6)=*!+Y&A+EaurH&YaOBU^=B<~k20mAFd0>ZKURy65 z0&)H2hCyKNpK1gLM2LfxoJU?0vmuCeQ6Y7agOT2-^EWzF#0c%Zt<+aiG)@ju9J|gp zQJT#$@xr{7EXf>dO+HzlR8>PEQH2+c{~D->GmBL;9Ftg8$>fAFD=UZ!&d%Wrx$*rH zs~d%xeL-X?aW{`xYRNc!nAc;=DWQKaN}z?V0(pdkQNku2D{()LKTFh+7D;(MGaN4i zH*y@iEOQo)6<>iDeh?JP6LD<*f+b~fYj{X8aLeffC%iV{RuB`ScM#J}hE4>j*)dvt z+TMKI^I2Q=UR})x>##kE7te&S9b{iU0A@R#yo7y3CH(0tsXJG(gv($(OLMh-B+Ude zbvW2Re()3a^>2yCJ7e@Vku z$F|1wwlGJXpivzb+z_4}LwYQJc=qWc;zO%QdWPfNS~c)^##qj5EKafuKfG&y6ZQTp z>US_wZf7sF*`cb;YeV0~)V0PCGS^>ruv#*EqREkZz z$clVCAt%}%2k~}s2q;>7|5ZlHOGZxp6c zfost0H%)^ADgb4f`z%M7hmm4(i5L2KPWrpN66YIwy&4Ep%NSBJ{BF14i#juIlgC+m%lv^hHctJ%; zz=r;!3henzIr3x}>3GhVNdjl;gs66HMH}>bUGJr?`8!ISz{RvD+DGD)?stqg@~vH> zB9GEZ@L%`Oanu8c;;Sn0ACFAMfGk)Cl?5i&kg(NIsVx(D3vlyKtvZ8fOf-zmQ@4{& z+kUWZtvlVl<>m|R8_laA(#{U61tIqK8@tnSe_!^<14P}rYyQFxFuPQTxRmFDo>pC9 z?@A!eLJEFqk9%hb1dx|^Nr;{^HQK{HFo|{dTxEStj@Upl?3=84b}nV~(mkv0;6Hgx z!D#f;nmvv++r*46nCr3$+)V3ka_W7bS+`|MH&@QsiG;AT8K;$fDPN>S{3vyxP`Pob z;gkX;^-20V?9d1e(=<^hM9(vYXK+z+o^WMkv3i5E0++#!pO8Sg<{Ue; z>7-ZqJy&fcZAE$Sduh@0aXLIY?R!tSpzM`4@8ucm-ZF4kq@nSIz-w)aF5=1D6g)EJ zeDQY5%0%S_7Q(_jgMQMz6 zY;DH;6eu8q9Hm|*JWWzY(b&kc^z>_gZoUUL4j2``Eq0EugXC401o&mXiR=QYiFdu7 zrzawJ#W{CSD!n&=p+rP$OO<9_F9#a-@-Q~Z@+=RRQ`)3xzUE$d)-L>w#Nf`wBs^h? zMX2VKMWbE-8C8U2B!u3VS_IzS+NH{Dg4NsZ>qM7iGiKv^=uX)p62V}|F0ziH)Uf#UdG7W2&5g%v8N?k2$e#Up05Bbm zxcKI}f4_Fk6(&|*OmL_{bnSI2T0JIZ9R^BPCl#%@FkPS~HpAYbs0}~}>HGXIvLj-z z<*C`p{!qZi72O0AhQ%DtZK$G(+e)6K)0^}l+-Y_|_t$_mso@-wqFqUoo(2>LF#%p* zSqYWZ(^7>**8*&;Pq4?j?Mr(kr+z?@H4WUO>OdVTpcCAdPba;5b#?B(4W!hca>!aL zj)8jmod={W!c~8WQX=`qy8BHlZGWQz_nCa)OOhH|dhDvXMQMycks`pzbXF>e_6<%1Fp9G{F`O z*~Zn}L>5$>wJG9<=Jox50lIjYva8w1s^Y7y0pFO!6cRbh#o_7{HWDTNzDGLKo0ST* zg&I*_pd#PwmlOpD4l+*)jI?kys1dM22S(y2Ih^Qmso(E-J1Gg%K&W4lQN6WfL8gco zE1l*Jo4BR<+vF6TwCdfuUP{jpF}%jD6qA4GV@Fxe(j2&k?IH59@l!dD53qpfd zNAU@F!@OTieg#k{!hs|Bb7SZ<2cp{)Y{wN;mt zlq8@nh3H2FFlPy9gvzRel{Yr>YE$FVLetjDIeT*G4Z;YkH__zVr?#xw z$Pz*_i50K>K}zPIrab7dFjLp42JUf>UEYj=8(|H=CNFiXh6Zo#B1n{t0hhA?rc8PC zEKJmCT*T2a2m_U!FszTpBIdVkmDh#tV0+M9kITVyIX&oi1@F@s%>ri8kul_ZOOQ=3 z5!-#W9F}TCN2E-*a8663tpat#?Y|A`qk|PDKdQg^?oVqQvC{w&P`U7ogkY2hXcM%r zu4P#LwFl@K0D+hwlbCOKKYe~TAyQ*!6psiOzCMu;Ct)Dp4!HJT*ZmqC__*7|#JswOyb?ht1Id>6|ml!#NlE=S1|MjWR`6DzNIh9~%8{gz)LffmW zRgWXN+Y|HeX8wiN>zwKUrj{%88uNBfvwH#0kk>z?k+wjRL)1dP0$+|}(CKuRm4}HS z`4gbq1&ylYvD}zeZ(D|jV&L29n8II?eoStiHH79&OQ?@F2-MllQeu?+y3iC7m=|2? zT@t;i1m{n`oHGW|0X7uN#hks6V~~=2n9)4{@jM+sUJ_^0$^-x>r)y|FPT?DkhzBvC zG1bD3FwY30mGd_tnH(yKrHu;J6#~xz8J_mspIC4GG!z%UY_ymmJWI5Bx)NXt_i-Zg>sg2RIR(A8~G64Ve!HnGBTq%s4UQr@0 zV3p$(TiDX}wB99%VV6^Vf%LiE`N`c!@%J?Z0ax&c-JlxSe)*@m6AyU&Pjz>wgKL@W zab4aQ{nj3tnA|ohC?>Rm57nrw#T2LzjTxddDCU#==~+};{OehWkNNln*B?LEl8COI zF}Kas%kgWpvvXMrCpKCZ&NS)xbmtp2;l09==0N0q?>_(fkgo8V1FQT)SL780u-1)jWff~4 zY-9m@F9Hz&-uP3dh$9xa)XR$r6!#PI9KrlafV{vQ7wDVDPP=7q>woZ|q7Jl7XeM7R z`xAOb>7Lz>Ka+-$MvDjdu&=nT@{&}A%|1Odx#7OZ$eoV8@r94ZTj`Rm#>nlB&^N%m zBi^R>`$B!H3EqS+DkGb4$Hs2oG?ahrviQ9OYmLB$MjR%l_F*3e<%lY!obSUGeBD83 z2QS6G$QE_1YUm$p+h1NIeJ~r0d`6M43>XIs64jv9#68M{eLcV7l9~&Vg}gjEY5e@w hmn9Q_*1e7&td`J^#pldEQ!lTg(YR%^AGCO}?-D1x9U zO9CQ_7Ol2LL}XtDDLabn2(ko0mL!Da{m<{^3{Hkw?ksPedq1D^N!~1X?#$f#opbLw z_uRCK(u{Bd%NHcuNmf;qWz43(uauW&JY5k=f2bmqarfksW^D=!)6PnhNhXwzn>$iCJB?&Aur0msT#C8W!OaWlp3`3do1?Rxz}j# z72Ei{5vd4Hm1KTI(s$ZZEzgrxTqcKLxPltp!z80gO6Yedbz_&$CjyeUNJ3ia(WA%r z_!#V8rQSyn`WOAJr@w<#dA&{Yp>hm8?~(L(C&@wj|9lm|eoougsD4kU-?ac5Ne-WX zjAS7}_A3m|$$+({46gyQ^!G_s8D1heMKVxF%l#wv(eW>&I5<^WXej-mkt5rjBdfYh zA_-auV9DA`SR-o)3fIY}bQ+x9Esg;=pVQe6fK{r&iD$0S@-k@q7qq>f24Iu;|J(VU zWNY&N1%vq>6*#Bp!0=JpUR6*~@HG`U0oecQlow!M=O=I~vbDT4<1SggHc>0nV#Y zhAv&YT&{qV%2N)FRo#ULSOIVV+mGN>9M)J5-IZeQMEtjE{O5=QjWRG$UKCT^Y+k!DsKZ7$| z5z5#N1CqpqOzOmjhJ%9OgtpYv1Q=~evP1F@(l-@gr zmFz_m3#47y#a6-h(RIOC4aR$@qFwAmt!Ey?PDrTY_chTr?-7M2%S@AUjj)p!h6j=q zoO<`OT@6ljr|It_ERVBsD6D=L49>|4d|^$e{o`RlS2RM}e=|Ue|9kc7^(}sGw+n)E zl~M-E_c1mO)uZjG%AkM~MyBPedNH4*vjk^j?Q=*hDjBYSl;oIK~hOK>0ex7wvO7sWuGJ?*drSRpXA( zIPVh#XN{^1u)5b!Uj1oz6D>HYn|>)Q=%hJcLdwWDQGSfYN^oifGm=sSoN9rK#_L)? zI0;T;aMJ#9cAvB2Pv~QC+8X0TePoOGH9FwLu^k}vJbnqQy5^YYG%id>NPcg(s}5Hw zc18M$CjSUHRrLxVf=(nWd7A{Mj^Afdih)xRe3hr*D=NWh3C?Hiew;AYCc$aXI7Gh} zzt)&Zs=zmniImm1PMf0Ux&R3s$9sh_%Z>2f7&=%QBjrzJS;gOeeM z>6*hu!O2q|52&|c3=;m8v~P~$*2I?gi6keKaef1wdGHdP zR$6Ci#+H{xUVMHEgA+1FJt!{0c}5pbBrmwdw3gtE7+Ul^KZY2AleZ6Kr}B#g!P$e3 znWeM+P9D!kIhFvfJTGFI~6 z$(=U6Hu}1Kq!HG~0H80XI5;6i5}dmEwPsDjDzCp=wP~xtrYXm zaU7h>`FZ`G{_keeetH?Xl2K3LDvl>G0|7m>Q(_sA0quFLosLlglHeHi7%JS;lxds1 zKP%!l>IN<~RiCd3$0waUS#xY-<=)lv*DiZ@-t@6Q-W3IK)+0<^ii6YCf!nX(b=5ac&_p?P;w%I6NByQ!Ep)BM&odqbo{d% z-Ym?%i0{E@AXqL5P6^J02IuK??8xrruZ_8WpJ(ta%jlBg;DoG9=1^(T0;f7*DyH2r zVF^wN&ZGfnME$I<+c$IS{p&n}=LW9=A}267ArDG$dR{IGP6^KB0cQg|>yN(sO4eF$ zretPz^Z_{cBeJ#xrv#@=J_aXip8Kaichjft-IFqB_yC+?B?66yLlfs?N*n$C9W1LH zfHr_|U5X2e1m~IHWNR}l`&W?Mh%x9?o%JQbnV_lq_`wf7a9^scck!r``cyREqyeW^)~{b5uBoXJhUd(w_qnyQ*Nrc2`mIC&r(QyY9-ex( z&LzAKDGOH#R=5s4ZO$vLcca}nqA93x_O@Au8msx@Hnq&v9=%Jf%XGJgT4qyT1vBg= zI57s#Lr22V#*!ACiWVxWeeU12Y@S=Kb8=a;pCu|dHDBZ@F15~fg7?$WrB-4jTi|@| zS8&qbpu+&xz1-AKENrH7_V-Fo=}mRCn>gUcN(a{;U{Qx3Fj&bnb-@W)x^!vyeWH)h8g=mepejqx2C&Bq8q)20Qw2CWMd8G6A zMQc?8ktppJ@AxH$*B)Tf9;50CJ zN`MnmRaIqeU7z)+TkHC($pTKUa77L^&b1c#{xgP_{`>p}P6S?YIn=TgV6ah7V)Z^h zuv0F@H3)8UUV{_s9l6nbO=dMp?z8_CV_*jFJ7o4hhaLpqo_wd^oyGZTA zVp%@ZIP*O4j_4<7aOoQ3_gP@mAk^38^#&Mdo7*KgNmj33Z3)gJ2RAQrxf382~L$*%`iGyeR#DG!CCCEaT2^DM77l)`wg6MEpk#hFlSp+iCZ}wFZD`GS>z+* zP*)G1+iwlVzwe6U)ZV(>+}sud?PZ47;H3M$!3*Eilme%fWxeiH^;REhoCQuQ2O=10 z%HA)|^XThxa&pprqH$(N+ocOGXK{X?c>;C!Gq1tv(wd%{;6y+W(|{uym_dB2P9dRL!loSi)!;@E9qRj!OPI44-t+m;?(XMiT((Gr|0 zS+HOMf)@*fnDbp%{V|6c=XDwg>~xUNNsfBdD1d}hgB6x$^~ubkmhAMM#Rj=YNY=aP zuD8^btF23Le8zLeD_sEne->@!m(c(x){K(iRLRPfE3MZfI=pkK55f7gLvXgy%q(%z zIC`5*34O~!p0oV`PJ@{)XFHvCs9x^YrGx!GgdN2DQw&TzJ+#U}UR7q!@N}K~9eyN6 z=H}*pJIx?OA;;6St+gXAL!&9csRGW;n>Skr`q;gEt`EmJ9nD!+2c@No^Fs%DEKf6u zuZhZS5$IS?KJhC!Inc$|ps6`{7k|*y!!jpRCh5Fu4em3?p#kzT6L30#``ZHTVY6F9 zX-a|f@ZrOj;KUm2J_M(eIpv2ndEDXPE8SP1Z133BQv3`~7tY(mJgA3%ws@Bd902Ji zFURK5y%(r+`)ua9R5znk0OyJoD=f!1k!DTny2el7Y4EvagEK7*b6Sl`Krw(AUM?!&DN)<{g2zsuNL##1?t=hn`JCbS#XMI zoA7^s`RO)C{RB>@4#e6h@J{>+sjL58f$|Noo3Gxy^#lf|-4DY;!S`x6lF>_=dbr5u z`HQW}#9`^|*0Xy}Ks?B!sn4Aa619#pETuu zz=1Y#jllDG)B!lpP9kvHozl2XupZf+zg?jz*K(WZzhPA-Hu%-rtRr2$0w0pNZqcJhk4BO1v$L~*;{cqU1uC)KNcFYJ zG{)&5An_@yl_D8Xb{E7Oqk+h2zDoJ*nsPQ$>^$p%hDeBZittL5}c zttZmd5mz4Z132M2kSct#wzz=X&l7X{}gXh-Kq7L2S;GGt^ zG|FukgwlSS_u9=va4wFL#(8I4z`1A7p773{J6#F#sI06M3RbKihjaE^*U(IGa3Z=k zz2v`oFeBtGgKodwd}_@ML=J?RsfHU6R-dHzKi=VUtJN-g=OT#6 zID8De0;iY8Aqh?o)6T6c-ti2Y{s8B5CS`v(&OsrxiAiHfSa4## zew@MisKI^i^y(VQY5`cT!{)i!5}XM$rdfYv!GcBe0Zm0l4e2;fg40qa2~@fd;|PJm zWCSMy_VT*o@pxwS=7IpR&yfs^x`6{qL+t_hfK^Kb~IjYB_9sd2_BouagP?b>y7MvWS?TMw9u6c-OZ zSsrS!S%Ooyay%sHBYLiv7JM5r(V{UVG&r5iyz;1#Vd$008r6eCo?!1 zQX6CZ+!hMd$Dl{oYR%8?u+8_-MS|04N#5hfKePk4Xv>7q<;x{FzYI(Z|4=*kzz|px z!__SZ2{eX;1}DG2dtwO9lZc^eRVEIO{E-Bw1gE788=SvNf-@q=wT{uE3B~}7i^c!| zALs@3NJemS-fzVSoI^y*MD^-dZm*|A!lM6=NN}boIE#vgQdd25kI%tbV>KsQpaSMZ zx$#$8bI)I7`AWmRvXA$KX7Q zi0)|~BnOpSR8COdx7ujqCa$UIA;d)SdvdM|2sdMiak-YD8`C%;RX7k)E z3C<(}XK~Sx8b@wP$p=nE+WB`*PRu6T$jKvP6w zJ*FZ!H6NX+{5*sLI#YcZO6Oe~trto8XP^#=7_*dFXHw(z0XQdyT5O3mIO!$it7B>+ zOc%hY6{@f^c$yyM@BG4BskY4{SwS)zE-qMHjVoHV+0?{XCajqa2vONavK!7^tgcAq zd<~5rA?B=BPPFksn#|g+keJPpMl4J_d5NsYBbx9$uz(rKU0r@T?Bq335S)wcOft#jS8$dTJ+#Hi z{Z1;)oFQwBOft#j(;y$&4%b@G{HLrjGRY*9FTwdj$<1?}+;4el#yDAHWRgiHUxIUD zsO3kFy6R==gJg}7NhXzifBBVB4_tdu5H0NhXWtHYb&4JR@t1Oft#jD{z(+|78c2 z`GnJZom|%Z23cEVl1V1tfOBwhan;07i;d3jHSkEw!U9r^7eU_JI z_LMcno7AUIpYId|0$KU_`7PzskV%3w0l_)AsPOX%q03jexkr+H6AQm{Zlb@(f`Wou z3-a^V2J`b*7zx2@UN8_CLC1bS*5#vXXHXfYlhl#y3Iqbzr+V9>dw!DM$pi=IO)-0q zB+E(Oqz_PjR#w*8F|1=v>3+8K?$zrj5}YXt&S8V|S5=f=y2~Xr!{wp$KPSU`Ea=ti zc4|yvYIM&K97B47Mojzn(s9+)=zbHcvgPIFolDpJh-7Op82q_k+7{h!1wHrwIyi4G z$tsig_%!W*m!zI#KAvw3KYplVw@GlO7&uFd`>h*aa^+IDz+~Ao?WvaMB@;ON<>p>u zb{rN2qsF&@jy({qb=I{B+9k?{GWw})xdi8Pmd6EycSSV#VDNDXP6#58C!DG+zFv8m+oT6+@d|nN07|E;#AfMbrSs=B>_C5iSXfy2Rik`za&o@Wr%#_2Sy@?M@d}(6La@qHGyKpz5D2vE9SHoA&b{2= zuqLqN!-$6C=$zITWoX*7XU}E{uW|P3^$UjC8D0t~Kb}j(a9B`qsmODucYY0?4-7zB z7~2IW&Zp~NjAt);@2G2d_X7tGJWsH$TtH=R%XRg}{{8!(Bf%LbNv1Bk3vh0P)mKvq zuSG*=qXVRh8_Ge_P9Ib^2&$+-_MRIdBjGzv^CCP@P1t9!3Q6_NcCKPMBC=D2LtZ4n#;4Cj{mJTkG#CR z3u*iFwEqMjr~Iv<@=qj~orPyezYp{FFHXNl(s)llzn(p>rfsjmYa(*4`aS07FQIGn zG5Q$NzRq;aGA^@n-gbJnf7gQ{o;zRbRHHKE9Rvb{BsgO)FC=5n!45c~O+_s0Dj0G_ zL}OS*8pp3uS{0Xk9Xs5Kj6^5TEzibK4m};7tGv*YgeKqC5nV(;ViVA0R z)mYgeXqJG5MMM1~v>2+SZ4CB52`x>Xk5yNlDtccuDkH6qwc9GSRz<(xA(?H}4UG7% z=I8%MKy&*yv_?Jc291{T`2bp+25@k(nr-Au8PQ&&2u|)g1Kg9f-FK5RO`~%*sDA$x z?}k2>|L1m$QvoNs&j$N@@cvs>&-T)YR&3xIfR7c!{&%Oh5#Z5t5E*`u;EcX3npW8C zn`ud!RDPVdVXQ|_SPL2#(ZB+M5t_z2l4PYoqka`IGTP6YO{2zP1x_@4bmdH-cBQt# zqO2&hKzTRN`K1EKRiayH@xiE8Kn?AN%XGI%xt)VE5P03_Jx03Xq>aHD9bHqSkC?%I z{0;uJsxrc*Da>P$Q3WTod%o74nw~?L_FZQ3JXT{UK~-P=3V&p29E!7)m!{7jU)uCr z$!z3Pz$qY~q2islqYxPF@Duu4NeRV2!S&Y z2$>zDobi-U#`I)yau)$7x;C&F8%T4bt}Tyaejw1Ow_AaTjyX!u=r0V; zK;UCK{wa$*(Ix#;BaKs|H5-8wV`pZ^Kx1PtcQAp*Es-v5&z@KF?=D)SjF;f#aayDI z*cxNamR9Y&yi6*?&5g!ggTe87;533=w82T|493{D#V`sCSIacu{8WN7K2ldvn*Ky# zVcJ<~DUj@1)%Cy$tE)icImi~wLnhK_Hj9A9xrZ(Irg_q}i`3wRu}QG2KGXu7*Pmf6 z)(Tt96)QXpVEAn|#v1K0PLp?ZUu4Rrv9_8p;Kav|wP&+;Uj+{c4LEm8aK>IfEiX$? zsp)?)1!pigQ?aTViJdV{fD@Ket31^%Mo|H0ATZjh42r)bTx%GdX^8|*D&GVA;hKc; zP_41gsH+Yyf;fV6zh!+=d1^>-#$M{FYd(JB(-&TtmSV{xa4r)Br>(isg5WH&S>Baa z-FpR`Rx_j&aH2ad{Jg)^I1>t-Fy6tKVt0(w%9|p};M{2I9vi^9OM){tW0^}Qg__-( zmZHfMa0UWP1&-TIK=_Bp;M{684yg;yKw!Aw80TQqX9s^#L6;mAByuB~n#oL+IDvCI zT#k|moQU?c#V$DEM=Ze^U3q^}DE*GK6i+b(=NhWC&zc<41O^keAE5v^SHP*-PM%(Z zQvm{Lk@pxKgKM)Ps0p9b$!Mx$+`&m&r(JN0%yo~7RXq@Rn6`axYUHA_smmw989g~f zGHPO3v$knINgj38mk4zQO#rJvQmws-_;F(PjfqBht=8(z?nqAxjd2D7#RA7wnsw=U zcFPH6-oE0;iK&7n=gg#QPmKdOr<-VNgY>{DVx?EWiMi~aX`JjwiWx&D_q0*{Vdbv+ z4hc?gWb>r5%rVd|M~-ZBPMXh>7vQ9dzgS>wFN=Yp7m&CK&maC&9T>z4oJ!-RzrQlb z6H^8EouP3CgTn+hPRsFAg63G1TQ9H&G|fm5=KTDZHF;y2=t{kAE~ag=k*0Hu!HEyx z=jy4Dr!_aYCpE+z#4Q<4&Q}iaN_+l(2wK#n4TCJk8Lo*9KZ)ay>yDo9Z4vtHQnPV zz!M$~h+^axoGPue7W3HQ6~OTZI&qwWD($mK2ym8{WfUZ=gfcr<49n<%rFkcoWPWGT zu#9h{$)w*!?%DHdXiXxTgF%DH#(0y+v6yv)SvEXhdoM8rTpp<0T$1brjDPj{fRdQg#!x{fJvqAn-bmNpFfg*I=-Zb}SP?LGW&DtX TN|J%%00000NkvXXu0mjfn$$tQ diff --git a/htdocs/theme/dolistore_logo.jpg b/htdocs/theme/dolistore_logo.jpg index b79280d819f5144fa0e3c2283bf1d839640de377..850ed55de9c0e038f5b812dd6ee4c0faf9bdeb7f 100644 GIT binary patch literal 30976 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 literal 14843 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 diff --git a/htdocs/theme/dolistore_logo.png b/htdocs/theme/dolistore_logo.png index 233f6599108cca6d770672d21953751d447eaa67..4aec905e1df2bd7725cdc03cd343193ce6dcb244 100644 GIT binary patch literal 28538 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 Mrk+N{t@{!G2a%v5EC2ui literal 9666 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 diff --git a/htdocs/theme/dolistore_logo.svg b/htdocs/theme/dolistore_logo.svg index 844010e19b5..5587f5c0f16 100644 --- a/htdocs/theme/dolistore_logo.svg +++ b/htdocs/theme/dolistore_logo.svg @@ -1,146 +1,93 @@ - - - Logo Dolibarr ERP-CRM - - - - - - + sodipodi:docname="dolistore.svg" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"> - - - - image/svg+xml - - Logo Dolibarr ERP-CRM - - - - Laurent Destailleur - - - - - Laurent Destailleur - - - - - - - - - - - - - - - Store - - - - - - + inkscape:current-layer="Calque_2" /> + + + + + + + + + + + + + From 640a4e5f0ccb50d2c1bfaa4c6ccff5edc6641efa Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 03:22:47 +0100 Subject: [PATCH 46/72] Avoid error --- htdocs/admin/modules.php | 82 ++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index f9cde4b5363..7ec045037ad 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -1272,55 +1272,57 @@ if ($mode == 'marketplace') { if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 1) { // $options is array with filter criteria - $nbmaxtoshow = $options['per_page']; - $options['per_page']++; + if (getDolGlobalInt('MAIN_ENANLE_OLD_DOLISTORE')) { + $nbmaxtoshow = $options['per_page']; + $options['per_page']++; - $remotestore->getRemoteCategories(); - $remotestore->getRemoteProducts($options); + $remotestore->getRemoteCategories(); + $remotestore->getRemoteProducts($options); - print ''.$langs->trans('DOLISTOREdescriptionLong').'

'; + print ''.$langs->trans('DOLISTOREdescriptionLong').'

'; - $previouslink = $remotestore->get_previous_link(); - $nextlink = $remotestore->get_next_link(); + $previouslink = $remotestore->get_previous_link(); + $nextlink = $remotestore->get_next_link(); - print '
'; + print '
'; + ?> -
-
    - get_categories(); // Do not use dol_escape_htmltag here, it is already a structured content?> -
-
+
+
    + get_categories(); // Do not use dol_escape_htmltag here, it is already a structured content?> +
+
-
- - - get_products($nbmaxtoshow); ?> - -
-
- + + + get_products($nbmaxtoshow); ?> + +
+ + Date: Sun, 12 Jan 2025 11:58:09 +0100 Subject: [PATCH 47/72] Sync transife --- htdocs/langs/ar_EG/blockedlog.lang | 3 + htdocs/langs/ar_EG/cashdesk.lang | 2 - htdocs/langs/ar_EG/commercial.lang | 1 - htdocs/langs/ar_EG/recruitment.lang | 2 - htdocs/langs/ar_IQ/blockedlog.lang | 3 + htdocs/langs/ar_IQ/categories.lang | 4 + htdocs/langs/ar_IQ/datapolicy.lang | 2 + htdocs/langs/ar_IQ/hrm.lang | 5 ++ htdocs/langs/ar_IQ/mails.lang | 18 +++++ htdocs/langs/ar_IQ/website.lang | 2 - htdocs/langs/de_AT/assets.lang | 2 - htdocs/langs/de_AT/bills.lang | 1 - htdocs/langs/de_AT/blockedlog.lang | 3 + htdocs/langs/de_AT/datapolicy.lang | 3 + htdocs/langs/de_AT/eventorganization.lang | 4 - htdocs/langs/de_AT/withdrawals.lang | 1 - htdocs/langs/de_CH/admin.lang | 3 - htdocs/langs/de_CH/assets.lang | 1 - htdocs/langs/de_CH/banks.lang | 2 - htdocs/langs/de_CH/bills.lang | 1 - htdocs/langs/de_CH/boxes.lang | 1 - htdocs/langs/de_CH/commercial.lang | 1 - htdocs/langs/de_CH/datapolicy.lang | 3 + htdocs/langs/de_CH/main.lang | 3 - htdocs/langs/de_CH/receptions.lang | 1 - htdocs/langs/de_CH/withdrawals.lang | 2 - htdocs/langs/de_DE/main.lang | 53 +++++++++--- htdocs/langs/el_CY/banks.lang | 2 - htdocs/langs/el_CY/blockedlog.lang | 3 + htdocs/langs/el_CY/categories.lang | 4 + htdocs/langs/el_CY/datapolicy.lang | 2 + htdocs/langs/el_CY/errors.lang | 2 + htdocs/langs/el_CY/eventorganization.lang | 4 - htdocs/langs/el_CY/website.lang | 2 - htdocs/langs/el_GR/boxes.lang | 32 ++++---- htdocs/langs/el_GR/main.lang | 40 ++++++++- htdocs/langs/en_AE/blockedlog.lang | 5 ++ htdocs/langs/en_AE/categories.lang | 5 ++ htdocs/langs/en_AE/datapolicy.lang | 3 + htdocs/langs/en_AE/eventorganization.lang | 4 - htdocs/langs/en_AE/mails.lang | 2 - htdocs/langs/en_AE/oauth.lang | 3 - htdocs/langs/en_AE/website.lang | 2 - htdocs/langs/en_AU/blockedlog.lang | 5 ++ htdocs/langs/en_AU/categories.lang | 5 ++ htdocs/langs/en_AU/datapolicy.lang | 3 + htdocs/langs/en_AU/eventorganization.lang | 4 - htdocs/langs/en_AU/mails.lang | 2 - htdocs/langs/en_AU/oauth.lang | 3 - htdocs/langs/en_AU/website.lang | 2 - htdocs/langs/en_CA/blockedlog.lang | 5 ++ htdocs/langs/en_CA/categories.lang | 5 ++ htdocs/langs/en_CA/datapolicy.lang | 3 + htdocs/langs/en_CA/eventorganization.lang | 4 - htdocs/langs/en_CA/mails.lang | 2 - htdocs/langs/en_CA/oauth.lang | 3 - htdocs/langs/en_CA/website.lang | 2 - htdocs/langs/en_GB/banks.lang | 1 - htdocs/langs/en_GB/blockedlog.lang | 5 ++ htdocs/langs/en_GB/categories.lang | 5 ++ htdocs/langs/en_GB/datapolicy.lang | 3 + htdocs/langs/en_GB/mails.lang | 2 - htdocs/langs/en_GB/oauth.lang | 3 - htdocs/langs/en_GB/withdrawals.lang | 1 - htdocs/langs/en_IN/blockedlog.lang | 5 ++ htdocs/langs/en_IN/categories.lang | 5 ++ htdocs/langs/en_IN/datapolicy.lang | 3 + htdocs/langs/en_IN/eventorganization.lang | 4 - htdocs/langs/en_IN/mails.lang | 2 - htdocs/langs/en_IN/oauth.lang | 3 - htdocs/langs/en_SG/blockedlog.lang | 5 ++ htdocs/langs/en_SG/categories.lang | 5 ++ htdocs/langs/en_SG/datapolicy.lang | 3 + htdocs/langs/en_SG/eventorganization.lang | 4 - htdocs/langs/en_SG/mails.lang | 2 - htdocs/langs/en_SG/members.lang | 2 + htdocs/langs/en_SG/oauth.lang | 3 - htdocs/langs/en_SG/website.lang | 2 - htdocs/langs/en_ZA/blockedlog.lang | 5 ++ htdocs/langs/en_ZA/categories.lang | 5 ++ htdocs/langs/en_ZA/datapolicy.lang | 3 + htdocs/langs/en_ZA/eventorganization.lang | 4 - htdocs/langs/en_ZA/mails.lang | 2 - htdocs/langs/en_ZA/oauth.lang | 3 - htdocs/langs/en_ZA/website.lang | 2 - htdocs/langs/es_AR/admin.lang | 1 - htdocs/langs/es_AR/assets.lang | 2 - htdocs/langs/es_AR/banks.lang | 1 - htdocs/langs/es_AR/boxes.lang | 1 - htdocs/langs/es_AR/cashdesk.lang | 1 - htdocs/langs/es_AR/commercial.lang | 1 - htdocs/langs/es_AR/donations.lang | 1 - htdocs/langs/es_AR/exports.lang | 2 - htdocs/langs/es_AR/sendings.lang | 1 - htdocs/langs/es_AR/withdrawals.lang | 2 - htdocs/langs/es_BO/blockedlog.lang | 3 + htdocs/langs/es_BO/categories.lang | 4 + htdocs/langs/es_BO/datapolicy.lang | 2 + htdocs/langs/es_BO/errors.lang | 2 + htdocs/langs/es_BO/mails.lang | 20 +++++ htdocs/langs/es_BO/website.lang | 2 - htdocs/langs/es_CL/admin.lang | 1 - htdocs/langs/es_CL/assets.lang | 2 - htdocs/langs/es_CL/banks.lang | 1 - htdocs/langs/es_CL/bills.lang | 2 - htdocs/langs/es_CL/boxes.lang | 1 - htdocs/langs/es_CL/cashdesk.lang | 1 - htdocs/langs/es_CL/commercial.lang | 1 - htdocs/langs/es_CL/donations.lang | 1 - htdocs/langs/es_CL/install.lang | 1 - htdocs/langs/es_CL/receptions.lang | 1 - htdocs/langs/es_CL/sendings.lang | 1 - htdocs/langs/es_CL/stocks.lang | 2 - htdocs/langs/es_CL/withdrawals.lang | 2 - htdocs/langs/es_CO/admin.lang | 1 - htdocs/langs/es_CO/banks.lang | 1 - htdocs/langs/es_CO/bills.lang | 2 - htdocs/langs/es_CO/boxes.lang | 1 - htdocs/langs/es_CO/cashdesk.lang | 1 - htdocs/langs/es_CO/commercial.lang | 1 - htdocs/langs/es_CO/donations.lang | 1 - htdocs/langs/es_CO/install.lang | 1 - htdocs/langs/es_CO/receptions.lang | 1 - htdocs/langs/es_CO/sendings.lang | 1 - htdocs/langs/es_CO/stocks.lang | 5 -- htdocs/langs/es_CO/ticket.lang | 1 - htdocs/langs/es_CO/withdrawals.lang | 3 - htdocs/langs/es_CR/admin.lang | 1 - htdocs/langs/es_CR/banks.lang | 1 - htdocs/langs/es_CR/bills.lang | 1 - htdocs/langs/es_CR/boxes.lang | 1 - htdocs/langs/es_CR/cashdesk.lang | 1 - htdocs/langs/es_CR/commercial.lang | 1 - htdocs/langs/es_CR/donations.lang | 1 - htdocs/langs/es_CR/install.lang | 1 - htdocs/langs/es_CR/receptions.lang | 1 - htdocs/langs/es_CR/sendings.lang | 1 - htdocs/langs/es_CR/stocks.lang | 3 - htdocs/langs/es_CR/withdrawals.lang | 3 - htdocs/langs/es_CU/admin.lang | 1 - htdocs/langs/es_CU/assets.lang | 1 - htdocs/langs/es_CU/banks.lang | 1 - htdocs/langs/es_CU/bills.lang | 1 - htdocs/langs/es_CU/boxes.lang | 1 - htdocs/langs/es_CU/cashdesk.lang | 1 - htdocs/langs/es_CU/commercial.lang | 1 - htdocs/langs/es_CU/compta.lang | 1 - htdocs/langs/es_CU/donations.lang | 1 - htdocs/langs/es_CU/install.lang | 1 - htdocs/langs/es_CU/receptions.lang | 1 - htdocs/langs/es_CU/sendings.lang | 1 - htdocs/langs/es_CU/stocks.lang | 2 - htdocs/langs/es_CU/ticket.lang | 1 - htdocs/langs/es_CU/withdrawals.lang | 3 - htdocs/langs/es_DO/blockedlog.lang | 3 + htdocs/langs/es_DO/categories.lang | 4 + htdocs/langs/es_DO/datapolicy.lang | 2 + htdocs/langs/es_DO/errors.lang | 2 + htdocs/langs/es_DO/mails.lang | 20 +++++ htdocs/langs/es_DO/website.lang | 2 - htdocs/langs/es_EC/admin.lang | 2 - htdocs/langs/es_EC/assets.lang | 2 - htdocs/langs/es_EC/banks.lang | 1 - htdocs/langs/es_EC/bills.lang | 1 - htdocs/langs/es_EC/boxes.lang | 1 - htdocs/langs/es_EC/cashdesk.lang | 1 - htdocs/langs/es_EC/commercial.lang | 1 - htdocs/langs/es_EC/donations.lang | 1 - htdocs/langs/es_EC/install.lang | 1 - htdocs/langs/es_EC/receptions.lang | 1 - htdocs/langs/es_EC/sendings.lang | 1 - htdocs/langs/es_EC/stocks.lang | 4 - htdocs/langs/es_EC/withdrawals.lang | 2 - htdocs/langs/es_GT/blockedlog.lang | 3 + htdocs/langs/es_GT/categories.lang | 4 + htdocs/langs/es_GT/datapolicy.lang | 2 + htdocs/langs/es_GT/errors.lang | 2 + htdocs/langs/es_GT/mails.lang | 20 +++++ htdocs/langs/es_GT/website.lang | 2 - htdocs/langs/es_HN/blockedlog.lang | 3 + htdocs/langs/es_HN/categories.lang | 4 + htdocs/langs/es_HN/datapolicy.lang | 2 + htdocs/langs/es_HN/errors.lang | 2 + htdocs/langs/es_HN/mails.lang | 20 +++++ htdocs/langs/es_HN/website.lang | 2 - htdocs/langs/es_MX/banks.lang | 1 - htdocs/langs/es_MX/commercial.lang | 1 - htdocs/langs/es_MX/datapolicy.lang | 2 + htdocs/langs/es_MX/withdrawals.lang | 1 - htdocs/langs/es_PA/blockedlog.lang | 3 + htdocs/langs/es_PA/categories.lang | 4 + htdocs/langs/es_PA/datapolicy.lang | 2 + htdocs/langs/es_PA/errors.lang | 2 + htdocs/langs/es_PA/mails.lang | 20 +++++ htdocs/langs/es_PA/website.lang | 2 - htdocs/langs/es_PE/assets.lang | 1 - htdocs/langs/es_PE/blockedlog.lang | 3 + htdocs/langs/es_PE/categories.lang | 4 + htdocs/langs/es_PE/datapolicy.lang | 2 + htdocs/langs/es_PE/members.lang | 3 + htdocs/langs/es_PY/blockedlog.lang | 3 + htdocs/langs/es_PY/categories.lang | 4 + htdocs/langs/es_PY/datapolicy.lang | 2 + htdocs/langs/es_PY/errors.lang | 2 + htdocs/langs/es_PY/mails.lang | 20 +++++ htdocs/langs/es_PY/website.lang | 2 - htdocs/langs/es_US/blockedlog.lang | 3 + htdocs/langs/es_US/categories.lang | 4 + htdocs/langs/es_US/datapolicy.lang | 2 + htdocs/langs/es_US/errors.lang | 2 + htdocs/langs/es_US/mails.lang | 20 +++++ htdocs/langs/es_US/website.lang | 2 - htdocs/langs/es_UY/blockedlog.lang | 3 + htdocs/langs/es_UY/categories.lang | 4 + htdocs/langs/es_UY/datapolicy.lang | 2 + htdocs/langs/es_UY/errors.lang | 2 + htdocs/langs/es_UY/mails.lang | 20 +++++ htdocs/langs/es_UY/website.lang | 2 - htdocs/langs/es_VE/blockedlog.lang | 3 + htdocs/langs/es_VE/datapolicy.lang | 2 + htdocs/langs/es_VE/exports.lang | 2 - htdocs/langs/es_VE/sendings.lang | 2 + htdocs/langs/es_VE/suppliers.lang | 2 + htdocs/langs/es_VE/website.lang | 2 - htdocs/langs/fr_BE/banks.lang | 2 - htdocs/langs/fr_BE/blockedlog.lang | 3 + htdocs/langs/fr_BE/categories.lang | 4 + htdocs/langs/fr_BE/datapolicy.lang | 3 + htdocs/langs/fr_BE/eventorganization.lang | 4 - htdocs/langs/fr_CA/admin.lang | 2 - htdocs/langs/fr_CA/banks.lang | 1 - htdocs/langs/fr_CA/blockedlog.lang | 37 +++++++++ htdocs/langs/fr_CA/datapolicy.lang | 8 ++ htdocs/langs/fr_CA/donations.lang | 1 - htdocs/langs/fr_CA/eventorganization.lang | 4 - htdocs/langs/fr_CA/mrp.lang | 98 +++++++++++++++++++++++ htdocs/langs/fr_CA/partnership.lang | 28 +++++++ htdocs/langs/fr_CA/sendings.lang | 1 - htdocs/langs/fr_CA/withdrawals.lang | 1 - htdocs/langs/fr_CH/banks.lang | 2 - htdocs/langs/fr_CH/blockedlog.lang | 3 + htdocs/langs/fr_CH/categories.lang | 4 + htdocs/langs/fr_CH/eventorganization.lang | 4 - htdocs/langs/fr_CH/mails.lang | 2 - htdocs/langs/fr_CI/banks.lang | 2 - htdocs/langs/fr_CI/blockedlog.lang | 3 + htdocs/langs/fr_CI/categories.lang | 4 + htdocs/langs/fr_CI/datapolicy.lang | 3 + htdocs/langs/fr_CI/eventorganization.lang | 4 - htdocs/langs/fr_CI/mails.lang | 2 - htdocs/langs/fr_CI/website.lang | 2 - htdocs/langs/fr_CM/blockedlog.lang | 3 + htdocs/langs/fr_CM/categories.lang | 4 + htdocs/langs/fr_CM/datapolicy.lang | 3 + htdocs/langs/fr_CM/eventorganization.lang | 4 - htdocs/langs/fr_CM/mails.lang | 2 - htdocs/langs/fr_FR/accountancy.lang | 24 ++++-- htdocs/langs/fr_FR/companies.lang | 16 ++-- htdocs/langs/fr_FR/salaries.lang | 5 +- htdocs/langs/fr_FR/website.lang | 20 ++--- htdocs/langs/fr_GA/banks.lang | 2 - htdocs/langs/fr_GA/blockedlog.lang | 3 + htdocs/langs/fr_GA/categories.lang | 4 + htdocs/langs/fr_GA/datapolicy.lang | 3 + htdocs/langs/fr_GA/eventorganization.lang | 4 - htdocs/langs/fr_GA/mails.lang | 2 - htdocs/langs/fr_GA/members.lang | 2 + htdocs/langs/fr_GA/website.lang | 2 - htdocs/langs/fr_TN/main.lang | 10 --- htdocs/langs/it_CH/blockedlog.lang | 3 + htdocs/langs/it_CH/categories.lang | 4 + htdocs/langs/it_CH/datapolicy.lang | 2 + htdocs/langs/it_CH/errors.lang | 2 + htdocs/langs/it_CH/eventorganization.lang | 4 - htdocs/langs/it_CH/mails.lang | 20 +++++ htdocs/langs/nl_BE/datapolicy.lang | 2 + htdocs/langs/nl_BE/eventorganization.lang | 4 - htdocs/langs/nl_BE/mrp.lang | 2 + htdocs/langs/nl_BE/multicurrency.lang | 9 +++ htdocs/langs/nl_BE/receptions.lang | 1 - htdocs/langs/nl_BE/stocks.lang | 1 - htdocs/langs/nl_BE/ticket.lang | 1 - htdocs/langs/pt_AO/blockedlog.lang | 3 + htdocs/langs/pt_AO/categories.lang | 4 + htdocs/langs/pt_AO/errors.lang | 2 + htdocs/langs/pt_AO/hrm.lang | 5 ++ htdocs/langs/pt_AO/mails.lang | 20 +++++ htdocs/langs/pt_AO/website.lang | 2 - htdocs/langs/pt_BR/admin.lang | 1 - htdocs/langs/pt_BR/assets.lang | 1 - htdocs/langs/pt_BR/banks.lang | 1 - htdocs/langs/pt_BR/bills.lang | 2 - htdocs/langs/pt_BR/commercial.lang | 1 - htdocs/langs/pt_BR/donations.lang | 1 - htdocs/langs/pt_BR/receptions.lang | 1 - htdocs/langs/pt_BR/stocks.lang | 1 - htdocs/langs/pt_BR/ticket.lang | 1 - htdocs/langs/pt_BR/withdrawals.lang | 2 - htdocs/langs/pt_MZ/admin.lang | 1 - htdocs/langs/pt_MZ/assets.lang | 1 - htdocs/langs/pt_MZ/bills.lang | 2 - htdocs/langs/pt_MZ/commercial.lang | 1 - htdocs/langs/pt_MZ/donations.lang | 1 - htdocs/langs/pt_MZ/receiptprinter.lang | 2 + htdocs/langs/ru_UA/blockedlog.lang | 3 + htdocs/langs/ru_UA/categories.lang | 4 + htdocs/langs/ru_UA/mails.lang | 20 +++++ htdocs/langs/ru_UA/website.lang | 2 - htdocs/langs/vi_VN/companies.lang | 12 ++- 309 files changed, 893 insertions(+), 384 deletions(-) create mode 100644 htdocs/langs/ar_EG/blockedlog.lang delete mode 100644 htdocs/langs/ar_EG/cashdesk.lang delete mode 100644 htdocs/langs/ar_EG/recruitment.lang create mode 100644 htdocs/langs/ar_IQ/blockedlog.lang create mode 100644 htdocs/langs/ar_IQ/categories.lang create mode 100644 htdocs/langs/ar_IQ/datapolicy.lang create mode 100644 htdocs/langs/ar_IQ/hrm.lang create mode 100644 htdocs/langs/ar_IQ/mails.lang delete mode 100644 htdocs/langs/ar_IQ/website.lang delete mode 100644 htdocs/langs/de_AT/assets.lang create mode 100644 htdocs/langs/de_AT/blockedlog.lang create mode 100644 htdocs/langs/de_AT/datapolicy.lang delete mode 100644 htdocs/langs/de_AT/eventorganization.lang create mode 100644 htdocs/langs/de_CH/datapolicy.lang delete mode 100644 htdocs/langs/el_CY/banks.lang create mode 100644 htdocs/langs/el_CY/blockedlog.lang create mode 100644 htdocs/langs/el_CY/categories.lang create mode 100644 htdocs/langs/el_CY/datapolicy.lang create mode 100644 htdocs/langs/el_CY/errors.lang delete mode 100644 htdocs/langs/el_CY/eventorganization.lang delete mode 100644 htdocs/langs/el_CY/website.lang create mode 100644 htdocs/langs/en_AE/blockedlog.lang create mode 100644 htdocs/langs/en_AE/categories.lang create mode 100644 htdocs/langs/en_AE/datapolicy.lang delete mode 100644 htdocs/langs/en_AE/eventorganization.lang delete mode 100644 htdocs/langs/en_AE/mails.lang delete mode 100644 htdocs/langs/en_AE/oauth.lang delete mode 100644 htdocs/langs/en_AE/website.lang create mode 100644 htdocs/langs/en_AU/blockedlog.lang create mode 100644 htdocs/langs/en_AU/categories.lang create mode 100644 htdocs/langs/en_AU/datapolicy.lang delete mode 100644 htdocs/langs/en_AU/eventorganization.lang delete mode 100644 htdocs/langs/en_AU/mails.lang delete mode 100644 htdocs/langs/en_AU/oauth.lang delete mode 100644 htdocs/langs/en_AU/website.lang create mode 100644 htdocs/langs/en_CA/blockedlog.lang create mode 100644 htdocs/langs/en_CA/categories.lang create mode 100644 htdocs/langs/en_CA/datapolicy.lang delete mode 100644 htdocs/langs/en_CA/eventorganization.lang delete mode 100644 htdocs/langs/en_CA/mails.lang delete mode 100644 htdocs/langs/en_CA/oauth.lang delete mode 100644 htdocs/langs/en_CA/website.lang create mode 100644 htdocs/langs/en_GB/blockedlog.lang create mode 100644 htdocs/langs/en_GB/categories.lang create mode 100644 htdocs/langs/en_GB/datapolicy.lang delete mode 100644 htdocs/langs/en_GB/mails.lang delete mode 100644 htdocs/langs/en_GB/oauth.lang create mode 100644 htdocs/langs/en_IN/blockedlog.lang create mode 100644 htdocs/langs/en_IN/categories.lang create mode 100644 htdocs/langs/en_IN/datapolicy.lang delete mode 100644 htdocs/langs/en_IN/eventorganization.lang delete mode 100644 htdocs/langs/en_IN/mails.lang delete mode 100644 htdocs/langs/en_IN/oauth.lang create mode 100644 htdocs/langs/en_SG/blockedlog.lang create mode 100644 htdocs/langs/en_SG/categories.lang create mode 100644 htdocs/langs/en_SG/datapolicy.lang delete mode 100644 htdocs/langs/en_SG/eventorganization.lang delete mode 100644 htdocs/langs/en_SG/mails.lang create mode 100644 htdocs/langs/en_SG/members.lang delete mode 100644 htdocs/langs/en_SG/oauth.lang delete mode 100644 htdocs/langs/en_SG/website.lang create mode 100644 htdocs/langs/en_ZA/blockedlog.lang create mode 100644 htdocs/langs/en_ZA/categories.lang create mode 100644 htdocs/langs/en_ZA/datapolicy.lang delete mode 100644 htdocs/langs/en_ZA/eventorganization.lang delete mode 100644 htdocs/langs/en_ZA/mails.lang delete mode 100644 htdocs/langs/en_ZA/oauth.lang delete mode 100644 htdocs/langs/en_ZA/website.lang delete mode 100644 htdocs/langs/es_AR/exports.lang create mode 100644 htdocs/langs/es_BO/blockedlog.lang create mode 100644 htdocs/langs/es_BO/categories.lang create mode 100644 htdocs/langs/es_BO/datapolicy.lang create mode 100644 htdocs/langs/es_BO/errors.lang create mode 100644 htdocs/langs/es_BO/mails.lang delete mode 100644 htdocs/langs/es_BO/website.lang create mode 100644 htdocs/langs/es_DO/blockedlog.lang create mode 100644 htdocs/langs/es_DO/categories.lang create mode 100644 htdocs/langs/es_DO/datapolicy.lang create mode 100644 htdocs/langs/es_DO/errors.lang create mode 100644 htdocs/langs/es_DO/mails.lang delete mode 100644 htdocs/langs/es_DO/website.lang create mode 100644 htdocs/langs/es_GT/blockedlog.lang create mode 100644 htdocs/langs/es_GT/categories.lang create mode 100644 htdocs/langs/es_GT/datapolicy.lang create mode 100644 htdocs/langs/es_GT/errors.lang create mode 100644 htdocs/langs/es_GT/mails.lang delete mode 100644 htdocs/langs/es_GT/website.lang create mode 100644 htdocs/langs/es_HN/blockedlog.lang create mode 100644 htdocs/langs/es_HN/categories.lang create mode 100644 htdocs/langs/es_HN/datapolicy.lang create mode 100644 htdocs/langs/es_HN/errors.lang create mode 100644 htdocs/langs/es_HN/mails.lang delete mode 100644 htdocs/langs/es_HN/website.lang create mode 100644 htdocs/langs/es_MX/datapolicy.lang create mode 100644 htdocs/langs/es_PA/blockedlog.lang create mode 100644 htdocs/langs/es_PA/categories.lang create mode 100644 htdocs/langs/es_PA/datapolicy.lang create mode 100644 htdocs/langs/es_PA/errors.lang create mode 100644 htdocs/langs/es_PA/mails.lang delete mode 100644 htdocs/langs/es_PA/website.lang create mode 100644 htdocs/langs/es_PE/blockedlog.lang create mode 100644 htdocs/langs/es_PE/categories.lang create mode 100644 htdocs/langs/es_PE/datapolicy.lang create mode 100644 htdocs/langs/es_PE/members.lang create mode 100644 htdocs/langs/es_PY/blockedlog.lang create mode 100644 htdocs/langs/es_PY/categories.lang create mode 100644 htdocs/langs/es_PY/datapolicy.lang create mode 100644 htdocs/langs/es_PY/errors.lang create mode 100644 htdocs/langs/es_PY/mails.lang delete mode 100644 htdocs/langs/es_PY/website.lang create mode 100644 htdocs/langs/es_US/blockedlog.lang create mode 100644 htdocs/langs/es_US/categories.lang create mode 100644 htdocs/langs/es_US/datapolicy.lang create mode 100644 htdocs/langs/es_US/errors.lang create mode 100644 htdocs/langs/es_US/mails.lang delete mode 100644 htdocs/langs/es_US/website.lang create mode 100644 htdocs/langs/es_UY/blockedlog.lang create mode 100644 htdocs/langs/es_UY/categories.lang create mode 100644 htdocs/langs/es_UY/datapolicy.lang create mode 100644 htdocs/langs/es_UY/errors.lang create mode 100644 htdocs/langs/es_UY/mails.lang delete mode 100644 htdocs/langs/es_UY/website.lang create mode 100644 htdocs/langs/es_VE/blockedlog.lang create mode 100644 htdocs/langs/es_VE/datapolicy.lang delete mode 100644 htdocs/langs/es_VE/exports.lang create mode 100644 htdocs/langs/es_VE/sendings.lang create mode 100644 htdocs/langs/es_VE/suppliers.lang delete mode 100644 htdocs/langs/es_VE/website.lang delete mode 100644 htdocs/langs/fr_BE/banks.lang create mode 100644 htdocs/langs/fr_BE/blockedlog.lang create mode 100644 htdocs/langs/fr_BE/categories.lang create mode 100644 htdocs/langs/fr_BE/datapolicy.lang delete mode 100644 htdocs/langs/fr_BE/eventorganization.lang create mode 100644 htdocs/langs/fr_CA/blockedlog.lang create mode 100644 htdocs/langs/fr_CA/datapolicy.lang delete mode 100644 htdocs/langs/fr_CA/eventorganization.lang create mode 100644 htdocs/langs/fr_CA/mrp.lang create mode 100644 htdocs/langs/fr_CA/partnership.lang delete mode 100644 htdocs/langs/fr_CH/banks.lang create mode 100644 htdocs/langs/fr_CH/blockedlog.lang create mode 100644 htdocs/langs/fr_CH/categories.lang delete mode 100644 htdocs/langs/fr_CH/eventorganization.lang delete mode 100644 htdocs/langs/fr_CH/mails.lang delete mode 100644 htdocs/langs/fr_CI/banks.lang create mode 100644 htdocs/langs/fr_CI/blockedlog.lang create mode 100644 htdocs/langs/fr_CI/categories.lang create mode 100644 htdocs/langs/fr_CI/datapolicy.lang delete mode 100644 htdocs/langs/fr_CI/eventorganization.lang delete mode 100644 htdocs/langs/fr_CI/mails.lang delete mode 100644 htdocs/langs/fr_CI/website.lang create mode 100644 htdocs/langs/fr_CM/blockedlog.lang create mode 100644 htdocs/langs/fr_CM/categories.lang create mode 100644 htdocs/langs/fr_CM/datapolicy.lang delete mode 100644 htdocs/langs/fr_CM/eventorganization.lang delete mode 100644 htdocs/langs/fr_CM/mails.lang delete mode 100644 htdocs/langs/fr_GA/banks.lang create mode 100644 htdocs/langs/fr_GA/blockedlog.lang create mode 100644 htdocs/langs/fr_GA/categories.lang create mode 100644 htdocs/langs/fr_GA/datapolicy.lang delete mode 100644 htdocs/langs/fr_GA/eventorganization.lang delete mode 100644 htdocs/langs/fr_GA/mails.lang create mode 100644 htdocs/langs/fr_GA/members.lang delete mode 100644 htdocs/langs/fr_GA/website.lang create mode 100644 htdocs/langs/it_CH/blockedlog.lang create mode 100644 htdocs/langs/it_CH/categories.lang create mode 100644 htdocs/langs/it_CH/datapolicy.lang create mode 100644 htdocs/langs/it_CH/errors.lang delete mode 100644 htdocs/langs/it_CH/eventorganization.lang create mode 100644 htdocs/langs/it_CH/mails.lang create mode 100644 htdocs/langs/nl_BE/datapolicy.lang delete mode 100644 htdocs/langs/nl_BE/eventorganization.lang create mode 100644 htdocs/langs/nl_BE/mrp.lang create mode 100644 htdocs/langs/nl_BE/multicurrency.lang create mode 100644 htdocs/langs/pt_AO/blockedlog.lang create mode 100644 htdocs/langs/pt_AO/categories.lang create mode 100644 htdocs/langs/pt_AO/errors.lang create mode 100644 htdocs/langs/pt_AO/hrm.lang create mode 100644 htdocs/langs/pt_AO/mails.lang delete mode 100644 htdocs/langs/pt_AO/website.lang create mode 100644 htdocs/langs/pt_MZ/receiptprinter.lang create mode 100644 htdocs/langs/ru_UA/blockedlog.lang create mode 100644 htdocs/langs/ru_UA/categories.lang create mode 100644 htdocs/langs/ru_UA/mails.lang delete mode 100644 htdocs/langs/ru_UA/website.lang diff --git a/htdocs/langs/ar_EG/blockedlog.lang b/htdocs/langs/ar_EG/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/ar_EG/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/ar_EG/cashdesk.lang b/htdocs/langs/ar_EG/cashdesk.lang deleted file mode 100644 index b62e4a9b9a2..00000000000 --- a/htdocs/langs/ar_EG/cashdesk.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - cashdesk -History=تاريخ diff --git a/htdocs/langs/ar_EG/commercial.lang b/htdocs/langs/ar_EG/commercial.lang index e0fae282fb0..9fb2cb7efcc 100644 --- a/htdocs/langs/ar_EG/commercial.lang +++ b/htdocs/langs/ar_EG/commercial.lang @@ -8,7 +8,6 @@ AddActionRendezVous=تحديد مقابلة ConfirmDeleteAction=هل انت واثق من حذف هذا الحدث؟ CardAction=كارتة حدث TaskRDVWith=مقابلة مع %s -ShowTask=إفتح المهمة ShowAction=إفتح الحدث ActionsReport=تقرير الاحداث ThirdPartiesOfSaleRepresentative=الجهات الخارجية و ممثلي المبيعات diff --git a/htdocs/langs/ar_EG/recruitment.lang b/htdocs/langs/ar_EG/recruitment.lang deleted file mode 100644 index e4e0f947961..00000000000 --- a/htdocs/langs/ar_EG/recruitment.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - recruitment -Recruitment=توظيف diff --git a/htdocs/langs/ar_IQ/blockedlog.lang b/htdocs/langs/ar_IQ/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/ar_IQ/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/ar_IQ/categories.lang b/htdocs/langs/ar_IQ/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/ar_IQ/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/ar_IQ/datapolicy.lang b/htdocs/langs/ar_IQ/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/ar_IQ/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/ar_IQ/hrm.lang b/htdocs/langs/ar_IQ/hrm.lang new file mode 100644 index 00000000000..73b810239f7 --- /dev/null +++ b/htdocs/langs/ar_IQ/hrm.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - hrm +RequiredRank=Required rank for the job profile +RequiredRankShort=Required rank +EmployeeRank=Employee rank for this skill +EmployeeRankShort=Employee rank diff --git a/htdocs/langs/ar_IQ/mails.lang b/htdocs/langs/ar_IQ/mails.lang new file mode 100644 index 00000000000..3fe9bd4edff --- /dev/null +++ b/htdocs/langs/ar_IQ/mails.lang @@ -0,0 +1,18 @@ +# Dolibarr language file - Source file is en_US - mails +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/ar_IQ/website.lang b/htdocs/langs/ar_IQ/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/ar_IQ/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/de_AT/assets.lang b/htdocs/langs/de_AT/assets.lang deleted file mode 100644 index fff217eafa1..00000000000 --- a/htdocs/langs/de_AT/assets.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - assets -DeleteType=Löschen diff --git a/htdocs/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang index ff1992eff0d..179a99a8af9 100644 --- a/htdocs/langs/de_AT/bills.lang +++ b/htdocs/langs/de_AT/bills.lang @@ -16,7 +16,6 @@ CreditNote=Gutschrift NewRelativeDiscount=Neue relative Rabatt RelatedBill=Verwandte Rechnung PaymentTypeShortTRA=Entwurf -BIC=BIC BICNumber=BIC LawApplicationPart2=Die Ware bleibt Eigentum der LawApplicationPart4=ihren Preis. diff --git a/htdocs/langs/de_AT/blockedlog.lang b/htdocs/langs/de_AT/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/de_AT/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/de_AT/datapolicy.lang b/htdocs/langs/de_AT/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/de_AT/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/de_AT/eventorganization.lang b/htdocs/langs/de_AT/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/de_AT/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/de_AT/withdrawals.lang b/htdocs/langs/de_AT/withdrawals.lang index 6f5a8394451..dff3b801b9e 100644 --- a/htdocs/langs/de_AT/withdrawals.lang +++ b/htdocs/langs/de_AT/withdrawals.lang @@ -3,4 +3,3 @@ WithdrawalRefused=Abbuchungen abgelehnt StatusWaiting=Wartestellung StatusMotif2=Abbuchung angefochten StatusMotif5=Fehlerhafte Kontodaten -OrderWaiting=Wartestellung diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang index 92cf20fd81c..386444bffcc 100644 --- a/htdocs/langs/de_CH/admin.lang +++ b/htdocs/langs/de_CH/admin.lang @@ -149,7 +149,6 @@ Orientation=Orientierung SpaceX=Leerraum X SpaceY=Leerraum Y ContentForLines=Inhalt, der für jedes Produkt oder jede Dienstleistung angezeigt werden soll (von Variable __LINES__ des Inhalts) -NoticePeriod=Kündigungsfrist EMailsSetup=E-Mail Einstellungen EMailsDesc=Auf dieser Seite können Sie Parameter oder Optionen für den E-Mail-Versand einstellen. EmailSenderProfiles=Absenderprofil @@ -601,14 +600,12 @@ NewEmailCollector=Neuer E-Mail - Sammeldienst EMailHost=IMAP Server Host EmailCollectorConfirmCollectTitle=E-Mail - Sammeldienst Bestätigung NoNewEmailToProcess=Ich habe keinen neuen E-Mails (die zu den Filtern passen) abzuarbeiten. -OperationParamDesc=Define the rules to use to extract some data or set values to use for operation.

Example to extract a string from email header, subject or body into a temporary variable:
tmp_var1=EXTRACT:HEADER:My regex ([^\n]*)
tmp_var2=EXTRACT:SUBJECT:My refex ([^\n]*)
tmp_var3=EXTRACT:BODY:My regex ([^\n]*)

Examples to set the properties of an object to create:
objproperty1=SET:a hard coded value
objproperty2=SET:__tmp_var__
objproperty3=SETIFEMPTY:a value (value is set only if property is not already defined)
objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)
options_myextrafield1=EXTRACT:SUBJECT:([^\n]*)
object.objproperty5=EXTRACT:BODY:My company name is\\s([^\\s]*)

Use a new line to extract or set several properties. ResourceSetup=Modul Ressourcen einrichten UseSearchToSelectResource=Zeige eine Suchmaske für Ressourcen, statt eine Drop-down - Liste DisabledResourceLinkUser=Verknüpfungsmöglichkeit zwischen Ressource und Benutzer unterbinden. DisabledResourceLinkContact=Verknüpfungsmöglichkeit zwischen Ressource und Kontakt unterbinden. ConfirmUnactivation=Bestätige das Zurücksetzen des Moduls. ExportSetup=Modul Daten-Export einrichten -EmailCollectorLoadThirdPartyHelp=You can use this action to use the email content to find and load an existing third party in your database (search will be done on the defined property among 'id','name','name_alias','email'). The found (or created) third party will be used for following actions that need it.
For example, if you want to create a third party with a name extracted from a string 'Name: name to find' present into the body, use the sender email as email, you can set the parameter field like this:
'email=EXTRACT:HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'
FeatureNotAvailableWithReceptionModule=Diese Funktion ist nicht verfügbar, wenn das Modul 'Lieferungen' aktiv ist DictionaryProductNature=Produktart ModuleZapierForDolibarrDesc=Modul Zapier für Dolibarr diff --git a/htdocs/langs/de_CH/assets.lang b/htdocs/langs/de_CH/assets.lang index 4980d74fdb3..e0336f5a463 100644 --- a/htdocs/langs/de_CH/assets.lang +++ b/htdocs/langs/de_CH/assets.lang @@ -3,7 +3,6 @@ NewAsset=Neuer Vermögenswert AssetsLines=Vermögen DeleteAnAssetType=Vermögenstyp löschen ConfirmDeleteAssetType=Bist du sicher, dass du diesen Vermögenstyp löschen willst? -ShowTypeCard=Typ anzeigen '%s' AssetsType=Vermögenstyp AssetsTypeId=ID Vermögenswert AssetsTypeLabel=Beschreibung Vermögenstyp diff --git a/htdocs/langs/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang index 095b079a84e..3c493eb5c9b 100644 --- a/htdocs/langs/de_CH/banks.lang +++ b/htdocs/langs/de_CH/banks.lang @@ -9,7 +9,6 @@ CashAccounts=Kassen ErrorBankLabelAlreadyExists=Kontenbezeichnung existiert bereits BankBalanceBefore=Bilanz vor BankBalanceAfter=Bilanz nach -AllTime=Vom start SwiftValid=BIC/SWIFT gültig SwiftNotValid=BIC/SWIFT ungültig IbanValid=BAN gültig @@ -68,7 +67,6 @@ BankTransactionLine=Transaktion AllAccounts=Alle Bank- und Barkonten ShowAllAccounts=Alle Finanzkonten FutureTransaction=Diese zukünftige Transaktion kann ich nicht ausgleichen -EventualyAddCategory=Optionally, a category in which to classify the operations ToConciliate=Auszugleichen ? DefaultRIB=Standart Bankkonto-Nummer AllRIB=Alle Bankkonto-Nummern diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang index 42bab7b95fe..436cf2afaec 100644 --- a/htdocs/langs/de_CH/bills.lang +++ b/htdocs/langs/de_CH/bills.lang @@ -147,7 +147,6 @@ HelpAbandonOther=Dieser Betrag wurde auf Grund eines Fehlers aufgegeben (falsche IdSocialContribution=Sozialabgaben/Unternehmenssteuer Zahlungs-ID PaymentId=Zahlung id PaymentRef=Zahlungsreferenz -InvoiceRef=Rechnungs Nr. OrderBilled=Bestellung verrechnet PaymentNumber=Zahlung Nr. WatermarkOnDraftBill=Wasserzeichen auf Rechnungs-Entwurf (keines, falls leer) diff --git a/htdocs/langs/de_CH/boxes.lang b/htdocs/langs/de_CH/boxes.lang index 3f7e48871c9..33aea427081 100644 --- a/htdocs/langs/de_CH/boxes.lang +++ b/htdocs/langs/de_CH/boxes.lang @@ -33,7 +33,6 @@ NoRecordedBookmarks=Keine Lesezeichen gesetzt. Klicken Sie hier ClickToAdd=Hier klicken um hinzuzufügen. NoRecordedInterventions=Keine verzeichneten Einsätze BoxLatestSupplierOrdersAwaitingReception=Die neuesten Bestellungen (nicht ausgeliefert) -NoSupplierOrder=Keine erfassten Lieferantenbestellungen NoTooLowStockProducts=Keine Produkte unter der min. Warenlimite BoxProductDistribution=Vertrieb Produkte / Dienstleistungen ForObject=Am %s diff --git a/htdocs/langs/de_CH/commercial.lang b/htdocs/langs/de_CH/commercial.lang index 9e479e701f8..cfb42660ed5 100644 --- a/htdocs/langs/de_CH/commercial.lang +++ b/htdocs/langs/de_CH/commercial.lang @@ -8,7 +8,6 @@ ConfirmDeleteAction=Willst du dieses Ereignis wirklich löschen? CardAction=Ereignisse Übersicht ActionOnCompany=Verknüpfte Firma TaskRDVWith=Treffen mit %s -ShowTask=Zeige Aufgabe ShowAction=Ereignisse anzeigen ThirdPartiesOfSaleRepresentative=Partner mit Vertriebsmitarbeiter SaleRepresentativesOfThirdParty=Vertriebsmitarbeiter des Partners diff --git a/htdocs/langs/de_CH/datapolicy.lang b/htdocs/langs/de_CH/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/de_CH/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang index 15e1eda5b27..8817527f2cd 100644 --- a/htdocs/langs/de_CH/main.lang +++ b/htdocs/langs/de_CH/main.lang @@ -63,7 +63,6 @@ RecordGenerated=Datensatz erzeugt DolibarrInHttpAuthenticationSoPasswordUseless=Der Dolibarr Authentifizierungsmodus steht auf %s in der Konfigurationsdatei. Das heisst, dass Änderungen in diesem Feld keine Auswirkung haben werden, weil die Passwort - Datenbank ausserhalb der Dolibarr - Umgebung liegt. PasswordForgotten=Hast du dein Passwort vergessen? NoAccount=Ich habe kein Benutzerkonto -HomeArea=Start LastConnexion=Zuletzt gesehen am: PreviousConnexion=Davor zuletzt gesehen am: AuthenticationMode=Authentifizierungsmodus @@ -74,7 +73,6 @@ InformationLastAccessInError=Informationen zum letzten Datenbankfehler YouCanSetOptionDolibarrMainProdToZero=Für weitere Informationen schaust du in der Logdatei nach, oder setzest in der Konfigurationsdatei die Option $dolibarr_main_prod auf '0'. LineID=Zeilennummer WarningYouHaveAtLeastOneTaskLate=Obacht, mindestens ein Element ist verspätet. -Home=Start MediaBrowser=Mediabrowser SelectedPeriod=Gewählter Zeitraum PreviousPeriod=Vorangegangener Zeitraum @@ -125,7 +123,6 @@ UserValidationShort=Validieren Second=Zweitens Morning=Morgen Afternoon=Nachmittag -MinuteShort=min DefaultValues=Standardwerte PriceCurrency=Währung UnitPriceHTCurrency=Nettopreis diff --git a/htdocs/langs/de_CH/receptions.lang b/htdocs/langs/de_CH/receptions.lang index b9d428e71d7..a9900325ee0 100644 --- a/htdocs/langs/de_CH/receptions.lang +++ b/htdocs/langs/de_CH/receptions.lang @@ -5,7 +5,6 @@ Receptions=Lieferungen AllReceptions=Alle Lieferungen ShowReception=Lieferungen anzeige ReceptionsArea=Lieferungen -ListOfReceptions=Liste der Lieferungen ReceptionMethod=Liefermethode LastReceptions=Die neusten %s Lieferungen StatisticsOfReceptions=Lieferstatistiken diff --git a/htdocs/langs/de_CH/withdrawals.lang b/htdocs/langs/de_CH/withdrawals.lang index a463956f90c..d695322c9e4 100644 --- a/htdocs/langs/de_CH/withdrawals.lang +++ b/htdocs/langs/de_CH/withdrawals.lang @@ -1,10 +1,8 @@ # Dolibarr language file - Source file is en_US - withdrawals StandingOrderPayment=Bankeinzug/Lastschrift -WithdrawalReceipt=Bankeinzug / Lastschrift WithdrawalRefusedConfirm=Möchten Sie wirklich eine Abbuchungsablehnung zu diesem Geschäftspartner erstellen? StatusPaid=Verarbeitet StatusMotif4=Kundenbestellungen -OrderWaiting=Wartend NumeroNationalEmetter=Nat. Überweisernummer CreditDate=Am RefSalary=Lohn diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index 748dd568ae2..79a615bd1af 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -37,6 +37,7 @@ Translation=Übersetzung Translations=Übersetzungen CurrentTimeZone=Aktuelle Zeitzone des PHP-Servers EmptySearchString=Keine leeren Suchkriterien eingeben +EnterNonEmptyLinesFirst=zuerst die Zeilen eingeben, die nicht leer sind EnterADateCriteria=Geben Sie ein Datumskriterium ein NoRecordFound=Keinen Eintrag gefunden NoRecordDeleted=Keine Datensätze gelöscht @@ -45,6 +46,7 @@ NoError=kein Fehler Error=Fehler Errors=Fehler ErrorFieldRequired=Feld '%s' ist erforderlich +CustomMandatoryFieldRule=Benutzerdefinierte Regel für „Pflichtfeld“ ErrorFieldFormat=Der Wert in Feld '%s' ist ungültig ErrorFileDoesNotExists=Die Datei %s existiert nicht ErrorFailedToOpenFile=Fehler beim Öffnen der Datei %s @@ -110,7 +112,7 @@ Undefined=Nicht definiert PasswordForgotten=Passwort vergessen? NoAccount=Kein Konto? SeeAbove=Siehe oben -HomeArea=Startseite +HomeArea=Start LastConnexion=Letzte Anmeldung PreviousConnexion=Vorherige Anmeldung PreviousValue=Vorheriger Wert @@ -141,7 +143,7 @@ Yes=Ja no=nein No=Nein All=Alle -Home=Startseite +Home=Start Help=Hilfe OnlineHelp=Online-Hilfe PageWiki=Wiki-Seite @@ -308,6 +310,7 @@ DateBuild=Datum der Berichterstellung DatePayment=Zahlungsdatum DateApprove=Genehmigungsdatum DateApprove2=Genehmigungsdatum (zweite Genehmigung) +PendingSince=Ausstehend seit RegistrationDate=Registrierungsdatum UserCreation=Erzeuge Datenbank-Benutzer UserModification=Aktualisierung Benutzer @@ -349,12 +352,12 @@ Afternoon=nachmittags Quadri=vierfach MonthOfDay=Tag des Monats DaysOfWeek=Wochentage -HourShort=H -MinuteShort=mn -SecondShort=Sek +HourShort=h +MinuteShort=min +SecondShort=sek DayShort=d MonthShort=m -YearShort=J +YearShort=a Rate=Rate CurrencyRate=Wechselkurs UseLocalTax=inkl. MwSt. @@ -384,8 +387,8 @@ UnitPriceHTCurrency=Stückpreis (netto) (Währung) UnitPriceTTC=Stückpreis (brutto) PriceU=Einzelpr. PriceUHT=EP (netto) -PriceUHTCurrency=Einzelpr. (netto) (Währung) -PriceUTTC=Einzelpr. (brutto) +PriceUHTCurrency=EP (netto) (Währung) +PriceUTTC=EP (brutto) Amount=Betrag Amounts=Beträge AmountInvoice=Rechnungsbetrag @@ -536,7 +539,7 @@ By=Durch From=Von FromDate=Von FromLocation=von -to=An +to=Bis To=An ToDate=bis ToLocation=An @@ -721,6 +724,8 @@ TextUsedInTheMessageBody=E-Mail Text SendAcknowledgementByMail=Bestätigungsmail senden SendMail=E-Mail versenden Email=E-Mail +EMail=E-Mail +EMails=E-Mail NoEMail=Keine E-Mail-Adresse(n) vorhanden AlreadyRead=Bereits gelesen NotRead=Ungelesen @@ -879,6 +884,7 @@ toward=zu Access=Zugriff SelectAction=Aktion auswählen SelectTargetUser=Zielbenutzer/Mitarbeiter wählen +ClickToCopyToClipboard=Klicken, um in die Zwischenablage zu kopieren HelpCopyToClipboard=Benutze Ctrl+C für Kopie in Zwischenablage SaveUploadedFileWithMask=Datei auf dem Server unter dem Namen "%s" speichern (wenn deaktiviert wird der %s benutzt) OriginFileName=original Dateiname @@ -925,6 +931,7 @@ ConfirmMassDeletionQuestion=Möchten Sie den/die %s ausgewählten Datensa ConfirmMassClone=Bestätigung des Massen-Klonens ConfirmMassCloneQuestion=Wählen Sie das Projekt aus, in das geklont werden soll ConfirmMassCloneToOneProject=In Projekt %s klonen +ObjectClonedSuccessfuly=Objekt erfolgreich dupliziert RelatedObjects=Verknüpfte Objekte ClassifyBilled=Als 'fakturiert' markieren ClassifyUnbilled=Als 'nicht fakturiert' markieren @@ -961,10 +968,11 @@ PrivateDownloadLinkDesc=Sie müssen eingeloggt sein und Berechtigungen zum Anzei Download=Download DownloadDocument=Dokument herunterladen DownloadSignedDocument=Unterzeichnetes Dokument herunterladen -ActualizeCurrency=Wechselkurs aktualisieren +ActualizeCurrency=Letzten bekannten Wechselkurs verwenden Fiscalyear=Fiskalisches Jahr ModuleBuilder=Module Builder für Module und Anwendungen SetMultiCurrencyCode=Währung festlegen +SetMultiCurrencyRate=Wechselkurs festlegen BulkActions=Massenaktionen ClickToShowHelp=Klicken um die Tooltiphilfe anzuzeigen WebSite=Website @@ -1104,6 +1112,7 @@ PayedBy=Bezahlt von PayedTo=Bezahlt Monthly=Monatlich Quarterly=Quartalsweise +Quarter=Quartal Annual=Jährlich Local=Lokal Remote=Remote @@ -1306,3 +1315,27 @@ TranslationOfKey=Übersetzung vom Schlüssel AnyTranslationKey SignedStatus=Status Unterschrift NbRecordQualified=Zahl von qualifizierten Datensätzen auto=automatisch +UploadFile=Direkter Import des Dokuments +OrClickToSelectAFile=oder klicken, um ein Datei von der Festplatte auszuwählen +NetTotal=Nettosumme +VATAmount=USt.-Betrag +TotalDiscount=Gesamtrabatt +TotalHTBeforeDiscount=Gesamtnetto vor Rabatt +Contains=Enthält +DoesNotContain=Enthält nicht +Is=Ist +IsNot=Ist nicht +StartsWith=Beginnt mit +EndsWith=Endet mit +IsBefore=Ist vor +IsAfter=Ist nach +IsOnOrBefore=Ist vor oder gleich +IsOnOrAfter=Ist nach oder gleich +IsHigherThan=Ist größer als +IsHigherThanOrEqual=Ist größer oder gleich +IsLowerThan=Ist niedriger als +IsLowerThanOrEqual=Ist kleiner oder gleich +addToFilter=Hinzufügen +FilterAssistance=Filter-Editor +Operator=Operator +AllFieldsRequired=Alle Felder sind Pflichtfelder. diff --git a/htdocs/langs/el_CY/banks.lang b/htdocs/langs/el_CY/banks.lang deleted file mode 100644 index e3f16ee0ec6..00000000000 --- a/htdocs/langs/el_CY/banks.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - banks -EventualyAddCategory=Optionally, a category in which to classify the operations diff --git a/htdocs/langs/el_CY/blockedlog.lang b/htdocs/langs/el_CY/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/el_CY/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/el_CY/categories.lang b/htdocs/langs/el_CY/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/el_CY/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/el_CY/datapolicy.lang b/htdocs/langs/el_CY/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/el_CY/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/el_CY/errors.lang b/htdocs/langs/el_CY/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/el_CY/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/el_CY/eventorganization.lang b/htdocs/langs/el_CY/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/el_CY/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/el_CY/website.lang b/htdocs/langs/el_CY/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/el_CY/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang index f69f61b6bf9..3459523037d 100644 --- a/htdocs/langs/el_GR/boxes.lang +++ b/htdocs/langs/el_GR/boxes.lang @@ -15,7 +15,7 @@ BoxLastCustomers=Τελευταίοι τροποποιημένοι πελάτε BoxLastSuppliers=Τελευταίοι τροποποιημένοι προμηθευτές BoxLastCustomerOrders=Τελευταίες εντολές πωλήσεων BoxLastActions=Τελευταίες ενέργειες -BoxLastContracts=Τελευταία συμβόλαια +BoxLastContracts=Τελευταίες συμβάσεις BoxLastContacts=Τελευταίες επαφές/διευθύνσεις BoxLastMembers=Τελευταία μέλη BoxLastModifiedMembers=Τελευταία τροποποιημένα μέλη @@ -50,7 +50,7 @@ BoxLastExpiredServices=Τελευταίες %s παλαιότερες επαφέ BoxTitleLastActionsToDo=Τελευταίες %s ενέργειες προς πραγματοποίηση BoxTitleOldestActionsToDo=Τα παλαιότερα %s συμβάντα που πρέπει να γίνουν, μη ολοκληρωμένα BoxTitleFutureActions=Τα επόμενα %s επερχόμενα συμβάντα -BoxTitleLastContracts=Τελευταία %s τροποποιημένα συμβόλαια +BoxTitleLastContracts=Τελευταία %s τροποποιημένες συμβάσεις BoxTitleLastModifiedDonations=Τελευταίες %s τροποποιημένες δωρεές BoxTitleLastModifiedExpenses=Τελευταίες %s αναφορές εξόδων που τροποποιήθηκαν BoxTitleLatestModifiedBoms=Τελευταία %s BOM που τροποποιήθηκαν @@ -65,23 +65,24 @@ FailedToRefreshDataInfoNotUpToDate=Αποτυχία ανανέωσης ροής LastRefreshDate=Ημερομηνία τελευταίας ανανέωσης NoRecordedBookmarks=Δεν υπάρχουν σελιδοδείκτες που ορίζονται. Κάντε κλικ εδώ για να προσθέσετε σελιδοδείκτες. ClickToAdd=Πατήστε εδώ για προσθήκη. -NoRecordedCustomers=Δεν υπάρχουν καταχωρημένοι πελάτες -NoRecordedContacts=Δεν υπάρχουν καταγεγραμμένες επαφές +NoRecordedCustomers=Δεν έχουν καταγραφεί πελάτες +NoRecordedContacts=Δεν έχουν καταγραφεί επαφές NoActionsToDo=Δεν υπάρχουν ενέργειες που πρέπει να γίνουν -NoRecordedOrders=Δεν υπάρχουν καταγεγραμμένες εντολές πωλήσεων -NoRecordedProposals=Δεν υπάρχουν καταχωρημένες προσφορές -NoRecordedInvoices=Δεν υπάρχουν καταγεγραμμένα τιμολόγια πελατών +NoRecordedOrders=Δεν έχουν καταγραφεί εντολές πωλήσεων +NoRecordedProposals=Δεν έχουν καταγραφεί προσφορές +NoRecordedInvoices=Δεν έχουν καταγραφεί τιμολόγια πελάτων NoUnpaidCustomerBills=Δεν υπάρχουν απλήρωτα τιμολόγια πελατών NoUnpaidSupplierBills=Δεν υπάρχουν απλήρωτα τιμολόγια προμηθευτών -NoModifiedSupplierBills=Δεν υπάρχουν καταγεγραμμένα τιμολόγια προμηθευτή -NoRecordedProducts=Δεν υπάρχουν καταχωρημένα προϊόντα/υπηρεσίες -NoRecordedProspects=Καμία καταγεγραμμένη προοπτική -NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβόλαια με προϊόντα/υπηρεσίες -NoRecordedContracts=Δεν υπάρχουν καταχωρημένα συμβόλαια +NoModifiedSupplierBills=Δεν έχουν καταγραφεί τιμολόγια προμηθευτών +NoRecordedProducts=Δεν έχουν καταγραφεί προϊόντα/υπηρεσίες +NoRecordedProspects=Δεν έχουν καταγραφεί προοπτικές +NoContractedProducts=Δεν υπάρχουν καταχωρημένες συμβάσεις με προϊόντα/υπηρεσίες +NoRecordedContracts=Δεν έχουν καταγραφεί συμβάσεις NoRecordedInterventions=Δεν έχουν καταγραφεί παρεμβάσεις +NoRecordedBankAccounts=Δεν έχουν καταγραφεί οικονομικοί λογαριασμοί +NoSupplierOrder=Δεν έχει καταγραφεί καμία αγορά Παραγγελία BoxLatestSupplierOrders=Τελευταίες παραγγελίες αγοράς BoxLatestSupplierOrdersAwaitingReception=Τελευταίες παραγγελίες αγοράς (εν αναμονή παραλαβής) -NoSupplierOrder=Καμία καταγεγραμμένη εντολή αγοράς BoxCustomersInvoicesPerMonth=Τιμολόγιο Πελατών ανά μήνα BoxSuppliersInvoicesPerMonth=Τιμολόγια προμηθευτή ανά μήνα BoxCustomersOrdersPerMonth=Παραγγελίες Πωλήσεων ανά μήνα @@ -100,7 +101,7 @@ BoxTitleLatestModifiedCandidatures=Τελευταίες %s τροποποιημ ForCustomersInvoices=Τιμολόγια Πελάτη ForCustomersOrders=Παραγγελίες πελατών ForProposals=Προσφορές -LastXMonthRolling=Τελευταίοι %s κυλιόμενοι μήνες +LastXMonthRolling=Τελευταίοι %s μήνες ChooseBoxToAdd=Προσθήκη γραφικού στοιχείου στον πίνακα ελέγχου BoxAdded=Το γραφικό στοιχείο προστέθηκε στον πίνακα ελέγχου. BoxTitleUserBirthdaysOfMonth=Γενέθλια αυτού του μήνα (χρήστες) @@ -118,6 +119,9 @@ NoRecordedShipments=Καμία καταγεγραμμένη αποστολή π BoxCustomersOutstandingBillReached=Πελάτες που έχουν φτάσει το όριο μέγιστου οφειλόμενου BoxTitleLastFediverseInfos=Τελευταίες %s αναρτήσεις από %s BoxLastFediverseInfos=Τελευταίες ενημερώσεις Fediverse: Ειδήσεις και Τάσεις +NoOpenedProjectsOpportunities=Δεν υπάρχουν ανοιχτές ευκαιρίες +NoOpenedProjects=Δεν υπάρχουν ανοιχτά έργα +NoScheduledJobs=Δεν υπάρχουν προγραμματισμένες εργασίες # Pages UsersHome=Χρήστες και ομάδες MembersHome=Μέλη diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang index a50d76c8d57..aa29743448d 100644 --- a/htdocs/langs/el_GR/main.lang +++ b/htdocs/langs/el_GR/main.lang @@ -37,8 +37,9 @@ Translation=Μετάφραση Translations=Μεταφράσεις CurrentTimeZone=TimeZone PHP (server) EmptySearchString=Εισάγετε μη κενά κριτήρια αναζήτησης +EnterNonEmptyLinesFirst=εισάγετε πρώτα μη κενές γραμμές EnterADateCriteria=Εισαγάγετε κριτήρια ημερομηνίας -NoRecordFound=Κανένα αρχείο δεν βρέθηκε +NoRecordFound=Δεν βρέθηκαν εγγραφές NoRecordDeleted=Κανένα αρχείο δεν διαγράφηκε NotEnoughDataYet=Τα δεδομένα δεν είναι επαρκή NoError=Κανένα Σφάλμα @@ -309,6 +310,7 @@ DateBuild=Αναφορά ημερομηνία κατασκευής DatePayment=Ημερομηνία πληρωμής DateApprove=Ημερομηνία έγκρισης DateApprove2=Ημερομηνία έγκρισης (δεύτερο έγκριση) +PendingSince=Εκκρεμεί από RegistrationDate=Ημερομηνία Εγγραφής UserCreation=Χρήστης δημιουργίας UserModification=Χρήστης τροποποίησης @@ -722,6 +724,8 @@ TextUsedInTheMessageBody=Κείμενο email SendAcknowledgementByMail=Αποστολή email επιβεβαίωσης SendMail=Αποστολή email Email=Email +EMail=Email +EMails=Emails NoEMail=Χωρίς email AlreadyRead=Διαβασμένα NotRead=Αδιάβαστο @@ -880,6 +884,7 @@ toward=προς Access=Πρόσβαση SelectAction=Επιλογή ενέργειας SelectTargetUser=Επιλέξτε χρήστη/υπάλληλο-στόχο +ClickToCopyToClipboard=Κάντε κλικ για αντιγραφή στο πρόχειρο HelpCopyToClipboard=Χρησιμοποιήστε το Ctrl + C για να αντιγράψετε στο πρόχειρο SaveUploadedFileWithMask=Αποθηκεύστε το αρχείο στον server με το όνομα "%s" (αλλιώς "%s") OriginFileName=Αρχική Ονομασία @@ -926,6 +931,7 @@ ConfirmMassDeletionQuestion=Είστε σίγουροι ότι θέλετε να ConfirmMassClone=Επιβεβαίωση μαζικής κλωνοποίησης ConfirmMassCloneQuestion=Επιλέξτε έργο για κλωνοποίηση ConfirmMassCloneToOneProject=Κλωνοποίηση στο έργο %s +ObjectClonedSuccessfuly=Το αντικείμενο αντιγράφηκε με επιτυχία RelatedObjects=Σχετικά Αντικείμενα ClassifyBilled=Ταξινόμηση ως τιμολογημένο ClassifyUnbilled=Ταξινόμηση ως μη τιμολογημένο @@ -962,10 +968,11 @@ PrivateDownloadLinkDesc=Πρέπει να είστε συνδεδεμένοι κ Download=Λήψη DownloadDocument=Λήψη εγγράφου DownloadSignedDocument=Λήψη υπογεγραμμένου εγγράφου -ActualizeCurrency=Ενημέρωση τιμής νομίσματος +ActualizeCurrency=Χρήση της τελευταίας γνωστής ισοτιμίας του νομίσματος Fiscalyear=Οικονομικό έτος ModuleBuilder=Εφαρμογή δημιουργίας ενοτήτων SetMultiCurrencyCode=Ορισμός νομίσματος +SetMultiCurrencyRate=Ορισμός ισοτιμίας νομίσματος BulkActions=Μαζικές ενέργειες ClickToShowHelp=Κάντε κλικ για να εμφανιστεί το αναδυόμενο πλαίσιο βοήθειας WebSite=Ιστοσελίδα @@ -1105,6 +1112,7 @@ PayedBy=Πληρώθηκε από PayedTo=Πληρώθηκε σε Monthly=Μηνιαία Quarterly=Τριμηνιαία +Quarter=Τρίμηνο Annual=Ετήσια Local=Τοπικά Remote=Απομακρυσμένο @@ -1177,8 +1185,8 @@ DefaultMailModel=Προεπιλεγμένο πρότυπο αλληλογραφ PublicVendorName=Επωνυμία προμηθευτή DateOfBirth=Ημερομηνία γέννησης SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Το Security token έχει λήξει, επομένως η ενέργεια ακυρώθηκε. Παρακαλώ προσπαθήστε ξανά. -UpToDate=Ενημερωμένο -OutOfDate=Ξεπερασμένο +UpToDate=Ενημερωμένη +OutOfDate=Ληγμένη EventReminder=Υπενθύμιση συμβάντος UpdateForAllLines=Ενημέρωση για όλες τις γραμμές OnHold=Σε Αναμονή @@ -1307,3 +1315,27 @@ TranslationOfKey=Μετάφραση του κλειδιού AnyTranslationKey SignedStatus=Κατάσταση υπογραφής NbRecordQualified=Αριθμός εγκεκριμένων εγγραφών auto=αυτόματα +UploadFile=Άμεση εισαγωγή εγγράφου +OrClickToSelectAFile=ή κάντε κλικ για να επιλέξετε ένα αρχείο +NetTotal=Σύνολο καθαρού +VATAmount=Ποσό ΦΠΑ +TotalDiscount=Σύνολο έκπτωσης +TotalHTBeforeDiscount=Αξία προ έκπτωσης +Contains=Περιέχει +DoesNotContain=Δεν περιέχει +Is=Είναι +IsNot=Δεν είναι +StartsWith=Ξεκινά με +EndsWith=Τελειώνει με +IsBefore=Είναι πριν +IsAfter=Είναι μετά +IsOnOrBefore=Είναι πριν ή ίσο +IsOnOrAfter=Είναι μετά ή ίσο +IsHigherThan=Είναι μεγαλύτερο από +IsHigherThanOrEqual=Είναι μεγαλύτερο ή ίσο +IsLowerThan=Είναι μικρότερο από +IsLowerThanOrEqual=Είναι μικρότερο ή ίσο +addToFilter=Προσθήκη +FilterAssistance=Επεξεργαστής φίλτρου +Operator=Operator +AllFieldsRequired=Όλα τα πεδία είναι υποχρεωτικά. diff --git a/htdocs/langs/en_AE/blockedlog.lang b/htdocs/langs/en_AE/blockedlog.lang new file mode 100644 index 00000000000..76e01492a53 --- /dev/null +++ b/htdocs/langs/en_AE/blockedlog.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event +DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified. +DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK diff --git a/htdocs/langs/en_AE/categories.lang b/htdocs/langs/en_AE/categories.lang new file mode 100644 index 00000000000..7d96b9aa69a --- /dev/null +++ b/htdocs/langs/en_AE/categories.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AddFichinterIntoCategory=Assign category to interventional +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/en_AE/datapolicy.lang b/htdocs/langs/en_AE/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/en_AE/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/en_AE/eventorganization.lang b/htdocs/langs/en_AE/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/en_AE/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/en_AE/mails.lang b/htdocs/langs/en_AE/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/en_AE/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/en_AE/oauth.lang b/htdocs/langs/en_AE/oauth.lang deleted file mode 100644 index 491fc63e930..00000000000 --- a/htdocs/langs/en_AE/oauth.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - oauth -OAUTH_STRIPE_TEST_NAME=Stripe Test -OAUTH_STRIPE_LIVE_NAME=Stripe Live diff --git a/htdocs/langs/en_AE/website.lang b/htdocs/langs/en_AE/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/en_AE/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/en_AU/blockedlog.lang b/htdocs/langs/en_AU/blockedlog.lang new file mode 100644 index 00000000000..76e01492a53 --- /dev/null +++ b/htdocs/langs/en_AU/blockedlog.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event +DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified. +DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK diff --git a/htdocs/langs/en_AU/categories.lang b/htdocs/langs/en_AU/categories.lang new file mode 100644 index 00000000000..7d96b9aa69a --- /dev/null +++ b/htdocs/langs/en_AU/categories.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AddFichinterIntoCategory=Assign category to interventional +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/en_AU/datapolicy.lang b/htdocs/langs/en_AU/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/en_AU/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/en_AU/eventorganization.lang b/htdocs/langs/en_AU/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/en_AU/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/en_AU/mails.lang b/htdocs/langs/en_AU/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/en_AU/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/en_AU/oauth.lang b/htdocs/langs/en_AU/oauth.lang deleted file mode 100644 index 491fc63e930..00000000000 --- a/htdocs/langs/en_AU/oauth.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - oauth -OAUTH_STRIPE_TEST_NAME=Stripe Test -OAUTH_STRIPE_LIVE_NAME=Stripe Live diff --git a/htdocs/langs/en_AU/website.lang b/htdocs/langs/en_AU/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/en_AU/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/en_CA/blockedlog.lang b/htdocs/langs/en_CA/blockedlog.lang new file mode 100644 index 00000000000..76e01492a53 --- /dev/null +++ b/htdocs/langs/en_CA/blockedlog.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event +DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified. +DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK diff --git a/htdocs/langs/en_CA/categories.lang b/htdocs/langs/en_CA/categories.lang new file mode 100644 index 00000000000..7d96b9aa69a --- /dev/null +++ b/htdocs/langs/en_CA/categories.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AddFichinterIntoCategory=Assign category to interventional +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/en_CA/datapolicy.lang b/htdocs/langs/en_CA/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/en_CA/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/en_CA/eventorganization.lang b/htdocs/langs/en_CA/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/en_CA/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/en_CA/mails.lang b/htdocs/langs/en_CA/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/en_CA/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/en_CA/oauth.lang b/htdocs/langs/en_CA/oauth.lang deleted file mode 100644 index 491fc63e930..00000000000 --- a/htdocs/langs/en_CA/oauth.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - oauth -OAUTH_STRIPE_TEST_NAME=Stripe Test -OAUTH_STRIPE_LIVE_NAME=Stripe Live diff --git a/htdocs/langs/en_CA/website.lang b/htdocs/langs/en_CA/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/en_CA/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang index 89eba710028..660dc30f438 100644 --- a/htdocs/langs/en_GB/banks.lang +++ b/htdocs/langs/en_GB/banks.lang @@ -7,7 +7,6 @@ BankChecksToReceipt=Cheques awaiting deposit BankChecksToReceiptShort=Cheques awaiting deposit ShowCheckReceipt=Show cheque deposit receipt NumberOfCheques=No. of cheques -EventualyAddCategory=Optionally, a category in which to classify the operations ThenCheckLinesAndConciliate=Select the lines shown on the bank statement and click DefaultRIB=Default bank account AllRIB=All bank accounts diff --git a/htdocs/langs/en_GB/blockedlog.lang b/htdocs/langs/en_GB/blockedlog.lang new file mode 100644 index 00000000000..76e01492a53 --- /dev/null +++ b/htdocs/langs/en_GB/blockedlog.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event +DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified. +DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK diff --git a/htdocs/langs/en_GB/categories.lang b/htdocs/langs/en_GB/categories.lang new file mode 100644 index 00000000000..7d96b9aa69a --- /dev/null +++ b/htdocs/langs/en_GB/categories.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AddFichinterIntoCategory=Assign category to interventional +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/en_GB/datapolicy.lang b/htdocs/langs/en_GB/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/en_GB/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/en_GB/mails.lang b/htdocs/langs/en_GB/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/en_GB/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/en_GB/oauth.lang b/htdocs/langs/en_GB/oauth.lang deleted file mode 100644 index 491fc63e930..00000000000 --- a/htdocs/langs/en_GB/oauth.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - oauth -OAUTH_STRIPE_TEST_NAME=Stripe Test -OAUTH_STRIPE_LIVE_NAME=Stripe Live diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang index efb96a3c3fa..d05cf27c60e 100644 --- a/htdocs/langs/en_GB/withdrawals.lang +++ b/htdocs/langs/en_GB/withdrawals.lang @@ -7,7 +7,6 @@ WithdrawalRefused=Payment refused WithdrawalRefusedConfirm=Are you sure you want to enter a Payment rejection for Company RefusedInvoicing=Invoicing the rejection StatusMotif6=Account without a balance -OrderWaiting=Waiting for action WithdrawalFileNotCapable=Unable to generate Payment receipt file for your country %s (Your country is not supported) WithdrawRequestAmount=The amount of Direct Debit request: WithdrawRequestErrorNilAmount=Unable to create a Direct Debit request for an empty amount. diff --git a/htdocs/langs/en_IN/blockedlog.lang b/htdocs/langs/en_IN/blockedlog.lang new file mode 100644 index 00000000000..76e01492a53 --- /dev/null +++ b/htdocs/langs/en_IN/blockedlog.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event +DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified. +DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK diff --git a/htdocs/langs/en_IN/categories.lang b/htdocs/langs/en_IN/categories.lang new file mode 100644 index 00000000000..7d96b9aa69a --- /dev/null +++ b/htdocs/langs/en_IN/categories.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AddFichinterIntoCategory=Assign category to interventional +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/en_IN/datapolicy.lang b/htdocs/langs/en_IN/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/en_IN/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/en_IN/eventorganization.lang b/htdocs/langs/en_IN/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/en_IN/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/en_IN/mails.lang b/htdocs/langs/en_IN/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/en_IN/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/en_IN/oauth.lang b/htdocs/langs/en_IN/oauth.lang deleted file mode 100644 index 491fc63e930..00000000000 --- a/htdocs/langs/en_IN/oauth.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - oauth -OAUTH_STRIPE_TEST_NAME=Stripe Test -OAUTH_STRIPE_LIVE_NAME=Stripe Live diff --git a/htdocs/langs/en_SG/blockedlog.lang b/htdocs/langs/en_SG/blockedlog.lang new file mode 100644 index 00000000000..76e01492a53 --- /dev/null +++ b/htdocs/langs/en_SG/blockedlog.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event +DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified. +DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK diff --git a/htdocs/langs/en_SG/categories.lang b/htdocs/langs/en_SG/categories.lang new file mode 100644 index 00000000000..7d96b9aa69a --- /dev/null +++ b/htdocs/langs/en_SG/categories.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AddFichinterIntoCategory=Assign category to interventional +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/en_SG/datapolicy.lang b/htdocs/langs/en_SG/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/en_SG/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/en_SG/eventorganization.lang b/htdocs/langs/en_SG/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/en_SG/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/en_SG/mails.lang b/htdocs/langs/en_SG/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/en_SG/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/en_SG/members.lang b/htdocs/langs/en_SG/members.lang new file mode 100644 index 00000000000..49313a51d14 --- /dev/null +++ b/htdocs/langs/en_SG/members.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - members +MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection. diff --git a/htdocs/langs/en_SG/oauth.lang b/htdocs/langs/en_SG/oauth.lang deleted file mode 100644 index 491fc63e930..00000000000 --- a/htdocs/langs/en_SG/oauth.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - oauth -OAUTH_STRIPE_TEST_NAME=Stripe Test -OAUTH_STRIPE_LIVE_NAME=Stripe Live diff --git a/htdocs/langs/en_SG/website.lang b/htdocs/langs/en_SG/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/en_SG/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/en_ZA/blockedlog.lang b/htdocs/langs/en_ZA/blockedlog.lang new file mode 100644 index 00000000000..76e01492a53 --- /dev/null +++ b/htdocs/langs/en_ZA/blockedlog.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event +DataOfArchivedEventHelp=This field contains the unalterable and structured data that was archived on real time. Even if some parent business event could have been purged or modified, the data archived here is the original data, and it can't be modified. +DataOfArchivedEventHelp2=Its integrity is guaranteed if the status of the line is OK diff --git a/htdocs/langs/en_ZA/categories.lang b/htdocs/langs/en_ZA/categories.lang new file mode 100644 index 00000000000..7d96b9aa69a --- /dev/null +++ b/htdocs/langs/en_ZA/categories.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AddFichinterIntoCategory=Assign category to interventional +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/en_ZA/datapolicy.lang b/htdocs/langs/en_ZA/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/en_ZA/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/en_ZA/eventorganization.lang b/htdocs/langs/en_ZA/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/en_ZA/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/en_ZA/mails.lang b/htdocs/langs/en_ZA/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/en_ZA/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/en_ZA/oauth.lang b/htdocs/langs/en_ZA/oauth.lang deleted file mode 100644 index 491fc63e930..00000000000 --- a/htdocs/langs/en_ZA/oauth.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - oauth -OAUTH_STRIPE_TEST_NAME=Stripe Test -OAUTH_STRIPE_LIVE_NAME=Stripe Live diff --git a/htdocs/langs/en_ZA/website.lang b/htdocs/langs/en_ZA/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/en_ZA/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang index b5ed0f8bfb7..9fdbceb8f98 100644 --- a/htdocs/langs/es_AR/admin.lang +++ b/htdocs/langs/es_AR/admin.lang @@ -518,7 +518,6 @@ MailToSendSupplierInvoice=Facturas de proveedores MailToSendContract=Los contratos MailToExpenseReport=Informe de gastos MailToProject=Projectos -ByDefaultInList=Mostrar por defecto en la vista de lista YouUseLastStableVersion=Usas la última versión estable TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (no dude en usarlo en sus sitios web) ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s está disponible. La versión %s es una versión importante con muchas características nuevas tanto para usuarios como para desarrolladores. Puede descargarlo desde el área de descarga del portal https://www.dolibarr.org (subdirectorio Estable versiones). Puede leer ChangeLog para obtener una lista completa de los cambios. diff --git a/htdocs/langs/es_AR/assets.lang b/htdocs/langs/es_AR/assets.lang index 0555489132e..02b65ed5a36 100644 --- a/htdocs/langs/es_AR/assets.lang +++ b/htdocs/langs/es_AR/assets.lang @@ -1,7 +1,5 @@ # Dolibarr language file - Source file is en_US - assets AssetsLines=Bienes -DeleteType=Borrar ConfirmDeleteAssetType=¿Estás seguro de que quieres eliminar este tipo de activo? -ShowTypeCard=Mostrar tipo '%s' AssetsTypeId=ID de tipo de activo AssetsTypeLabel=Etiqueta de tipo de activo diff --git a/htdocs/langs/es_AR/banks.lang b/htdocs/langs/es_AR/banks.lang index d297e0761b7..3970c400ee6 100644 --- a/htdocs/langs/es_AR/banks.lang +++ b/htdocs/langs/es_AR/banks.lang @@ -14,7 +14,6 @@ BankBalanceBefore=Saldo previo BalanceMinimalAllowed=Saldo mínimo permitido FutureBalance=Saldo futuro ShowAllTimeBalance=Mostrar saldo desde el inicio -AllTime=Desde el inicio Reconciliation=Reconciliación RIB=Número de cuenta bancaria SwiftValid=BIC/swift válido diff --git a/htdocs/langs/es_AR/boxes.lang b/htdocs/langs/es_AR/boxes.lang index 712019df69b..9a6002378c8 100644 --- a/htdocs/langs/es_AR/boxes.lang +++ b/htdocs/langs/es_AR/boxes.lang @@ -43,7 +43,6 @@ NoRecordedContracts=No hay contratos registrados NoRecordedInterventions=No hay intervenciones registradas BoxLatestSupplierOrders=Últimas órdenes de compra BoxLatestSupplierOrdersAwaitingReception=Últimas órdenes de compra (pendientes de recepción) -NoSupplierOrder=No hay órdenes de compra registradas BoxCustomersInvoicesPerMonth=Facturas de clientes por mes BoxSuppliersInvoicesPerMonth=Facturas de proveedor por mes BoxCustomersOrdersPerMonth=Órdenes de venta por mes diff --git a/htdocs/langs/es_AR/cashdesk.lang b/htdocs/langs/es_AR/cashdesk.lang index 88262e24dbb..87040553a8e 100644 --- a/htdocs/langs/es_AR/cashdesk.lang +++ b/htdocs/langs/es_AR/cashdesk.lang @@ -1,4 +1,3 @@ # Dolibarr language file - Source file is en_US - cashdesk CashDeskMenu=Punto de venta CashdeskShowServices=Servicios de Venta -History=Historial diff --git a/htdocs/langs/es_AR/commercial.lang b/htdocs/langs/es_AR/commercial.lang index f29af10a1f7..a79896f570a 100644 --- a/htdocs/langs/es_AR/commercial.lang +++ b/htdocs/langs/es_AR/commercial.lang @@ -8,7 +8,6 @@ ConfirmDeleteAction=¿Estás seguro que quieres eliminar este evento? CardAction=Ficha del evento ActionOnCompany=Compañía vinculada TaskRDVWith=Reunión con %s -ShowTask=Mostrar tarea ShowAction=Mostrar evento ThirdPartiesOfSaleRepresentative=Terceros con vendedor. SaleRepresentativesOfThirdParty=Vendedores del tercero diff --git a/htdocs/langs/es_AR/donations.lang b/htdocs/langs/es_AR/donations.lang index c2a02a151fa..05241d5a1a7 100644 --- a/htdocs/langs/es_AR/donations.lang +++ b/htdocs/langs/es_AR/donations.lang @@ -13,7 +13,6 @@ DonationReceipt=Comprobante de donación DonationsModels=Modelos de documentos para comprobantes de donación DonationRecipient=Destinatario de la donación IConfirmDonationReception=El destinatario declara haber recibido, como donación, el siguiente monto -MinimumAmount=El monto mínimo es %s FreeTextOnDonations=Texto para mostrar en el pie de página DONATION_ART200=Si le interesa, puede ver el artículo 200 del CGI (Código General de Impuestos) DONATION_ART238=Si le interesa, puede ver el artículo 238 del CGI (Código General de Impuestos) diff --git a/htdocs/langs/es_AR/exports.lang b/htdocs/langs/es_AR/exports.lang deleted file mode 100644 index 567a4370ca6..00000000000 --- a/htdocs/langs/es_AR/exports.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - exports -FieldsInTargetDatabase=Target fields in Dolibarr database diff --git a/htdocs/langs/es_AR/sendings.lang b/htdocs/langs/es_AR/sendings.lang index d3092e08719..f1029ce61d9 100644 --- a/htdocs/langs/es_AR/sendings.lang +++ b/htdocs/langs/es_AR/sendings.lang @@ -3,7 +3,6 @@ AllSendings=Todos los Envíos ShowSending=Mostrar Envíos Receivings=Comprobantes de entrega SendingsArea=Área de envíos -ListOfSendings=Lista de envíos NbOfSendings=Cantidad de envíos NumberOfShipmentsByMonth=Cantidad de envíos por mes SendingCard=Ficha del envío diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang index c9acf23c3ad..b505a114ece 100644 --- a/htdocs/langs/es_AR/withdrawals.lang +++ b/htdocs/langs/es_AR/withdrawals.lang @@ -4,7 +4,6 @@ StandingOrderPayment=Orden de pago por débito automático NewStandingOrder=Nueva orden por débito automático StandingOrderToProcess=Para procesar WithdrawalsReceipts=Ordenes por débito automático -WithdrawalReceipt=Orden de Débito Automático LastWithdrawalReceipts=Ultimos %s archivos de débito automático WithdrawalsLines=Líneas de orden de débito automático NotPossibleForThisStatusOfWithdrawReceiptORLine=No se puede realizar. El estado de la extracción debe estar como 'acreditado' antes de declarar un rechazo en las líneas especificadas. @@ -42,7 +41,6 @@ StatusMotif8=Otra razon CreateForSepaFRST=Crear archivo de débito automático (SEPA FRST) CreateForSepaRCUR=Crear archivo de débito automático (SEPA RCUR) CreateAll=Crear archivo de débito automático -OrderWaiting=A la espera de procesamiento NumeroNationalEmetter=Número de transmisor nacional WithBankUsingRIB=Para cuentas bancarias que utilizan RIB WithBankUsingBANBIC=Para cuentas bancarias que utilizan IBAN/BIC/SWIFT diff --git a/htdocs/langs/es_BO/blockedlog.lang b/htdocs/langs/es_BO/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/es_BO/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/es_BO/categories.lang b/htdocs/langs/es_BO/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/es_BO/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/es_BO/datapolicy.lang b/htdocs/langs/es_BO/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_BO/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_BO/errors.lang b/htdocs/langs/es_BO/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/es_BO/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/es_BO/mails.lang b/htdocs/langs/es_BO/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/es_BO/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/es_BO/website.lang b/htdocs/langs/es_BO/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/es_BO/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang index cd72dd155d3..c81a42ead4d 100644 --- a/htdocs/langs/es_CL/admin.lang +++ b/htdocs/langs/es_CL/admin.lang @@ -1213,7 +1213,6 @@ MailToSendSupplierRequestForQuotation=Solicitud de presupuesto MailToSendSupplierOrder=Ordenes de compra MailToSendSupplierInvoice=Facturas del vendedor MailToExpenseReport=Reporte de gastos -ByDefaultInList=Mostrar de forma predeterminada en la vista de lista YouUseLastStableVersion=Usas la última versión estable TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (no dude en utilizarla en sus sitios web) TitleExampleForMaintenanceRelease=Ejemplo de mensaje que puede usar para anunciar esta versión de mantenimiento (no dude en utilizarla en sus sitios web) diff --git a/htdocs/langs/es_CL/assets.lang b/htdocs/langs/es_CL/assets.lang index 6eaae0c9bea..793d780dc07 100644 --- a/htdocs/langs/es_CL/assets.lang +++ b/htdocs/langs/es_CL/assets.lang @@ -1,6 +1,4 @@ # Dolibarr language file - Source file is en_US - assets -DeleteType=Borrar ConfirmDeleteAssetType=¿Estás seguro de que quieres eliminar este tipo de activo? -ShowTypeCard=Mostrar tipo '%s' AssetsTypeId=Identificación del tipo de activo AssetsTypeLabel=Etiqueta de tipo de activo diff --git a/htdocs/langs/es_CL/banks.lang b/htdocs/langs/es_CL/banks.lang index 7ebf2375144..0676494a057 100644 --- a/htdocs/langs/es_CL/banks.lang +++ b/htdocs/langs/es_CL/banks.lang @@ -18,7 +18,6 @@ BankBalanceAfter=Balance después BalanceMinimalAllowed=Saldo mínimo permitido FutureBalance=Balance futuro ShowAllTimeBalance=Mostrar saldo desde el inicio -AllTime=Desde el principio Reconciliation=Reconciliación RIB=Número de cuenta bancaria SwiftValid=BIC / SWIFT válido diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang index 7068950dbec..36aa55b2304 100644 --- a/htdocs/langs/es_CL/bills.lang +++ b/htdocs/langs/es_CL/bills.lang @@ -238,7 +238,6 @@ IdSocialContribution=Identificación de pago de impuesto social / fiscal PaymentId=Identificación de pago PaymentRef=Pago ref. InvoiceId=Id de factura -InvoiceRef=Factura ref. InvoiceDateCreation=Fecha de creación de la factura InvoiceStatus=Estado de la factura InvoiceNote=Nota de factura @@ -315,7 +314,6 @@ BankCode=codigo bancario DeskCode=Código de sucursal BankAccountNumber=Número de cuenta BankAccountNumberKey=Suma de comprobación -BIC=BIC / SWIFT BICNumber=Código BIC / SWIFT ExtraInfos=Infos adicionales RegulatedOn=Regulado en diff --git a/htdocs/langs/es_CL/boxes.lang b/htdocs/langs/es_CL/boxes.lang index 1573e0e6790..04b16b4a60a 100644 --- a/htdocs/langs/es_CL/boxes.lang +++ b/htdocs/langs/es_CL/boxes.lang @@ -48,7 +48,6 @@ NoRecordedContracts=Sin contratos grabados NoRecordedInterventions=Sin intervenciones registradas BoxLatestSupplierOrders=Últimas órdenes de compra BoxLatestSupplierOrdersAwaitingReception=Últimas Ordenes de Compra (con recepciones pendientes) -NoSupplierOrder=No hay orden de compra registrada BoxCustomersInvoicesPerMonth=Facturas de clientes por mes BoxCustomersOrdersPerMonth=Pedidos de ventas por mes BoxSuppliersOrdersPerMonth=Pedidos de proveedores por mes diff --git a/htdocs/langs/es_CL/cashdesk.lang b/htdocs/langs/es_CL/cashdesk.lang index cc4bef4167b..298282a040e 100644 --- a/htdocs/langs/es_CL/cashdesk.lang +++ b/htdocs/langs/es_CL/cashdesk.lang @@ -30,5 +30,4 @@ CashDeskBankAccountFor=Cuenta predeterminada para usar para pagos en EnableBarOrRestaurantFeatures=Habilitar características para bar o restaurante ConfirmDeletionOfThisPOSSale=¿Confirma usted la eliminación de esta venta actual? ConfirmDiscardOfThisPOSSale=¿Quieres descartar esta venta actual? -History=Historia TerminalSelect=Seleccione el terminal que desea utilizar: diff --git a/htdocs/langs/es_CL/commercial.lang b/htdocs/langs/es_CL/commercial.lang index 4a55b2e18e9..343d2540740 100644 --- a/htdocs/langs/es_CL/commercial.lang +++ b/htdocs/langs/es_CL/commercial.lang @@ -6,7 +6,6 @@ ConfirmDeleteAction=¿Seguro que quieres eliminar este evento? CardAction=Tarjeta de evento ActionOnCompany=Compañía vinculada TaskRDVWith=Encuentro con %s -ShowTask=Mostrar tarea ShowAction=Mostrar evento ThirdPartiesOfSaleRepresentative=Terceros con representante de ventas SaleRepresentativesOfThirdParty=Representantes de ventas de terceros diff --git a/htdocs/langs/es_CL/donations.lang b/htdocs/langs/es_CL/donations.lang index e65bb261f4f..63aa48a3138 100644 --- a/htdocs/langs/es_CL/donations.lang +++ b/htdocs/langs/es_CL/donations.lang @@ -13,7 +13,6 @@ DonationsModels=Modelos de documentos para recibos de donaciones LastModifiedDonations=Las últimas %s donaciones modificadas DonationRecipient=Recipiente de donación IConfirmDonationReception=El destinatario declara la recepción, como una donación, de la siguiente cantidad -MinimumAmount=La cantidad mínima es %s FreeTextOnDonations=Texto gratis para mostrar en el pie de página DONATION_ART200=Muestra el artículo 200 de CGI si te preocupa DONATION_ART238=Muestre el artículo 238 de CGI si le preocupa diff --git a/htdocs/langs/es_CL/install.lang b/htdocs/langs/es_CL/install.lang index 870ba43a877..8cd5ccbcc6f 100644 --- a/htdocs/langs/es_CL/install.lang +++ b/htdocs/langs/es_CL/install.lang @@ -36,7 +36,6 @@ DatabasePrefix=Prefijo de tabla de base de datos AdminLogin=Cuenta de usuario para el propietario de la base de datos Dolibarr. AdminPassword=Contraseña para el propietario de la base de datos Dolibarr. CreateDatabase=Crear base de datos -CreateUser=Cree una cuenta de usuario o otorgue permiso de cuenta de usuario en la base de datos de Dolibarr DatabaseSuperUserAccess=Servidor de base de datos: acceso de superusuario CheckToCreateDatabase=Marque la casilla si la base de datos aún no existe y, por lo tanto, debe crearse.
En este caso, también debe completar el nombre de usuario y la contraseña de la cuenta de superusuario al final de esta página. CheckToCreateUser=Marque la casilla si:
la cuenta de usuario de la base de datos aún no existe y por lo tanto debe crearse, o
si la cuenta de usuario existe pero la base de datos no existe y se deben otorgar permisos.
En este caso, se debe introducir la cuenta de usuario y la contraseña y el nombre de cuenta y contraseña de superusuario en la parte inferior de esta página. Si esta casilla no está marcada, el propietario de la base de datos y la contraseña ya deben existir. diff --git a/htdocs/langs/es_CL/receptions.lang b/htdocs/langs/es_CL/receptions.lang index 68d0a0e8001..6a3c8b9c620 100644 --- a/htdocs/langs/es_CL/receptions.lang +++ b/htdocs/langs/es_CL/receptions.lang @@ -2,7 +2,6 @@ RefReception=Árbitro. recepción Reception=Recepción ReceptionsArea=Area de recepciones -ListOfReceptions=Lista de recepciones LastReceptions=Últimas recepciones de %s StatisticsOfReceptions=Estadisticas para recepciones. NumberOfReceptionsByMonth=Número de recepciones por mes. diff --git a/htdocs/langs/es_CL/sendings.lang b/htdocs/langs/es_CL/sendings.lang index 36df99f3a3a..17092b770db 100644 --- a/htdocs/langs/es_CL/sendings.lang +++ b/htdocs/langs/es_CL/sendings.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - sendings Receivings=Recibos de entrega SendingsArea=Área de envíos -ListOfSendings=Lista de envíos StatisticsOfSendings=Estadísticas para envíos NbOfSendings=Cantidad de envios SendingCard=Tarjeta de envío diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang index 8fc0a138954..37ae697d180 100644 --- a/htdocs/langs/es_CL/stocks.lang +++ b/htdocs/langs/es_CL/stocks.lang @@ -10,8 +10,6 @@ DefaultWarehouse=Almacén predeterminado WarehouseTarget=Almacén de destino StocksByLotSerial=Stock por lote/serie ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén -ListOfWarehouses=Lista de almacenes -ListOfInventories=Lista de inventarios MovementId=Identificación del movimiento StockMovementForId=ID de movimiento %d ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto diff --git a/htdocs/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang index 7ffc548c8b3..b4ae4567e69 100644 --- a/htdocs/langs/es_CL/withdrawals.lang +++ b/htdocs/langs/es_CL/withdrawals.lang @@ -4,7 +4,6 @@ StandingOrderPayment=Orden de pago de débito directo NewStandingOrder=Nueva orden de débito directo StandingOrderToProcess=Para procesar WithdrawalsReceipts=Órdenes de débito directo -WithdrawalReceipt=Orden de débito directo LastWithdrawalReceipts=Últimos archivos de débito directo %s WithdrawalsLines=Líneas de orden de débito directo NotPossibleForThisStatusOfWithdrawReceiptORLine=Aún no es posible El estado de retirada se debe establecer en 'acreditado' antes de declarar el rechazo en líneas específicas. @@ -45,7 +44,6 @@ CreateForSepaFRST=Crear un archivo de domiciliación bancaria (SEPA FRST) CreateForSepaRCUR=Crear un archivo de domiciliación bancaria (SEPAR RCUR) CreateGuichet=Solo oficina CreateBanque=Solo banco -OrderWaiting=Esperando tratamiento NumeroNationalEmetter=Número de transmisor nacional WithBankUsingRIB=Para cuentas bancarias que usan RIB WithBankUsingBANBIC=Para cuentas bancarias que usan IBAN / BIC / SWIFT diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang index 32a83dcc3d3..cd708fbcaa9 100644 --- a/htdocs/langs/es_CO/admin.lang +++ b/htdocs/langs/es_CO/admin.lang @@ -1410,7 +1410,6 @@ MailToSendSupplierOrder=Ordenes de compra MailToSendSupplierInvoice=Facturas de proveedores MailToSendContract=Los contratos MailToExpenseReport=Reporte de gastos -ByDefaultInList=Mostrar por defecto en la vista de lista YouUseLastStableVersion=Usas la última versión estable TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta versión principal (siéntase libre de usarlo en sus sitios web) ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s está disponible. La versión %s es una versión importante con muchas características nuevas tanto para usuarios como para desarrolladores. Puede descargarlo desde el área de descarga del portal https://www.dolibarr.org (subdirectorio Estable versiones). Puede leer ChangeLog para obtener una lista completa de los cambios. diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang index 9b8adedd3ac..be31a7a84c1 100644 --- a/htdocs/langs/es_CO/banks.lang +++ b/htdocs/langs/es_CO/banks.lang @@ -17,7 +17,6 @@ EndBankBalance=Balance final CurrentBalance=Balance Actual FutureBalance=Balance futuro ShowAllTimeBalance=Mostrar balance desde el inicio -AllTime=Desde el principio RIB=Numero de cuenta SwiftValid=BIC / SWIFT válido SwiftNotValid=BIC / SWIFT no válido diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang index dbed153ea32..adddde9be39 100644 --- a/htdocs/langs/es_CO/bills.lang +++ b/htdocs/langs/es_CO/bills.lang @@ -256,7 +256,6 @@ IdSocialContribution=Identificación de pago fiscal social / fiscal PaymentId=Identificación de pago PaymentRef=Pago ref. InvoiceId=Identificación de la factura -InvoiceRef=Factura ref. InvoiceDateCreation=Fecha de creación de la factura. InvoiceStatus=Estado de la factura InvoiceNote=Nota de factura @@ -348,7 +347,6 @@ DeskCode=Código de sucursal BankAccountNumber=Número de cuenta BankAccountNumberKey=Suma de comprobación CustomerIBAN=IBAN de cliente -BIC=BIC / SWIFT ExtraInfos=Infos extra RegulatedOn=Regulado en ChequeNumber=Compruebe N ° diff --git a/htdocs/langs/es_CO/boxes.lang b/htdocs/langs/es_CO/boxes.lang index 40bec6af5cc..3cb1922713e 100644 --- a/htdocs/langs/es_CO/boxes.lang +++ b/htdocs/langs/es_CO/boxes.lang @@ -62,7 +62,6 @@ NoContractedProducts=No se contratan productos / servicios NoRecordedInterventions=Sin intervenciones registradas BoxLatestSupplierOrders=Últimas órdenes de compra BoxLatestSupplierOrdersAwaitingReception=Últimas Órdenes de Compra (con recepción pendiente) -NoSupplierOrder=Sin orden de compra registrada BoxCustomersInvoicesPerMonth=Facturas de cliente por mes BoxSuppliersInvoicesPerMonth=Facturas de proveedor por mes BoxCustomersOrdersPerMonth=Órdenes de venta por mes diff --git a/htdocs/langs/es_CO/cashdesk.lang b/htdocs/langs/es_CO/cashdesk.lang index 0f131cbee6e..9573fe2193a 100644 --- a/htdocs/langs/es_CO/cashdesk.lang +++ b/htdocs/langs/es_CO/cashdesk.lang @@ -42,7 +42,6 @@ PrintCustomerOnReceipts=Imprimir cliente en boletos | recibos EnableBarOrRestaurantFeatures=Habilitar funciones para bar o restaurante ConfirmDeletionOfThisPOSSale=¿Confirma la eliminación de esta venta actual? ConfirmDiscardOfThisPOSSale=¿Quieres descartar esta venta actual? -History=Historia NumberOfTerminals=Numero de terminales TerminalSelect=Seleccione el terminal que desea utilizar: DirectPaymentButton=Agregar un botón "Pago directo en efectivo" diff --git a/htdocs/langs/es_CO/commercial.lang b/htdocs/langs/es_CO/commercial.lang index 62f3818aeaa..1ec79101d9d 100644 --- a/htdocs/langs/es_CO/commercial.lang +++ b/htdocs/langs/es_CO/commercial.lang @@ -7,7 +7,6 @@ ConfirmDeleteAction=¿Estás seguro de que deseas eliminar este evento? CardAction=Tarjeta de evento ActionOnCompany=Compañía vinculada TaskRDVWith=Reunión con %s -ShowTask=Mostrar tarea ShowAction=Mostrar evento ThirdPartiesOfSaleRepresentative=Terceros con representante de ventas SaleRepresentativesOfThirdParty=Representantes de ventas de terceros diff --git a/htdocs/langs/es_CO/donations.lang b/htdocs/langs/es_CO/donations.lang index 1127e1c4f83..24a1c1daf48 100644 --- a/htdocs/langs/es_CO/donations.lang +++ b/htdocs/langs/es_CO/donations.lang @@ -10,7 +10,6 @@ DonationsModels=Modelos de documentos para recibos de donaciones LastModifiedDonations=Últimas donaciones modificadas %s DonationRecipient=Destinatario de la donación IConfirmDonationReception=El destinatario declara haber recibido, como donación, la siguiente cantidad -MinimumAmount=La cantidad mínima es %s FreeTextOnDonations=Texto libre para mostrar en pie de página DONATION_ART200=Muestre el artículo 200 de CGI si está preocupado DONATION_ART238=Muestre el artículo 238 de CGI si está preocupado diff --git a/htdocs/langs/es_CO/install.lang b/htdocs/langs/es_CO/install.lang index 9e752a0b3b4..a6ddbfa764c 100644 --- a/htdocs/langs/es_CO/install.lang +++ b/htdocs/langs/es_CO/install.lang @@ -40,7 +40,6 @@ DatabasePrefix=Prefijo de tabla de base de datos AdminLogin=Cuenta de usuario para el propietario de la base de datos Dolibarr. AdminPassword=Contraseña para el propietario de la base de datos Dolibarr. CreateDatabase=Crear base de datos -CreateUser=Cree una cuenta de usuario o otorgue permiso de cuenta de usuario en la base de datos de Dolibarr DatabaseSuperUserAccess=Servidor de base de datos - Acceso de superusuario CheckToCreateDatabase=Marque la casilla si la base de datos aún no existe y, por lo tanto, debe crearse.
En este caso, también debe ingresar el nombre de usuario y la contraseña de la cuenta de superusuario en la parte inferior de esta página. CheckToCreateUser=Marque la casilla si:
la cuenta de usuario de la base de datos aún no existe y, por lo tanto, debe crearse, o
si la cuenta de usuario existe pero la base de datos no existe y se deben otorgar permisos.
En este caso, debe ingresar la cuenta de usuario y la contraseña, y también el nombre de la cuenta del superusuario y la contraseña en la parte inferior de esta página. Si esta casilla no está marcada, el propietario de la base de datos y la contraseña ya deben existir. diff --git a/htdocs/langs/es_CO/receptions.lang b/htdocs/langs/es_CO/receptions.lang index 7404f8974c7..fa220a2999e 100644 --- a/htdocs/langs/es_CO/receptions.lang +++ b/htdocs/langs/es_CO/receptions.lang @@ -2,7 +2,6 @@ ReceptionDescription=Gestión de recepción de proveedores (Crear documentos de recepción) Reception=Recepción ReceptionsArea=Área de recepciones -ListOfReceptions=Lista de recepciones LastReceptions=Últimas recepciones %s NbOfReceptions=Numero de recepciones ReceptionCard=Tarjeta de recepcion diff --git a/htdocs/langs/es_CO/sendings.lang b/htdocs/langs/es_CO/sendings.lang index 5e0c06f3681..b853b7e1bf7 100644 --- a/htdocs/langs/es_CO/sendings.lang +++ b/htdocs/langs/es_CO/sendings.lang @@ -3,7 +3,6 @@ RefSending=Ref. de envío AllSendings=Todos los envios Receivings=Recibos de entrega SendingsArea=Área de envíos -ListOfSendings=Lista de envíos LastSendings=Últimos envíos de %s NbOfSendings=Numero de envios SendingCard=Tarjeta de envío diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang index 812029f610e..4a2d6035394 100644 --- a/htdocs/langs/es_CO/stocks.lang +++ b/htdocs/langs/es_CO/stocks.lang @@ -11,17 +11,12 @@ AddOne=Agrega uno DefaultWarehouse=Almacén predeterminado WarehouseTarget=Almacén de destino CancelSending=Cancelar envío -Stock=Valores -Stocks=Cepo MissingStocks=Existencias faltantes StockAtDate=Existencias a la fecha StocksByLotSerial=Existencias por lote / serie LotSerial=Lotes / Series LotSerialList=Lista de lotes / series ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén -ListOfWarehouses=Lista de almacenes -ListOfStockMovements=Lista de movimientos de stock -ListOfInventories=Lista de inventarios MovementId=ID de movimiento StockMovementForId=ID de movimiento %d ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto diff --git a/htdocs/langs/es_CO/ticket.lang b/htdocs/langs/es_CO/ticket.lang index 428ac781676..cc848141932 100644 --- a/htdocs/langs/es_CO/ticket.lang +++ b/htdocs/langs/es_CO/ticket.lang @@ -126,7 +126,6 @@ TicketNewEmailSubjectAdmin=Nuevo ticket creado - Ref %s (ID de ticket público % TicketNewEmailBodyAdmin=

El ticket se acaba de crear con ID # %s, ver información:

SeeThisTicketIntomanagementInterface=Ver ticket en la interfaz de gestión ErrorEmailOrTrackingInvalid=Valor incorrecto para el ID de seguimiento o el correo electrónico -NewUser=Nuevo Usuario NbOfTickets=Numero de tickets TicketCloseEmailSubjectCustomer=Boleto cerrado TicketCloseEmailSubjectAdmin=Ticket cerrado - Réf %s (ID de ticket público %s) diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang index 6f7ad534e4b..910929a9390 100644 --- a/htdocs/langs/es_CO/withdrawals.lang +++ b/htdocs/langs/es_CO/withdrawals.lang @@ -5,7 +5,6 @@ StandingOrderPayment=Orden de pago por débito automático NewStandingOrder=Nueva orden de débito automático NewPaymentByBankTransfer=Nuevo pago mediante transferencia bancaria WithdrawalsReceipts=Órdenes de débito automático -WithdrawalReceipt=Orden de débito automático LatestBankTransferReceipts=Últimas órdenes de transferencia bancaria %s LastWithdrawalReceipts=Archivos de débito automático %s más recientes WithdrawalsLine=Línea de orden de débito automático @@ -63,7 +62,6 @@ CreateForSepaRCUR=Crear archivo de débito automático (SEPA RCUR) CreateAll=Crear archivo de débito automático CreateGuichet=Solo oficina CreateBanque=Solo banco -OrderWaiting=Esperando tratamiento NotifyTransmision=Registro de transmisión de archivo de orden NotifyCredit=Registro de crédito de orden NumeroNationalEmetter=Número de transmisor nacional @@ -83,7 +81,6 @@ DateRUM=Fecha de la firma del mandato RUMLong=Referencia de mandato única RUMWillBeGenerated=Si está vacío, se generará una UMR (referencia de mandato único) una vez que se guarde la información de la cuenta bancaria. WithdrawRequestAmount=Monto de la solicitud de débito automático: -BankTransferAmount=Monto de la solicitud de transferencia bancaria: WithdrawRequestErrorNilAmount=No se puede crear una solicitud de débito automático por un monto vacío. SepaMandate=Mandato de débito automático SEPA PleaseReturnMandate=Envíe este formulario de mandato por correo electrónico a %s o por correo postal a diff --git a/htdocs/langs/es_CR/admin.lang b/htdocs/langs/es_CR/admin.lang index 6b22370b3a6..247f30a17e8 100644 --- a/htdocs/langs/es_CR/admin.lang +++ b/htdocs/langs/es_CR/admin.lang @@ -1423,7 +1423,6 @@ MailToSendSupplierOrder=Ordenes de compra MailToSendSupplierInvoice=Facturas de proveedores MailToExpenseReport=Reporte de gastos MailToTicket=Entradas -ByDefaultInList=Mostrar por defecto en la vista de lista YouUseLastStableVersion=Usas la última versión estable TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar este importante lanzamiento (siéntase libre de usarlo en sus sitios web) ExampleOfNewsMessageForMajorRelease=Dolibarr ERP y CRM %s está disponible. La versión %s es una versión importante con muchas características nuevas tanto para usuarios como para desarrolladores. Puede descargarlo desde el área de descargas del portal https://www.dolibarr.org (subdirectorio Versiones estables). Puede leer ChangeLog para obtener una lista completa de cambios. diff --git a/htdocs/langs/es_CR/banks.lang b/htdocs/langs/es_CR/banks.lang index 3e64b0e7f01..7abbfa3533d 100644 --- a/htdocs/langs/es_CR/banks.lang +++ b/htdocs/langs/es_CR/banks.lang @@ -13,7 +13,6 @@ BankBalanceBefore=Saldo previo BalanceMinimalAllowed=Saldo mínimo permitido FutureBalance=Saldo futuro ShowAllTimeBalance=Mostrar saldo desde el inicio -AllTime=Desde el inicio RIB=Numero de cuenta SwiftValid=BIC / SWIFT válido StandingOrders=Órdenes de domiciliación bancaria diff --git a/htdocs/langs/es_CR/bills.lang b/htdocs/langs/es_CR/bills.lang index de4f9fc43a5..684456d70e3 100644 --- a/htdocs/langs/es_CR/bills.lang +++ b/htdocs/langs/es_CR/bills.lang @@ -228,7 +228,6 @@ IdSocialContribution=ID de pago de impuestos sociales/fiscales PaymentId=ID de pago PaymentRef=Pago ref. InvoiceId=ID de factura -InvoiceRef=Factura ref. InvoiceDateCreation=Fecha de creación de la factura InvoiceStatus=Estatus de la factura InvoiceNote=Nota de factura diff --git a/htdocs/langs/es_CR/boxes.lang b/htdocs/langs/es_CR/boxes.lang index f90b8d3f47a..44f6f9c70c3 100644 --- a/htdocs/langs/es_CR/boxes.lang +++ b/htdocs/langs/es_CR/boxes.lang @@ -47,7 +47,6 @@ NoRecordedContracts=No hay contratos registrados NoRecordedInterventions=No hay intervenciones registradas BoxLatestSupplierOrders=Últimas órdenes de compra BoxLatestSupplierOrdersAwaitingReception=Últimas órdenes de compra (pendientes de recepción) -NoSupplierOrder=No hay órdenes de compra registradas BoxCustomersInvoicesPerMonth=Facturas de clientes por mes BoxSuppliersInvoicesPerMonth=Facturas de proveedor por mes BoxCustomersOrdersPerMonth=Órdenes de venta por mes diff --git a/htdocs/langs/es_CR/cashdesk.lang b/htdocs/langs/es_CR/cashdesk.lang index 10066dd3a25..8b7e4b2ec4a 100644 --- a/htdocs/langs/es_CR/cashdesk.lang +++ b/htdocs/langs/es_CR/cashdesk.lang @@ -31,7 +31,6 @@ Paymentnumpad=Tipo de Pad para ingresar el pago Numberspad=Pad de números BillsCoinsPad=Pad de monedas y billetes PrintCustomerOnReceipts=Imprimir al cliente en boletos / recibos -History=Historial CashDeskGenericMaskCodes6 =
{TN} la etiqueta se usa para agregar el número de terminal StartAParallelSale=Nueva venta simultánea ControlCashOpening=Abrir "Control de caja" aparece al abrir las órdenes de compra diff --git a/htdocs/langs/es_CR/commercial.lang b/htdocs/langs/es_CR/commercial.lang index 5290964fd9d..66e77387a1e 100644 --- a/htdocs/langs/es_CR/commercial.lang +++ b/htdocs/langs/es_CR/commercial.lang @@ -6,7 +6,6 @@ ConfirmDeleteAction=¿Está seguro de querer borrar este evento? CardAction=Tarjeta del evento ActionOnCompany=Empresa relacionada TaskRDVWith=Reunión con 1%s -ShowTask=Mostrar tarea ShowAction=Mostrar evento ActionsReport=Reporte de eventos ThirdPartiesOfSaleRepresentative=Cliente/Proveedor con representante de ventas diff --git a/htdocs/langs/es_CR/donations.lang b/htdocs/langs/es_CR/donations.lang index b88a30e5e0d..8dab192afd6 100644 --- a/htdocs/langs/es_CR/donations.lang +++ b/htdocs/langs/es_CR/donations.lang @@ -10,7 +10,6 @@ DonationReceipt=Comprobante de donación DonationsModels=Modelos de documentos para comprobantes de donación DonationRecipient=Destinatario de la donación IConfirmDonationReception=El destinatario declara haber recibido, como donación, el siguiente monto -MinimumAmount=El monto mínimo es %s DONATION_ART200=Mostrar el artículo 200 de CGI si está preocupado DONATION_ART238=Mostrar el artículo 238 de CGI si usted está preocupado DONATION_ART978=Mostrar el articulo 978 de CGI si usted está preocupado diff --git a/htdocs/langs/es_CR/install.lang b/htdocs/langs/es_CR/install.lang index bdf068a7203..d38c15324e3 100644 --- a/htdocs/langs/es_CR/install.lang +++ b/htdocs/langs/es_CR/install.lang @@ -36,7 +36,6 @@ DatabasePrefix=Prefijo de tabla de base de datos AdminLogin=Cuenta de usuario para el propietario de la base de datos Dolibarr. AdminPassword=Contraseña para el propietario de la base de datos de Dolibarr. CreateDatabase=Crear base de datos -CreateUser=Cree una cuenta de usuario o otorgue permiso de cuenta de usuario en la base de datos de Dolibarr DatabaseSuperUserAccess=Servidor de base de datos - Acceso de superusuario CheckToCreateDatabase=Marque la casilla si la base de datos aún no existe y, por lo tanto, debe crearse.
En este caso, también debe ingresar el nombre de usuario y la contraseña de la cuenta de superusuario en la parte inferior de esta página. CheckToCreateUser=Marque la casilla si:
la cuenta de usuario de la base de datos aún no existe y, por lo tanto, debe crearse, o
si la cuenta de usuario existe pero la base de datos no existe y se deben otorgar permisos.
En este caso, debe ingresar la cuenta de usuario y la contraseña y también el nombre de usuario y la contraseña del superusuario en la parte inferior de esta página. Si esta casilla no está marcada, el propietario de la base de datos y la contraseña ya deben existir. diff --git a/htdocs/langs/es_CR/receptions.lang b/htdocs/langs/es_CR/receptions.lang index 659ece1ec9f..69b86d2d25c 100644 --- a/htdocs/langs/es_CR/receptions.lang +++ b/htdocs/langs/es_CR/receptions.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - receptions Reception=Recepción ReceptionsArea=Area de recepciones -ListOfReceptions=Lista de recepciones StatisticsOfReceptions=Estadisticas para recepciones. NbOfReceptions=Cantidad de recepciones NumberOfReceptionsByMonth=Número de recepciones por mes. diff --git a/htdocs/langs/es_CR/sendings.lang b/htdocs/langs/es_CR/sendings.lang index 5909e63817c..9c199247c21 100644 --- a/htdocs/langs/es_CR/sendings.lang +++ b/htdocs/langs/es_CR/sendings.lang @@ -6,7 +6,6 @@ Shipments=Envios ShowSending=Mostrar Envíos Receivings=Comprobantes de entrega SendingsArea=Área de envíos -ListOfSendings=Lista de envíos SendingCard=Ficha del envío QtyShipped=Cantidad enviada QtyShippedShort=Cantidad enviada diff --git a/htdocs/langs/es_CR/stocks.lang b/htdocs/langs/es_CR/stocks.lang index a10d4d92540..dba10c1e05b 100644 --- a/htdocs/langs/es_CR/stocks.lang +++ b/htdocs/langs/es_CR/stocks.lang @@ -5,12 +5,9 @@ WarehouseSource=Almacén de origen WarehouseSourceNotDefined=Ningún almacén definido DefaultWarehouse=Almacén predeterminado WarehouseTarget=Almacén de destino -Stocks=Inventario StocksByLotSerial=Stock por lote/serie SubjectToLotSerialOnly=Productos sujetos solamente a lote/serie ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén -ListOfWarehouses=Lista de almacenes -ListOfStockMovements=Lista de movimientos de stock MovementId=ID de Movimiento StockMovementForId=ID de Movimiento %d ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto diff --git a/htdocs/langs/es_CR/withdrawals.lang b/htdocs/langs/es_CR/withdrawals.lang index 0425de55240..fc612d048f8 100644 --- a/htdocs/langs/es_CR/withdrawals.lang +++ b/htdocs/langs/es_CR/withdrawals.lang @@ -4,7 +4,6 @@ StandingOrdersPayment=Órdenes de pago por débito automático StandingOrderPayment=Orden de pago por débito automático NewStandingOrder=Nueva orden de débito automático WithdrawalsReceipts=Órdenes de domiciliación bancaria -WithdrawalReceipt=Pedido de domiciliación bancaria LatestBankTransferReceipts=Últimas órdenes de transferencia bancaria %s LastWithdrawalReceipts=Archivos de débito automático %s más recientes WithdrawalsLine=Línea de orden de débito automático @@ -54,7 +53,6 @@ StatusMotif5=RIB inutilizable StatusMotif8=Otra razon CreateForSepaFRST=Crear archivo de débito automático (SEPA FRST) CreateForSepaRCUR=Crear archivo de débito automático (SEPA RCUR) -OrderWaiting=A la espera de procesamiento NotifyTransmision=Registro de transmisión de archivo de orden NotifyCredit=Registro de crédito de orden NumeroNationalEmetter=Número de transmisor nacional @@ -71,7 +69,6 @@ RUMLong=Referencia única de mandato RUMWillBeGenerated=Si está vacío, se generará una RUM (referencia de mandato única) una vez que se guarde la información de la cuenta bancaria. WithdrawMode=Modo de débito automático (FRST o RECUR) WithdrawRequestAmount=Monto de la solicitud de débito automático: -BankTransferAmount=Monto de la solicitud de transferencia bancaria: WithdrawRequestErrorNilAmount=No se puede crear una solicitud de débito automático por un monto vacío. SepaMandate=Mandato de débito automático SEPA PleaseReturnMandate=Por favor, envíe este formulario de mandato por correo a %s o por correo a diff --git a/htdocs/langs/es_CU/admin.lang b/htdocs/langs/es_CU/admin.lang index 5848d1f21f2..08903bed4c3 100644 --- a/htdocs/langs/es_CU/admin.lang +++ b/htdocs/langs/es_CU/admin.lang @@ -1405,7 +1405,6 @@ MailToSendSupplierOrder=Ordenes de compra MailToSendSupplierInvoice=Facturas de proveedores MailToExpenseReport=Reporte de gastos MailToTicket=Entradas -ByDefaultInList=Mostrar por defecto en la vista de lista YouUseLastStableVersion=Usas la última versión estable TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar este importante lanzamiento (siéntase libre de usarlo en sus sitios web) ExampleOfNewsMessageForMajorRelease=Dolibarr ERP y CRM %s está disponible. La versión %s es una versión importante con muchas características nuevas tanto para usuarios como para desarrolladores. Puede descargarlo desde el área de descargas del portal https://www.dolibarr.org (subdirectorio Versiones estables). Puede leer ChangeLog para obtener una lista completa de cambios. diff --git a/htdocs/langs/es_CU/assets.lang b/htdocs/langs/es_CU/assets.lang index 9aa00ed1d6f..b8cff31dee5 100644 --- a/htdocs/langs/es_CU/assets.lang +++ b/htdocs/langs/es_CU/assets.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - assets -DeleteType=Borrar ConfirmDeleteAssetType=¿Está seguro de que desea eliminar este modelo de activo? ModuleAssetsDesc=Descripción de activos AssetsType=modelo de activos diff --git a/htdocs/langs/es_CU/banks.lang b/htdocs/langs/es_CU/banks.lang index b6855b8bb99..605c2ea5b55 100644 --- a/htdocs/langs/es_CU/banks.lang +++ b/htdocs/langs/es_CU/banks.lang @@ -15,7 +15,6 @@ BankBalanceAfter=Saldo después BalanceMinimalAllowed=Saldo mínimo permitido FutureBalance=Saldo futuro ShowAllTimeBalance=Mostrar saldo desde el inicio -AllTime=Desde el principio Reconciliation=Reconciliación RIB=Número de cuenta bancaria IbanValid=PROHIBICIÓN válida diff --git a/htdocs/langs/es_CU/bills.lang b/htdocs/langs/es_CU/bills.lang index 52b452fe2e5..0702868f30e 100644 --- a/htdocs/langs/es_CU/bills.lang +++ b/htdocs/langs/es_CU/bills.lang @@ -255,7 +255,6 @@ IdSocialContribution=Identificación de pago de impuestos sociales/fiscales PaymentId=Identificación de pago PaymentRef=referencia de pago InvoiceId=identificación de la factura -InvoiceRef=ref. factura InvoiceDateCreation=Fecha de creación de la factura InvoiceStatus=Estado de la factura InvoiceNote=Nota de factura diff --git a/htdocs/langs/es_CU/boxes.lang b/htdocs/langs/es_CU/boxes.lang index bb3de1725b3..47b3dadf33f 100644 --- a/htdocs/langs/es_CU/boxes.lang +++ b/htdocs/langs/es_CU/boxes.lang @@ -61,7 +61,6 @@ NoContractedProducts=No hay productos/servicios contratados NoRecordedInterventions=No hay intervenciones registradas BoxLatestSupplierOrders=Últimas órdenes de compra BoxLatestSupplierOrdersAwaitingReception=Últimas Órdenes de Compra (con pendiente de recepción) -NoSupplierOrder=Sin orden de compra registrada BoxCustomersInvoicesPerMonth=Facturas de clientes por mes BoxCustomersOrdersPerMonth=Órdenes de venta por mes BoxSuppliersOrdersPerMonth=Pedidos de proveedores por mes diff --git a/htdocs/langs/es_CU/cashdesk.lang b/htdocs/langs/es_CU/cashdesk.lang index 9f984525f1f..e877f5bd434 100644 --- a/htdocs/langs/es_CU/cashdesk.lang +++ b/htdocs/langs/es_CU/cashdesk.lang @@ -40,7 +40,6 @@ PrintCustomerOnReceipts=Imprimir cliente en tickets|recibos EnableBarOrRestaurantFeatures=Habilitar funciones para bar o restaurante ConfirmDeletionOfThisPOSSale=¿Confirma la eliminación de esta venta actual? ConfirmDiscardOfThisPOSSale=¿Quieres descartar esta venta actual? -History=Historia TerminalSelect=Seleccione la terminal que desea utilizar: POSTicket=Boleto de punto de venta POSTerminal=TPV diff --git a/htdocs/langs/es_CU/commercial.lang b/htdocs/langs/es_CU/commercial.lang index 95ed4a6932e..9e387f15f56 100644 --- a/htdocs/langs/es_CU/commercial.lang +++ b/htdocs/langs/es_CU/commercial.lang @@ -7,7 +7,6 @@ ConfirmDeleteAction=¿Está seguro de que desea eliminar este evento? CardAction=Tarjeta de evento ActionOnCompany=Compañía vinculada TaskRDVWith=Reunión con %s -ShowTask=Mostrar tarea ShowAction=Mostrar evento ThirdPartiesOfSaleRepresentative=Terceros con representante de ventas SaleRepresentativesOfThirdParty=Representantes de ventas de terceros diff --git a/htdocs/langs/es_CU/compta.lang b/htdocs/langs/es_CU/compta.lang index 142e65ef20e..047e24297eb 100644 --- a/htdocs/langs/es_CU/compta.lang +++ b/htdocs/langs/es_CU/compta.lang @@ -225,7 +225,6 @@ ImportDataset_tax_vat=pagos del iva ErrorBankAccountNotFound=Error: Cuenta bancaria no encontrada FiscalPeriod=Período contable ListSocialContributionAssociatedProject=Relación de contribuciones sociales asociadas al proyecto -DeleteFromCat=Eliminar del grupo contable AccountingAffectation=Asignación contable LastDayTaxIsRelatedTo=Último día del período al que se refiere el impuesto VATDue=Impuesto sobre las ventas reclamado diff --git a/htdocs/langs/es_CU/donations.lang b/htdocs/langs/es_CU/donations.lang index cc22c89844e..9729e233f18 100644 --- a/htdocs/langs/es_CU/donations.lang +++ b/htdocs/langs/es_CU/donations.lang @@ -10,7 +10,6 @@ DonationsModels=Modelos de documentos para recibos de donaciones LastModifiedDonations=Últimas donaciones modificadas %s DonationRecipient=Destinatario de la donación IConfirmDonationReception=El destinatario declara haber recibido, en concepto de donación, la siguiente cantidad -MinimumAmount=La cantidad mínima es %s FreeTextOnDonations=Texto libre para mostrar en el pie de página DONATION_ART200=Muestre el artículo 200 de CGI si le preocupa DONATION_ART238=Muestre el artículo 238 de CGI si le preocupa diff --git a/htdocs/langs/es_CU/install.lang b/htdocs/langs/es_CU/install.lang index 9a2f251ec40..215a9dc285a 100644 --- a/htdocs/langs/es_CU/install.lang +++ b/htdocs/langs/es_CU/install.lang @@ -40,7 +40,6 @@ DatabasePrefix=Prefijo de tabla de base de datos AdminLogin=Cuenta de usuario para el propietario de la base de datos Dolibarr. AdminPassword=Contraseña del propietario de la base de datos Dolibarr. CreateDatabase=Crear base de datos -CreateUser=Cree una cuenta de usuario o conceda permiso de cuenta de usuario en la base de datos de Dolibarr DatabaseSuperUserAccess=Servidor de base de datos: acceso de superusuario CheckToCreateDatabase=Marque la casilla si la base de datos aún no existe y debe crearse.
En este caso, también debe completar el nombre de usuario y la contraseña de la cuenta de superusuario en la parte inferior de esta página. CheckToCreateUser=Marque la casilla si:
la cuenta de usuario de la base de datos aún no existe y, por lo tanto, debe crearse, o
si la cuenta de usuario existe pero la base de datos no existe y se deben otorgar permisos.
En este caso, debe ingresar la cuenta de usuario y la contraseña y también el nombre y la contraseña de la cuenta de superusuario en la parte inferior de esta página. Si esta casilla no está marcada, el propietario de la base de datos y la contraseña ya deben existir. diff --git a/htdocs/langs/es_CU/receptions.lang b/htdocs/langs/es_CU/receptions.lang index a97746601d7..3dd313a47c2 100644 --- a/htdocs/langs/es_CU/receptions.lang +++ b/htdocs/langs/es_CU/receptions.lang @@ -3,7 +3,6 @@ ReceptionDescription=Gestión de recepción de proveedores (Crear documentos de RefReception=Árbitro. recepción Reception=Recepción ReceptionsArea=Área de recepciones -ListOfReceptions=Lista de recepciones LastReceptions=Últimas recepciones %s ReceptionCard=Tarjeta de recepción NewReception=nueva recepción diff --git a/htdocs/langs/es_CU/sendings.lang b/htdocs/langs/es_CU/sendings.lang index 06eea7d0e41..a29b7ce7e0a 100644 --- a/htdocs/langs/es_CU/sendings.lang +++ b/htdocs/langs/es_CU/sendings.lang @@ -2,7 +2,6 @@ RefSending=Árbitro. envío Receivings=Recibos de entrega SendingsArea=Zona de envíos -ListOfSendings=Lista de envíos LastSendings=Últimos envíos %s SendingCard=Tarjeta de envío QtyShipped=Cantidad enviada diff --git a/htdocs/langs/es_CU/stocks.lang b/htdocs/langs/es_CU/stocks.lang index 97408881d53..2b989168d8e 100644 --- a/htdocs/langs/es_CU/stocks.lang +++ b/htdocs/langs/es_CU/stocks.lang @@ -17,8 +17,6 @@ StocksByLotSerial=Existencias por lote/serie LotSerial=Lotes/Serie LotSerialList=Lista de lotes/serie ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén -ListOfWarehouses=Lista de almacenes -ListOfInventories=Lista de inventarios MovementId=ID de movimiento StockMovementForId=ID de movimiento %d ListMouvementStockProject=Lista de movimientos de stock asociados al proyecto diff --git a/htdocs/langs/es_CU/ticket.lang b/htdocs/langs/es_CU/ticket.lang index e64fa2b3962..f154bbfa32d 100644 --- a/htdocs/langs/es_CU/ticket.lang +++ b/htdocs/langs/es_CU/ticket.lang @@ -155,7 +155,6 @@ SeeThisTicketIntomanagementInterface=Ver ticket en interfaz de gestión TicketPublicInterfaceForbidden=La interfaz pública para los boletos no estaba habilitada ErrorEmailOrTrackingInvalid=Mal valor para rastrear ID o correo electrónico OldUser=antiguo usuario -NewUser=Nuevo Usuario NumberOfTicketsByMonth=Número de boletos por mes NbOfTickets=Número de boletos TicketCloseEmailSubjectCustomer=Boleto cerrado diff --git a/htdocs/langs/es_CU/withdrawals.lang b/htdocs/langs/es_CU/withdrawals.lang index 8f93034301f..cf83e7ec957 100644 --- a/htdocs/langs/es_CU/withdrawals.lang +++ b/htdocs/langs/es_CU/withdrawals.lang @@ -9,7 +9,6 @@ StandingOrderToProcess=Para procesar PaymentByBankTransferReceipts=Órdenes de transferencia de crédito PaymentByBankTransferLines=Líneas de orden de transferencia de crédito WithdrawalsReceipts=Pedidos domiciliados -WithdrawalReceipt=Orden de domiciliación bancaria BankTransferReceipts=Órdenes de transferencia de crédito BankTransferReceipt=Orden de transferencia de crédito LatestBankTransferReceipts=Últimos pedidos de transferencia de crédito %s @@ -75,7 +74,6 @@ CreateFileForPaymentByBankTransfer=Crear archivo para transferencia de crédito CreateSepaFileForPaymentByBankTransfer=Crear archivo de transferencia de crédito (SEPA) CreateGuichet=solo oficina CreateBanque=solo banco -OrderWaiting=esperando tratamiento NotifyTransmision=Registro de transmisión de archivo de orden NotifyCredit=Registrar el crédito de la orden NumeroNationalEmetter=Número de transmisor nacional @@ -95,7 +93,6 @@ StatisticsByLineStatus=Estadísticas por estado de líneas RUMLong=Referencia de mandato único RUMWillBeGenerated=Si está vacío, se generará un UMR (Referencia de mandato único) una vez que se guarde la información de la cuenta bancaria. WithdrawRequestAmount=Importe de la solicitud de domiciliación bancaria: -BankTransferAmount=Importe de la solicitud de transferencia de crédito: WithdrawRequestErrorNilAmount=No se puede crear una solicitud de domiciliación bancaria para un importe vacío. SepaMandate=Mandato de Débito Directo SEPA PleaseReturnMandate=Devuelva este formulario de mandato por correo electrónico a %s o por correo postal a diff --git a/htdocs/langs/es_DO/blockedlog.lang b/htdocs/langs/es_DO/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/es_DO/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/es_DO/categories.lang b/htdocs/langs/es_DO/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/es_DO/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/es_DO/datapolicy.lang b/htdocs/langs/es_DO/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_DO/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_DO/errors.lang b/htdocs/langs/es_DO/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/es_DO/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/es_DO/mails.lang b/htdocs/langs/es_DO/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/es_DO/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/es_DO/website.lang b/htdocs/langs/es_DO/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/es_DO/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang index d2e01735947..58b785a3ca2 100644 --- a/htdocs/langs/es_EC/admin.lang +++ b/htdocs/langs/es_EC/admin.lang @@ -188,7 +188,6 @@ CurrentMenuHandler=Controlador de menús actual Orientation=Orientacion SpaceX=Espacio X SpaceY=Espacio Y -NoticePeriod=Periodo de notificación Emails=Correos electrónicos EMailsSetup=Configuración de correo electrónico EmailSenderProfiles=Perfiles de remitentes de correos electrónicos @@ -1278,7 +1277,6 @@ MailToSendSupplierOrder=Ordenes de compra MailToSendSupplierInvoice=Facturas del vendedor / proveedor MailToExpenseReport=Reporte de gastos MailToThirdparty=Clientes / Proveedores -ByDefaultInList=Mostrar de forma predeterminada en la vista de lista YouUseLastStableVersion=Utiliza la última versión estable TitleExampleForMajorRelease=Ejemplo de mensaje que se puede usar para anunciar esta versión principal TitleExampleForMaintenanceRelease=Ejemplo de mensaje que se puede utilizar para anunciar esta versión de mantenimiento. diff --git a/htdocs/langs/es_EC/assets.lang b/htdocs/langs/es_EC/assets.lang index 0d5dcffd8bd..9e5b6bc4726 100644 --- a/htdocs/langs/es_EC/assets.lang +++ b/htdocs/langs/es_EC/assets.lang @@ -1,7 +1,5 @@ # Dolibarr language file - Source file is en_US - assets AssetsLines=Bienes -DeleteType=Borrar ConfirmDeleteAssetType=¿Estás seguro de que quieres eliminar este tipo de activo? -ShowTypeCard=Mostrar tipo '%s' AssetsTypeId=ID del tipo de activo AssetsTypeLabel=Etiqueta de tipo de activo diff --git a/htdocs/langs/es_EC/banks.lang b/htdocs/langs/es_EC/banks.lang index 24cc814bfde..fbd1bfb17d0 100644 --- a/htdocs/langs/es_EC/banks.lang +++ b/htdocs/langs/es_EC/banks.lang @@ -14,7 +14,6 @@ BankBalanceAfter=Saldo después BalanceMinimalAllowed=Saldo mínimo permitido FutureBalance=Saldo futuro ShowAllTimeBalance=Mostrar saldo desde el inicio -AllTime=Desde el principio RIB=Número de cuenta bancaria StandingOrders=Pedidos de domiciliación bancaria StandingOrder=Orden de dèbito directo diff --git a/htdocs/langs/es_EC/bills.lang b/htdocs/langs/es_EC/bills.lang index d6527e81c0f..c32c4f79206 100644 --- a/htdocs/langs/es_EC/bills.lang +++ b/htdocs/langs/es_EC/bills.lang @@ -243,7 +243,6 @@ IdSocialContribution=ID de pago de impuestos sociales/fiscales PaymentId=ID de pago PaymentRef=Pago ref. InvoiceId=ID de factura -InvoiceRef=Factura ref. InvoiceDateCreation=Fecha de creación de la factura InvoiceStatus=Estado de la factura InvoiceNote=Nota de factura diff --git a/htdocs/langs/es_EC/boxes.lang b/htdocs/langs/es_EC/boxes.lang index a30dc43e0de..a79ff7d8594 100644 --- a/htdocs/langs/es_EC/boxes.lang +++ b/htdocs/langs/es_EC/boxes.lang @@ -53,7 +53,6 @@ NoRecordedContracts=No hay contratos registrados NoRecordedInterventions=No hay intervenciones registradas BoxLatestSupplierOrders=Últimas órdenes de compra BoxLatestSupplierOrdersAwaitingReception=Últimas órdenes de compra (con una recepción pendiente) -NoSupplierOrder=No hay orden de compra registrada BoxCustomersInvoicesPerMonth=Facturas de clientes por mes BoxCustomersOrdersPerMonth=Pedidos de ventas por mes BoxSuppliersOrdersPerMonth=Pedidos de proveedores por mes diff --git a/htdocs/langs/es_EC/cashdesk.lang b/htdocs/langs/es_EC/cashdesk.lang index fcfd0da3b7b..a6d1c71f36f 100644 --- a/htdocs/langs/es_EC/cashdesk.lang +++ b/htdocs/langs/es_EC/cashdesk.lang @@ -39,7 +39,6 @@ PrintCustomerOnReceipts=Imprimir al cliente en boletos / recibos EnableBarOrRestaurantFeatures=Habilitar funciones para bar o restaurante ConfirmDeletionOfThisPOSSale=¿Confirma la eliminación de esta venta actual? ConfirmDiscardOfThisPOSSale=¿Quieres descartar esta venta actual? -History=Historia Colorful=Vistoso SortProductField=Campo para clasificar productos BrowserMethodDescription=Impresión de recibos simple y fácil. Solo unos pocos parámetros para configurar el recibo. Imprimir a través del navegador. diff --git a/htdocs/langs/es_EC/commercial.lang b/htdocs/langs/es_EC/commercial.lang index f78862fdacd..a352a2f41a4 100644 --- a/htdocs/langs/es_EC/commercial.lang +++ b/htdocs/langs/es_EC/commercial.lang @@ -7,7 +7,6 @@ ConfirmDeleteAction=¿Seguro que quieres eliminar este evento? CardAction=Tarjeta de evento ActionOnCompany=Compañía vinculada TaskRDVWith=Reunión con%s -ShowTask=Mostrar tarea ShowAction=Mostrar evento ThirdPartiesOfSaleRepresentative=Cliente/Proveedor con representante de ventas SaleRepresentativesOfThirdParty=Representantes de ventas de cliente/proveedor diff --git a/htdocs/langs/es_EC/donations.lang b/htdocs/langs/es_EC/donations.lang index 39c703d0d27..2fb3058f1b6 100644 --- a/htdocs/langs/es_EC/donations.lang +++ b/htdocs/langs/es_EC/donations.lang @@ -10,7 +10,6 @@ DonationsModels=Modelos de documentos para recibos de donaciones LastModifiedDonations=Últimas donaciones modificadas%s DonationRecipient=Destinatario de la donación IConfirmDonationReception=El destinatario declara la recepción, como una donación, de la cantidad siguiente -MinimumAmount=La cantidad mínima es%s FreeTextOnDonations=Texto libre para mostrar en pie de página DONATION_ART200=Mostrar el artículo 200 de CGI si está interesado DONATION_ART238=Mostrar el artículo 238 de CGI si usted está preocupado diff --git a/htdocs/langs/es_EC/install.lang b/htdocs/langs/es_EC/install.lang index fd68fdcb1df..0b1010ecc19 100644 --- a/htdocs/langs/es_EC/install.lang +++ b/htdocs/langs/es_EC/install.lang @@ -39,7 +39,6 @@ DatabasePrefix=Prefijo de tabla de base de datos AdminLogin=Cuenta de usuario para el propietario de la base de datos Dolibarr. AdminPassword=Contraseña para el propietario de la base de datos de Dolibarr. CreateDatabase=Crear base de datos -CreateUser=Cree una cuenta de usuario o otorgue permiso de cuenta de usuario en la base de datos de Dolibarr DatabaseSuperUserAccess=Servidor de base de datos - Acceso de superusuario CheckToCreateDatabase=Marque la casilla si la base de datos aún no existe y, por lo tanto, debe crearse.
En este caso, también debe ingresar el nombre de usuario y la contraseña de la cuenta de superusuario en la parte inferior de esta página. CheckToCreateUser=Marque la casilla si:
la cuenta de usuario de la base de datos aún no existe y, por lo tanto, debe crearse, o
si la cuenta de usuario existe pero la base de datos no existe y se deben otorgar permisos.
En este caso, debe ingresar la cuenta de usuario y la contraseña y también el nombre de usuario y la contraseña del superusuario en la parte inferior de esta página. Si esta casilla no está marcada, el propietario de la base de datos y la contraseña ya deben existir. diff --git a/htdocs/langs/es_EC/receptions.lang b/htdocs/langs/es_EC/receptions.lang index 27684aab0b5..84e7298d47c 100644 --- a/htdocs/langs/es_EC/receptions.lang +++ b/htdocs/langs/es_EC/receptions.lang @@ -2,7 +2,6 @@ RefReception=Referencia de recepción Reception=Recepción ReceptionsArea=Area de recepciones -ListOfReceptions=Lista de recepciones ReceptionMethod=Lista de recepciones StatisticsOfReceptions=Estadisticas para recepciones. NumberOfReceptionsByMonth=Número de recepciones por mes. diff --git a/htdocs/langs/es_EC/sendings.lang b/htdocs/langs/es_EC/sendings.lang index bb2c889c189..e1f03e60391 100644 --- a/htdocs/langs/es_EC/sendings.lang +++ b/htdocs/langs/es_EC/sendings.lang @@ -2,7 +2,6 @@ RefSending=Ref. de envío Receivings=Recibos de entrega SendingsArea=Área de envíos -ListOfSendings=Lista de envíos SendingCard=Tarjeta de envío QtyShipped=Cantidad enviada QtyShippedShort=Cantidad de envío. diff --git a/htdocs/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang index 6bc031fa46b..dc04a10fc05 100644 --- a/htdocs/langs/es_EC/stocks.lang +++ b/htdocs/langs/es_EC/stocks.lang @@ -8,14 +8,10 @@ WarehouseSourceNotDefined=Ningún almacén definido AddOne=Agrega uno DefaultWarehouse=Almacén predeterminado WarehouseTarget=Almacén de destino -Stocks=Existencias StocksByLotSerial=Inventario por lote/serie LotSerial=Lotes/publicaciones en serie LotSerialList=Lista de lotes/series ErrorWarehouseRefRequired=Se requiere el nombre de referencia del almacén -ListOfWarehouses=Lista de almacenes -ListOfStockMovements=Lista de movimientos de stock -ListOfInventories=Lista de inventarios MovementId=ID del movimiento StockMovementForId=ID de movimiento %d ListMouvementStockProject=Lista de movimientos de inventario asociado al proyecto diff --git a/htdocs/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang index b33d3a5e903..7f9242063ce 100644 --- a/htdocs/langs/es_EC/withdrawals.lang +++ b/htdocs/langs/es_EC/withdrawals.lang @@ -4,7 +4,6 @@ StandingOrderPayment=Orden de pago por domiciliación bancaria NewStandingOrder=Nueva orden de domiciliación bancaria StandingOrderToProcess=Para procesar WithdrawalsReceipts=Pedidos de domiciliación bancaria -WithdrawalReceipt=Orden de dèbito directo LastWithdrawalReceipts=Últimos archivos de débito directo %s WithdrawalsLines=Líneas de pedido de débito directo NotPossibleForThisStatusOfWithdrawReceiptORLine=Todavía no es posible. El estado de retiro debe establecerse en "acreditado" antes de declarar el rechazo en líneas específicas. @@ -43,7 +42,6 @@ CreateForSepaFRST=Crear archivo de débito directo (SEPA FRST) CreateForSepaRCUR=Crear archivo de débito directo (SEPA RCUR) CreateAll=Crear un archivo de débito directo CreateBanque=Solo banco -OrderWaiting=Esperando tratamiento NumeroNationalEmetter=Número del Transmisor Nacional WithBankUsingRIB=Para cuentas bancarias utilizando RIB WithBankUsingBANBIC=Para cuentas bancarias utilizando IBAN/BIC/SWIFT diff --git a/htdocs/langs/es_GT/blockedlog.lang b/htdocs/langs/es_GT/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/es_GT/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/es_GT/categories.lang b/htdocs/langs/es_GT/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/es_GT/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/es_GT/datapolicy.lang b/htdocs/langs/es_GT/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_GT/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_GT/errors.lang b/htdocs/langs/es_GT/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/es_GT/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/es_GT/mails.lang b/htdocs/langs/es_GT/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/es_GT/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/es_GT/website.lang b/htdocs/langs/es_GT/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/es_GT/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/es_HN/blockedlog.lang b/htdocs/langs/es_HN/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/es_HN/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/es_HN/categories.lang b/htdocs/langs/es_HN/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/es_HN/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/es_HN/datapolicy.lang b/htdocs/langs/es_HN/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_HN/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_HN/errors.lang b/htdocs/langs/es_HN/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/es_HN/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/es_HN/mails.lang b/htdocs/langs/es_HN/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/es_HN/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/es_HN/website.lang b/htdocs/langs/es_HN/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/es_HN/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang index 3acf652206b..1878fb82d17 100644 --- a/htdocs/langs/es_MX/banks.lang +++ b/htdocs/langs/es_MX/banks.lang @@ -11,7 +11,6 @@ CurrentAccounts=Cuentas actuales ErrorBankLabelAlreadyExists=Ya existe descripción de la cuenta financiera BalanceMinimalAllowed=Saldo mínimo permitido ShowAllTimeBalance=Mostrar saldo desde el principio -AllTime=Desde el principio Reconciliation=Reconciliación RIB=Número de cuenta bancaria SwiftValid=BIC / SWIFT válido diff --git a/htdocs/langs/es_MX/commercial.lang b/htdocs/langs/es_MX/commercial.lang index 5808bd60b84..08f59b773a8 100644 --- a/htdocs/langs/es_MX/commercial.lang +++ b/htdocs/langs/es_MX/commercial.lang @@ -6,7 +6,6 @@ ConfirmDeleteAction=¿Está seguro de querer borrar este evento? CardAction=Tarjeta del evento ActionOnCompany=Empresa relacionada TaskRDVWith=Reunión con 1%s -ShowTask=Mostrar tarea ShowAction=Mostrar evento ActionsReport=Reporte de eventos ThirdPartiesOfSaleRepresentative=Terceros con representate de ventas diff --git a/htdocs/langs/es_MX/datapolicy.lang b/htdocs/langs/es_MX/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_MX/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_MX/withdrawals.lang b/htdocs/langs/es_MX/withdrawals.lang index e9838fc2b50..feb771a80b2 100644 --- a/htdocs/langs/es_MX/withdrawals.lang +++ b/htdocs/langs/es_MX/withdrawals.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - withdrawals StandingOrderToProcess=Procesar WithdrawalsReceipts=Órdenes de domiciliación bancaria -WithdrawalReceipt=Orden de domiciliación bancaria StatusPaid=Pagado StatusRefused=Rechazado StatusMotif4=Pedidos diff --git a/htdocs/langs/es_PA/blockedlog.lang b/htdocs/langs/es_PA/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/es_PA/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/es_PA/categories.lang b/htdocs/langs/es_PA/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/es_PA/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/es_PA/datapolicy.lang b/htdocs/langs/es_PA/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_PA/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_PA/errors.lang b/htdocs/langs/es_PA/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/es_PA/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/es_PA/mails.lang b/htdocs/langs/es_PA/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/es_PA/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/es_PA/website.lang b/htdocs/langs/es_PA/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/es_PA/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/es_PE/assets.lang b/htdocs/langs/es_PE/assets.lang index f4824c81709..a339947648f 100644 --- a/htdocs/langs/es_PE/assets.lang +++ b/htdocs/langs/es_PE/assets.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - assets -DeleteType=Borrar MenuListAssets=Lista MenuListAssetModels=Lista AssetReversalAmountHT=Importe de amortización (sin IGV) diff --git a/htdocs/langs/es_PE/blockedlog.lang b/htdocs/langs/es_PE/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/es_PE/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/es_PE/categories.lang b/htdocs/langs/es_PE/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/es_PE/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/es_PE/datapolicy.lang b/htdocs/langs/es_PE/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_PE/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_PE/members.lang b/htdocs/langs/es_PE/members.lang new file mode 100644 index 00000000000..835cd28545c --- /dev/null +++ b/htdocs/langs/es_PE/members.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - members +DeleteType=Borrar +MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection. diff --git a/htdocs/langs/es_PY/blockedlog.lang b/htdocs/langs/es_PY/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/es_PY/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/es_PY/categories.lang b/htdocs/langs/es_PY/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/es_PY/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/es_PY/datapolicy.lang b/htdocs/langs/es_PY/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_PY/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_PY/errors.lang b/htdocs/langs/es_PY/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/es_PY/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/es_PY/mails.lang b/htdocs/langs/es_PY/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/es_PY/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/es_PY/website.lang b/htdocs/langs/es_PY/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/es_PY/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/es_US/blockedlog.lang b/htdocs/langs/es_US/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/es_US/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/es_US/categories.lang b/htdocs/langs/es_US/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/es_US/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/es_US/datapolicy.lang b/htdocs/langs/es_US/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_US/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_US/errors.lang b/htdocs/langs/es_US/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/es_US/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/es_US/mails.lang b/htdocs/langs/es_US/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/es_US/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/es_US/website.lang b/htdocs/langs/es_US/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/es_US/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/es_UY/blockedlog.lang b/htdocs/langs/es_UY/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/es_UY/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/es_UY/categories.lang b/htdocs/langs/es_UY/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/es_UY/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/es_UY/datapolicy.lang b/htdocs/langs/es_UY/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_UY/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_UY/errors.lang b/htdocs/langs/es_UY/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/es_UY/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/es_UY/mails.lang b/htdocs/langs/es_UY/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/es_UY/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/es_UY/website.lang b/htdocs/langs/es_UY/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/es_UY/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/es_VE/blockedlog.lang b/htdocs/langs/es_VE/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/es_VE/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/es_VE/datapolicy.lang b/htdocs/langs/es_VE/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/es_VE/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/es_VE/exports.lang b/htdocs/langs/es_VE/exports.lang deleted file mode 100644 index 567a4370ca6..00000000000 --- a/htdocs/langs/es_VE/exports.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - exports -FieldsInTargetDatabase=Target fields in Dolibarr database diff --git a/htdocs/langs/es_VE/sendings.lang b/htdocs/langs/es_VE/sendings.lang new file mode 100644 index 00000000000..e77b722fe45 --- /dev/null +++ b/htdocs/langs/es_VE/sendings.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - sendings +SendingCard=Envío diff --git a/htdocs/langs/es_VE/suppliers.lang b/htdocs/langs/es_VE/suppliers.lang new file mode 100644 index 00000000000..c0fe420495b --- /dev/null +++ b/htdocs/langs/es_VE/suppliers.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - suppliers +NbDaysToDelivery=Tiempos de entrega diff --git a/htdocs/langs/es_VE/website.lang b/htdocs/langs/es_VE/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/es_VE/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/fr_BE/banks.lang b/htdocs/langs/fr_BE/banks.lang deleted file mode 100644 index e3f16ee0ec6..00000000000 --- a/htdocs/langs/fr_BE/banks.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - banks -EventualyAddCategory=Optionally, a category in which to classify the operations diff --git a/htdocs/langs/fr_BE/blockedlog.lang b/htdocs/langs/fr_BE/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/fr_BE/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/fr_BE/categories.lang b/htdocs/langs/fr_BE/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/fr_BE/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/fr_BE/datapolicy.lang b/htdocs/langs/fr_BE/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/fr_BE/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/fr_BE/eventorganization.lang b/htdocs/langs/fr_BE/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/fr_BE/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang index 76cc09dd548..49dfeea216f 100644 --- a/htdocs/langs/fr_CA/admin.lang +++ b/htdocs/langs/fr_CA/admin.lang @@ -114,7 +114,6 @@ ForAnswersSeeForum=Pour toute autre question/aide, vous pouvez utiliser le forum HelpCenterDesc1=Voici quelques ressources pour obtenir de l'aide et du support avec Dolibarr. HelpCenterDesc2=Certaines de ces ressources ne sont disponibles qu'en anglais. ContentForLines=Contenu à afficher pour chaque produit ou service (à partir de la variable __LINES__ de Contenu) -NoticePeriod=Période de préavis NewByMonth=Nouveau par mois Emails=Courriels EMailsSetup=Configuration des courriels @@ -969,7 +968,6 @@ MailToSendSupplierInvoice=Factures fournisseurs MailToExpenseReport=Note de frais MailToMember=Membres MailToTicket=Des billets -ByDefaultInList=Afficher par défaut sur la liste vue TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version majeure ( se sentir libre de l'utiliser sur vos sites web ) TitleExampleForMaintenanceRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version de maintenance ( se sentir libre de l'utiliser sur vos sites web ) ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version majeure avec beaucoup de nouvelles fonctionnalités pour les utilisateurs et les développeurs. Vous pouvez le télécharger à partir de la zone de téléchargement du https://www.dolibarr.org portal (sous-répertoire Stable versions). Vous pouvez lire ChangeLog pour obtenir la liste complète des modifications. diff --git a/htdocs/langs/fr_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang index 61d46c46dae..21499bbff89 100644 --- a/htdocs/langs/fr_CA/banks.lang +++ b/htdocs/langs/fr_CA/banks.lang @@ -47,7 +47,6 @@ PlannedTransactions=Entrées prévues ExportDataset_banque_1=Entrées bancaires et relevé de compte PaymentNumberUpdateSucceeded=Numéro de paiement mis à jour avec succès BankTransactionLine=Entrée de la banque -EventualyAddCategory=Optionally, a category in which to classify the operations ToConciliate=Réconcilier? DefaultRIB=RIB par défaut AllRIB=Tous les RIB diff --git a/htdocs/langs/fr_CA/blockedlog.lang b/htdocs/langs/fr_CA/blockedlog.lang new file mode 100644 index 00000000000..ab5333aa867 --- /dev/null +++ b/htdocs/langs/fr_CA/blockedlog.lang @@ -0,0 +1,37 @@ +# Dolibarr language file - Source file is en_US - blockedlog +BlockedLog=Journaux inaltérables +BlockedLogDesc=Ce module permet de suivre certains événements dans un journal inaltérable (que vous ne pouvez pas modifier une fois enregistré) dans une chaîne de blocs, en temps réel. Ce module assure la compatibilité avec les exigences des lois de certains pays (comme la France avec la loi Finance 2016 - Norme NF525). +Fingerprints=Événements archivés et empreintes digitales +FingerprintsDesc=Il s'agit de l'outil permettant de parcourir ou d'extraire les logs inaltérables. Les logs inaltérables sont générés et archivés localement dans une table dédiée, en temps réel lorsque vous enregistrez un événement métier. Vous pouvez utiliser cet outil pour exporter cette archive et la sauvegarder sur un support externe (certains pays, comme la France, demandent de le faire tous les ans). A noter qu'il n'existe aucune fonctionnalité permettant de purger ce log et que toute tentative de modification directement dans ce log (par un hacker par exemple) sera signalée avec une empreinte non valide. Si vous avez vraiment besoin de purger cette table car vous avez utilisé votre application à des fins de démonstration/test et que vous souhaitez nettoyer vos données pour démarrer votre production, vous pouvez demander à votre revendeur ou intégrateur de réinitialiser votre base de données (toutes vos données seront supprimées). +CompanyInitialKey=Clé initiale de l'entreprise (hachage du bloc de genèse) +BrowseBlockedLog=Des journaux inaltérables +DownloadBlockChain=Télécharger les empreintes digitales +KoCheckFingerprintValidity=L'entrée de journal archivée n'est pas valide. Cela signifie que quelqu'un (un pirate informatique ?) a modifié certaines données de cet enregistrement après son enregistrement, ou a effacé l'enregistrement archivé précédent (vérifiez que la ligne avec le numéro précédent existe) ou a modifié la somme de contrôle de l'enregistrement précédent. +OkCheckFingerprintValidity=L'enregistrement de journal archivé est valide. Les données de cette ligne n'ont pas été modifiées et l'entrée suit la précédente. +NotAddedByAuthorityYet=Pas encore stocké dans l'autorité distante +BlockedLogBillDownload=Téléchargement de la facture client +BlockedLogBillPreview=Aperçu de la facture client +BlockedlogInfoDialog=Détails du journal +ListOfTrackedEvents=Liste des événements suivis +Fingerprint=Empreinte digitale +DataOfArchivedEvent=Données complètes de l'événement archivé +ImpossibleToReloadObject=Objet d'origine (type %s, id %s) non lié (voir la colonne « Données complètes » pour obtenir des données enregistrées inaltérables) +BlockedLogAreRequiredByYourCountryLegislation=Le module Logs inaltérables peut être exigé par la législation de votre pays. La désactivation de ce module peut rendre toutes transactions futures invalides au regard de la loi et de l'utilisation de logiciels légaux car elles ne peuvent pas être validées par un contrôle fiscal. +BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Le module Logs inaltérables a été activé en raison de la législation de votre pays. La désactivation de ce module peut rendre toutes transactions futures invalides au regard de la loi et de l'utilisation de logiciels légaux car elles ne peuvent pas être validées par un contrôle fiscal. +BlockedLogDisableNotAllowedForCountry=Liste des pays où l'utilisation de ce module est obligatoire (juste pour éviter de désactiver le module par erreur, si votre pays est dans cette liste, la désactivation du module n'est pas possible sans avoir préalablement édité cette liste. Notez également que l'activation/désactivation de ce module conservera une trace dans le journal inaltérable). +TooManyRecordToScanRestrictFilters=Trop d'enregistrements à analyser. Veuillez restreindre la liste avec des filtres plus restrictifs. +RestrictYearToExport=Restreindre le mois/l'année à exporter +BlockedLogEnabled=Un système de suivi des événements dans des journaux inaltérables a été activé +BlockedLogDisabled=Le système de suivi des événements dans des journaux inaltérables a été désactivé après que certains enregistrements ont été effectués. Nous avons enregistré une empreinte digitale spéciale pour suivre la chaîne comme étant brisée +BlockedLogDisabledBis=Le système de suivi des événements dans des journaux inaltérables a été désactivé. Cela est possible car aucun enregistrement n'a encore été effectué. +LinkHasBeenDisabledForPerformancePurpose=Pour des raisons de performance, le lien direct vers le document n'est pas affiché après la 100e ligne. +logBILL_DELETE=Facture client logiquement supprimée +logBILL_SENTBYMAIL=Facture client envoyée par courrier +logCASHCONTROL_VALIDATE=Enregistrement de la clôture de la caisse +logDOC_DOWNLOAD=Téléchargement d'un document validé afin de l'imprimer ou de l'envoyer +logDOC_PREVIEW=Aperçu d'un document validé pour l'imprimer ou le télécharger +logDONATION_PAYMENT_CREATE=Paiement de don créé +logDONATION_PAYMENT_DELETE=Suppression logique du paiement du don +logMEMBER_SUBSCRIPTION_CREATE=Abonnement membre créé +logMEMBER_SUBSCRIPTION_DELETE=Suppression logique de l'abonnement des membres +logMEMBER_SUBSCRIPTION_MODIFY=Modification de l'abonnement des membres diff --git a/htdocs/langs/fr_CA/datapolicy.lang b/htdocs/langs/fr_CA/datapolicy.lang new file mode 100644 index 00000000000..0de226eccb9 --- /dev/null +++ b/htdocs/langs/fr_CA/datapolicy.lang @@ -0,0 +1,8 @@ +# Dolibarr language file - Source file is en_US - datapolicy +Module4100Desc =Module de gestion de la confidentialité des données (Conformité au RGPD) +datapolicySetupPage =Selon les lois de votre pays (Exemple Article 5 du RGPD), les données personnelles doivent être conservées pendant une durée n'excédant pas la durée pendant laquelle les données sont nécessaires à la finalité pour laquelle elles ont été collectées, sauf à des fins d'archivage.
La suppression se fera automatiquement après une certaine durée sans événements (durée que vous aurez indiquée ci-dessous). +NB_YEARS =%s années +DATAPOLICY_ADHERENT =Membre +SendAgreement =Envoyer des e-mails +TXTLINKDATAPOLICYACCEPT =Texte pour le lien « accord » +MailSent =Un e-mail a été envoyé diff --git a/htdocs/langs/fr_CA/donations.lang b/htdocs/langs/fr_CA/donations.lang index f40255d9be0..d5fa3e857d3 100644 --- a/htdocs/langs/fr_CA/donations.lang +++ b/htdocs/langs/fr_CA/donations.lang @@ -15,7 +15,6 @@ DonationsModels=Modèles de documents pour les reçus de dons LastModifiedDonations=Derniers %s dons modifiés DonationRecipient=Destinataire du don IConfirmDonationReception=Le destinataire déclare réception, en tant que don, du montant suivant -MinimumAmount=Le montant minimum est %s FreeTextOnDonations=Texte gratuit à afficher en bas de page FrenchOptions=Options pour la France DONATION_ART200=Afficher l'article 200 de CGI si vous êtes concerné diff --git a/htdocs/langs/fr_CA/eventorganization.lang b/htdocs/langs/fr_CA/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/fr_CA/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/fr_CA/mrp.lang b/htdocs/langs/fr_CA/mrp.lang new file mode 100644 index 00000000000..40fdf46c24c --- /dev/null +++ b/htdocs/langs/fr_CA/mrp.lang @@ -0,0 +1,98 @@ +# Dolibarr language file - Source file is en_US - mrp +Mrp=Commandes de fabrication +MOs=Commandes de fabrication +MRPDescription=Module de gestion de la production et des Ordres de Fabrication (OM). +MRPArea=Zone MRP +MrpSetupPage=Installation du module MRP +MenuBOM=Listes de matériel +LatestBOMModified=Dernières nomenclatures modifiées %s +LatestMOModified=Derniers ordres de fabrication modifiés %s +Bom=Listes de matériel +BillOfMaterials=Liste des matériaux +ListOfBOMs=Nomenclatures de matériel - BOM +ListOfManufacturingOrders=Commandes de fabrication +NewBOM=Nouvelle nomenclature +ProductBOMHelp=Produit à créer (ou à désassembler) avec cette nomenclature.
Remarque : les produits avec la propriété « Nature du produit » = « Matière première » ne sont pas visibles dans cette liste. +CloneDefBomProduct=Cloner la nomenclature par défaut à utiliser pour fabriquer le produit +ErrorProductCloneBom=Erreur : échec du clonage d'une nomenclature +BOMsNumberingModules=Modèles de numérotation de nomenclature +BOMsModelModule=Modèles de documents BOM +MOsNumberingModules=Modèles de numérotation MO +MOsModelModule=Modèles de documents MO +FreeLegalTextOnBOMs=Texte libre sur le document de nomenclature +WatermarkOnDraftBOMs=Filigrane sur le brouillon de nomenclature +FreeLegalTextOnMOs=Texte libre sur le document de MO +WatermarkOnDraftMOs=Filigrane sur le brouillon MO +ConfirmCloneBillOfMaterials=Êtes-vous sûr de vouloir cloner la nomenclature %s ? +ConfirmCloneMo=Êtes-vous sûr de vouloir cloner l'ordre de fabrication %s ? +ConsumptionEfficiency=Efficacité de consommation +ValueOfMeansLoss=Une valeur de 0,95 signifie une moyenne de 5%% de perte lors de la fabrication ou du démontage +ValueOfMeansLossForProductProduced=La valeur de 0,95 signifie une perte moyenne de 5%% du produit fabriqué +CancelMo=Annuler l'ordre de fabrication +MoCancelConsumedAndProducedLines=Annuler également toutes les lignes consommées et produites (supprimer les lignes et restaurer les stocks) +ConfirmDeleteBillOfMaterials=Êtes-vous sûr de vouloir supprimer cette nomenclature ? +ConfirmDeleteMo=Etes-vous sûr de vouloir supprimer cet ordre de fabrication ? +DeleteMoChild =Supprimer les MO enfants liés à ce MO %s +MoChildsDeleted =Tous les MO enfants ont été supprimés +MenuMRP=Commandes de fabrication +NewMO=Nouvel ordre de fabrication +KeepEmptyForAsap=Vide signifie « Dès que possible » +EstimatedDurationDesc=Durée estimée de fabrication (ou de démontage) de ce produit à l'aide de cette nomenclature +ConfirmValidateBom=Etes-vous sûr de vouloir valider la nomenclature avec la référence %s (vous pourrez l'utiliser pour créer de nouveaux ordres de fabrication) +ConfirmCloseBom=Etes-vous sûr de vouloir annuler cette nomenclature (vous ne pourrez plus l'utiliser pour créer de nouveaux ordres de fabrication) ? +ConfirmReopenBom=Etes-vous sûr de vouloir rouvrir cette nomenclature (vous pourrez l'utiliser pour créer de nouveaux ordres de fabrication) +StatusMOProduced=Produit +QtyFrozen=Quantité congelée +QuantityFrozen=Quantité congelée +DisableStockChange=Changement de stock désactivé +DisableStockChangeHelp=Lorsque ce flag est positionné, il n'y a pas de changement de stock sur ce produit, quelle que soit la quantité consommée +BOMLine=Ligne de BOM +WarehouseForProduction=Entrepôt de production +CreateMO=Créer MO +ToConsume=À consommer +ToObtain=Pour obtenir +QtyAlreadyConsumed=Quantité déjà consommée +QtyAlreadyProduced=Quantité déjà produite +QtyAlreadyConsumedShort=Quantité consommée +QtyAlreadyProducedShort=Quantité produite +QtyRequiredIfNoLoss=Quantité requise pour produire la quantité définie dans la nomenclature s'il n'y a pas de perte (si l'efficacité de fabrication est de 100%%) +ConsumeOrProduce=Consommer ou produire +ConsumeAndProduceAll=Consommer et produire tout +ForAQuantityToConsumeOf=Pour une quantité à démonter de %s +ConfirmValidateMo=Etes-vous sûr de vouloir valider cet Ordre de Fabrication ? +ConfirmProductionDesc=En cliquant sur '%s', vous validerez la consommation et/ou la production pour les quantités paramétrées. Cela permettra également de mettre à jour le stock et d'enregistrer les mouvements de stock. +CancelProductionForRef=Annulation de la décrémentation du stock de produits pour le produit %s +TooltipDeleteAndRevertStockMovement=Supprimer la ligne et rétablir le mouvement du stock +AutoCloseMO=Fermer automatiquement l'ordre de fabrication si les quantités à consommer et à produire sont atteintes +NoStockChangeOnServices=Pas de changement de stock sur les services +ProductQtyToConsumeByMO=Quantité de produit restant à consommer par MO ouvert +ProductQtyToProduceByMO=Quantité de produits restant à produire par MO ouvert +AddNewProduceLines=Ajouter une nouvelle ligne pour produire +BOMTotalCost=Le coût de production de cette nomenclature en fonction du coût de chaque quantité et produit à consommer (utilisez le prix de revient s'il est défini, sinon le prix moyen pondéré s'il est défini, sinon le meilleur prix d'achat) +BOMTotalCostService=Si le module "Poste de travail" est activé et qu'un poste de travail est défini par défaut sur la ligne, alors le calcul est "quantité (convertie en heures) x ahr poste de travail", sinon "quantité x prix de revient de la prestation" +GoOnTabProductionToProduceFirst=Vous devez d'abord avoir démarré la production pour pouvoir clôturer un Ordre de Fabrication (Voir onglet '%s'). Mais vous pouvez l'Annuler. +ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit ne peut pas être utilisé dans une nomenclature ou un MO +WorkstationSetup =Installation des postes de travail +WorkstationSetupPage =Page de configuration des postes de travail +ConfirmEnableWorkstation=Êtes-vous sûr de vouloir activer le poste de travail %s ? +EnableAWorkstation=Activer un poste de travail +ConfirmDisableWorkstation=Êtes-vous sûr de vouloir désactiver le poste de travail %s ? +THMOperatorEstimated=Opérateur estimé THM +THMMachineEstimated=Machine estimée THM +HumanMachine=Humain / Machine +WorkstationArea=Espace poste de travail +BOM=Liste des matériaux +MOAndLines=Ordres et lignes de fabrication +MoChildGenerate=Générer un enfant Mo +ParentMo=Parent MO +MOChild=Enfant MO +BOMNetNeeds =Besoins nets BOM +BOMProductsList=Produits BOM +Disassemble=Démonter +QtyTot=Qté Total +MOIsClosed=L'ordre de fabrication est fermé +QtyCantBeSplit=La quantité ne peut pas être divisée +NoRemainQtyToDispatch=Il ne reste plus de quantité à diviser +THMOperatorEstimatedHelp=Coût horaire estimé de l'opérateur. Sera utilisé pour estimer le coût d'une nomenclature utilisant ce poste de travail. +THMMachineEstimatedHelp=Coût horaire estimé de la machine. Sera utilisé pour estimer le coût d'une nomenclature utilisant ce poste de travail. +BadValueForquantityToConsume=La quantité à consommer pour un matériau ne peut pas être 0 ou négative diff --git a/htdocs/langs/fr_CA/partnership.lang b/htdocs/langs/fr_CA/partnership.lang new file mode 100644 index 00000000000..f9cdff437e8 --- /dev/null +++ b/htdocs/langs/fr_CA/partnership.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - partnership +PartnershipDescription=Module Gestion des partenariats +PartnershipDescriptionLong=Module Gestion des partenariats +CancelPartnershipForExpiredMembers=Partenariat : Annuler le partenariat des membres dont l'abonnement est expiré +PartnershipCheckBacklink=Partenariat : Vérifier le backlink référent +NewPartnershipbyWeb=Votre demande de partenariat a bien été prise en compte. Nous vous contacterons prochainement... +ListOfPartnerships=Liste des partenariats +PartnershipSetup=Mise en place d'un partenariat +PartnershipAbout=À propos du partenariat +PartnershipAboutPage=Partenariat à propos de la page +partnershipforthirdpartyormember=Le statut de partenaire doit être défini sur « tiers » ou « membre » +PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks à vérifier +PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nombre de jours avant l'annulation du statut d'un partenariat lorsqu'un abonnement a expiré +ReferingWebsiteCheck=Vérification du site Web référent +ReferingWebsiteCheckDesc=Vous pouvez activer une fonctionnalité pour vérifier que vos partenaires ont ajouté un lien retour vers les domaines de votre site Web sur leur propre site Web. +PartnershipDedicatedToThisMember=Partenariat dédié à ce membre +ReasonDeclineOrCancel=Motif du refus ou de l'annulation +ManagePartnership=Gérer le partenariat +BacklinkNotFoundOnPartnerWebsite=Lien retour non trouvé sur le site Web du partenaire +ConfirmClosePartnershipAsk=Etes-vous sûr de vouloir annuler ce partenariat ? +KeywordToCheckInWebsite=Si vous souhaitez vérifier qu'un mot-clé donné est présent dans le site Web de chaque partenaire, définissez ce mot-clé ici +YourPartnershipWillSoonBeCanceledContent=Nous tenons à vous informer que notre partenariat sera bientôt résilié (nous n'avons pas obtenu de renouvellement ou une condition préalable à notre partenariat n'a pas été remplie). Veuillez nous contacter si vous avez reçu ceci suite à une erreur. +YourPartnershipRefusedContent=Nous tenons à vous informer que votre demande de partenariat a été refusée. Les conditions préalables ne sont pas remplies. Veuillez nous contacter si vous souhaitez plus d'informations. +YourPartnershipAcceptedContent=Nous tenons à vous informer que votre demande de partenariat a été acceptée. +YourPartnershipCanceledContent=Nous tenons à vous informer que notre partenariat a été annulé. Veuillez nous contacter si vous souhaitez plus d'informations. +LastCheckBacklink=Date de la dernière vérification de l'URL +NewPartnershipRequestDesc=Ce formulaire vous permet de demander à faire partie de l'un de nos programmes de partenariat. Si vous avez besoin d'aide pour remplir ce formulaire, veuillez nous contacter par e-mail %s. +ThisUrlMustContainsAtLeastOneLinkToWebsite=Cette page doit contenir au moins un lien vers l'un des domaines suivants : %s diff --git a/htdocs/langs/fr_CA/sendings.lang b/htdocs/langs/fr_CA/sendings.lang index cc326e0ff33..db9dce0b08c 100644 --- a/htdocs/langs/fr_CA/sendings.lang +++ b/htdocs/langs/fr_CA/sendings.lang @@ -3,7 +3,6 @@ AllSendings=Tous les envois ShowSending=Afficher les envois Receivings=Reçus de livraison SendingsArea=Zone d'expédition -ListOfSendings=Liste des envois SendingMethod=Méthode d'envoi LastSendings=Dernières expéditions %s StatisticsOfSendings=Statistiques pour les envois diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang index 2cdd219cda4..80f2433f9c4 100644 --- a/htdocs/langs/fr_CA/withdrawals.lang +++ b/htdocs/langs/fr_CA/withdrawals.lang @@ -3,7 +3,6 @@ StandingOrderPayment=Ordre de paiement de débit direct NewStandingOrder=Nouveau décret direct StandingOrderToProcess=Procéder WithdrawalsReceipts=Ordres de débit direct -WithdrawalReceipt=Ordre de débit direct LastWithdrawalReceipts=Derniers fichiers de débit direct %s WithdrawalsLines=Lignes de commande de débit direct NotPossibleForThisStatusOfWithdrawReceiptORLine=Pas encore possible. L'état de retrait doit être défini sur 'crédité' avant de déclarer le rejet sur des lignes spécifiques. diff --git a/htdocs/langs/fr_CH/banks.lang b/htdocs/langs/fr_CH/banks.lang deleted file mode 100644 index e3f16ee0ec6..00000000000 --- a/htdocs/langs/fr_CH/banks.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - banks -EventualyAddCategory=Optionally, a category in which to classify the operations diff --git a/htdocs/langs/fr_CH/blockedlog.lang b/htdocs/langs/fr_CH/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/fr_CH/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/fr_CH/categories.lang b/htdocs/langs/fr_CH/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/fr_CH/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/fr_CH/eventorganization.lang b/htdocs/langs/fr_CH/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/fr_CH/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/fr_CH/mails.lang b/htdocs/langs/fr_CH/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/fr_CH/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/fr_CI/banks.lang b/htdocs/langs/fr_CI/banks.lang deleted file mode 100644 index e3f16ee0ec6..00000000000 --- a/htdocs/langs/fr_CI/banks.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - banks -EventualyAddCategory=Optionally, a category in which to classify the operations diff --git a/htdocs/langs/fr_CI/blockedlog.lang b/htdocs/langs/fr_CI/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/fr_CI/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/fr_CI/categories.lang b/htdocs/langs/fr_CI/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/fr_CI/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/fr_CI/datapolicy.lang b/htdocs/langs/fr_CI/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/fr_CI/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/fr_CI/eventorganization.lang b/htdocs/langs/fr_CI/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/fr_CI/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/fr_CI/mails.lang b/htdocs/langs/fr_CI/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/fr_CI/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/fr_CI/website.lang b/htdocs/langs/fr_CI/website.lang deleted file mode 100644 index 862b8469033..00000000000 --- a/htdocs/langs/fr_CI/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.

You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include'); ?>

You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
You can also make a redirection with GET parameters:
<?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?>

To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>

You can dynamically set the page title and SEO meta tags (title, keywords, description). Simply define the following variables:
$__PAGE__TITLE__ = "Title value …";
$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated
$__PAGE__DESC__ = "Description …";


To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">
diff --git a/htdocs/langs/fr_CM/blockedlog.lang b/htdocs/langs/fr_CM/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/fr_CM/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/fr_CM/categories.lang b/htdocs/langs/fr_CM/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/fr_CM/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/fr_CM/datapolicy.lang b/htdocs/langs/fr_CM/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/fr_CM/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/fr_CM/eventorganization.lang b/htdocs/langs/fr_CM/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/fr_CM/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/fr_CM/mails.lang b/htdocs/langs/fr_CM/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/fr_CM/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index 6e2148390fc..f19388fdb23 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -56,6 +56,8 @@ ExportAccountancy=Export comptabilité WarningDataDisappearsWhenDataIsExported=Attention, cette liste ne contient que les écritures comptables qui n'ont pas encore été exportées (la date d'export est vide). Si vous souhaitez inclure les écritures comptables déjà exportées, cliquez sur le bouton ci-dessus. VueByAccountAccounting=Vue par comptes comptables VueBySubAccountAccounting=Affichage par compte auxiliaire +AccountingAccountByDefault=Compte comptable par défaut +AccountingAccountByDefaultShort=Compte par défaut MainAccountForCustomersNotDefined=Compte comptable général pour les clients non défini dans la configuration MainAccountForSuppliersNotDefined=Compte comptable général pour les fournisseurs non défini dans la configuration @@ -166,6 +168,7 @@ ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Activer l'export brouillon sur les journa ACCOUNTANCY_COMBO_FOR_AUX=Activer la liste déroulante pour les comptes auxiliaires (des lenteurs peuvent être rencontrées si vous avez de nombreux tiers) ACCOUNTING_DATE_START_BINDING=Désactiver la liaison & le transfert en comptabilité lorsque la date est inférieure à cette date (les transactions antérieures à cette date seront exclues par défaut) ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Sur la page de transfert des données en comptabilité, quelle est la période sélectionnée par défaut +ACCOUNTING_LABEL_OPERATION_ON_TRANSFER=Lors de la génération de la comptabilité, définir le libellé des écritures par défaut ACCOUNTING_SELL_JOURNAL=Ventes ACCOUNTING_PURCHASE_JOURNAL=Achats ACCOUNTING_BANK_JOURNAL=Banque @@ -177,8 +180,10 @@ ACCOUNTING_SOCIAL_JOURNAL=Paie ACCOUNTING_RESULT_PROFIT=Compte de résultat (Profit) ACCOUNTING_RESULT_LOSS=Compte de résultat (perte) ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal de clôture annuel -ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Groupes Comptabilité utilisés pour les comptes de la balance (séparés par une virgule) -ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Groupes de comptabilité utilisés pour le compte de résultat (séparés par une virgule) +ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNT=Groupes de comptes utilisés pour le calcul de la feuille balance +ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_BALANCE_SHEET_ACCOUNTHelp=Définissez ici la liste des groupes de comptes (définis dans le plan comptable) qui doivent être utilisés pour trouver tous les comptes afin de calculer la balance. Utilisez une virgule pour séparer chaque valeur.
Exemple : CAPIT,IMMO,STOCK,FINAN,THIRDPARTY +ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENT=Groupes de comptes utilisés pour le calcul du compte de résultat +ACCOUNTING_CLOSURE_ACCOUNTING_GROUPS_USED_FOR_INCOME_STATEMENTHelp=Définissez ici la liste des groupes de comptes (définis dans le plan comptable) qui doivent être utilisés pour rechercher tous les comptes afin de calculer le compte de résultat. Utilisez une virgule pour séparer chaque valeur.
Exemple : REVENUS, DÉPENSES ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable par défaut pour les virements internes TransitionalAccount=Compte transitoire de virement bancaire ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable par défaut pour les opérations en attente @@ -214,14 +219,18 @@ Codejournal=Journal JournalLabel=Libellé journal NumPiece=Numéro de pièce TransactionNumShort=Num. transaction +AccountingReport=Rapports personnalisés AccountingCategory=Groupe de comptes personnalisé AccountingCategories=Groupes de comptes personnalisés GroupByAccountAccounting=Affichage par compte comptable GroupBySubAccountAccounting=Affichage par compte auxiliaire +AccountingAccountReportsDesc=Vous pouvez définir ici des rapports pour la comptabilité. Ils seront utilisés pour les rapports comptables personnalisés. AccountingAccountGroupsDesc=Vous pouvez définir ici des groupes de comptes comptable. Il seront utilisés pour les reporting comptables personnalisés ByAccounts=Par compte comptable ByPredefinedAccountGroups=Par groupes prédéfinis ByPersonalizedAccountGroups=Par groupes personnalisés +Personalized=Personnalisé +NoReportDefined=Aucun rapport personnalisé défini NotMatch=Non défini DeleteMvt=Supprimer certaines lignes de la comptabilité DelMonth=Mois à effacer @@ -270,7 +279,7 @@ DescVentilCustomer=Consultez ici la liste des lignes de facture client lié (ou DescVentilMore=Dans la plupart des cas, si vous utilisez des produits ou services prédéfinis et que vous paramétrez le compte (du plan comptable) sur la fiche produit/service, l'application pourra faire toute la liaison entre vos lignes de facture et le compte comptable de votre plan comptable des comptes, juste en un clic avec le bouton "%s" . Si le compte n'a pas été défini sur les fiches produits/services ou s'il vous reste des lignes non liées à un compte, vous devrez effectuer une liaison manuelle depuis le menu "%s". DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable produits DescVentilTodoCustomer=Lier les lignes de factures non déjà liées à un compte comptable produit -ChangeAccount=Modifiez le compte comptable de produit/service pour les lignes sélectionnées avec le compte suivant : +ChangeAccount=Modifiez le compte produit/service (à partir du plan comptable) pour les lignes sélectionnées avec : Vide=- DescVentilSupplier=Consultez ici la liste des lignes de factures fournisseurs déjà liées ou non à un compte produit du plan comptable (seuls les enregistrements non déjà transférés en comptabilité sont visibles) DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseurs et leur compte comptable @@ -280,7 +289,7 @@ DescVentilExpenseReportMore=Si vous avez défini des comptes comptables au nivea DescVentilDoneExpenseReport=Consultez ici la liste des lignes des notes de frais et leur compte comptable Closure=Clôture annuelle AccountancyClosureStep1Desc=Consultez ici le nombre de mouvements par mois non encore validés & verrouillés -OverviewOfMovementsNotValidated=Aperçu des mouvements non validés et verrouillés +OverviewOfMovementsNotValidated=Aperçu des mouvements non encore validés et verrouillés AllMovementsWereRecordedAsValidated=Tous les mouvements ont été enregistrés comme validés et ont été verrouillés NotAllMovementsCouldBeRecordedAsValidated=Certains mouvements n'ont pas pu être enregistrés comme validés et n'ont pas été verrouillés ValidateMovements=Valider et verrouiller les mouvements @@ -402,6 +411,7 @@ SaleEECWithoutVATNumber=Vente dans la CEE sans TVA, mais le N° de TVA Intracomm ForbiddenTransactionAlreadyExported=Interdit : La transaction a été validée et/ou exportée. ForbiddenTransactionAlreadyValidated=Interdit : La transaction a été validée. DataMustHaveBeenTransferredInAccounting=Le transfert des données comptables doit avoir été effectué +IfTransactionHasDueDate=Pour les transactions liées aux documents nécessitant un paiement ## Dictionary Range=Plage de comptes Calculated=Calculé @@ -421,8 +431,8 @@ AccountancyOneUnletteringModifiedSuccessfully=Une annulation de lettrage modifi AccountancyUnletteringModifiedSuccessfully=%s annulations de lettrage modifiées avec succès ## Closure AccountancyClosureStep1=Valider et verrouiller les mouvements -AccountancyClosureStep2=Clôturer l'exercice -AccountancyClosureStep3=Extraire les entrées (facultatif) +AccountancyClosureStep2=Clôturer l'exercice fiscal +AccountancyClosureStep3=Extourner les écritures (facultatif) AccountancyClosureClose=Clôturer l'exercice fiscal AccountancyClosureAccountingReversal=Extraire et enregistrer les entrées des « A nouveaux » AccountancyClosureStep3NewFiscalPeriod=Prochain exercice fiscal @@ -455,7 +465,7 @@ AccountancyErrorMismatchBalanceAmount=Le solde (%s) n'est pas égal à 0 AccountancyErrorLetteringBookkeeping=Des erreurs sont survenues concernant les transactions : %s ErrorAccountNumberAlreadyExists=Le code comptable %s existe déjà ErrorArchiveAddFile=Impossible de mettre le fichier "%s" dans l'archive -ErrorNoFiscalPeriodActiveFound=Aucune période fiscale active trouvée. Vous pouvez en créer une à partir du menu %s - %s - %s. +ErrorNoFiscalPeriodActiveFound=Aucune période fiscale active (avec une date de début et définie) n'a été trouvée. Vous pouvez en créer une à partir du menu %s - %s - %s. ErrorBookkeepingDocDateNotOnActiveFiscalPeriod=La date du document comptable n'est pas comprise dans la période fiscale active ErrorBookkeepingDocDateIsOnAClosedFiscalPeriod=La date du document comptable se situe dans un exercice clos ## Import diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index e32c325c7d0..b87b9b8f964 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -65,6 +65,7 @@ State=Département / Canton StateId=ID d'état StateCode=Code État / Province StateShort=Département +DepartmentBuyer=Département de l'acheteur Region=Région Region-State=Région - État Country=Pays @@ -240,9 +241,9 @@ ProfId4UA=Id Prof 4 (Certificat) ProfId5UA=Id Prof 5 (RNOKPP) ProfId6UA=Id Prof 6 (TRDPAU) ProfId1DZ=RC -ProfId2DZ=Article -ProfId3DZ=Numéro d'identification du fournisseur -ProfId4DZ=Numéro d'identification du client +ProfId2DZ=NIF +ProfId3DZ=AI +ProfId4DZ=NIS VATIntra=Numéro de TVA VATIntraShort=Numéro TVA VATIntraSyntaxIsValid=Syntaxe valide @@ -384,10 +385,10 @@ DolibarrLogin=Identifiant utilisateur NoDolibarrAccess=Pas d'accès utilisateur ExportDataset_company_1=Tiers (sociétés/institutions/particuliers) et attributs ExportDataset_company_2=Contacts (de tiers) et attributs -ExportDataset_company_3=Coordonnées bancaires des tiers +ExportDataset_company_3=Modes de paiement tiers (comptes bancaires) ImportDataset_company_1=Tiers (sociétés/institutions/particuliers) et attributs ImportDataset_company_2=Contacts/Adresses (de tiers ou libre) et attributs -ImportDataset_company_3=Coordonnées bancaires des tiers +ImportDataset_company_3=Modes de paiement tiers (comptes bancaires) ImportDataset_company_4=Commerciaux des Tiers (Affectation des Commerciaux aux Tiers) PriceLevel=Niveau de prix PriceLevelLabels=Libellé de niveau de prix @@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Code libre sans vérification. ManagingDirectors=Nom du(des) gestionnaire(s) (PDG, directeur, président...) MergeOriginThirdparty=Tiers en doublon (le tiers que vous voulez supprimer) MergeThirdparties=Fusionner tiers -ConfirmMergeThirdparties=Êtes-vous sur de vouloir fusionner ce tiers avec le tiers courant ? Tous ses objets liés (factures, commandes, ...) seront déplacés vers le tiers courant, après que le tiers choisi soit supprimé. +ConfirmMergeThirdparties=Êtes-vous sûr de vouloir fusionner ce tiers avec l'actuel ? Tous les objets liés (factures, commandes, ...) seront déplacés vers le tiers actuel, puis le tiers choisi sera supprimé. ThirdpartiesMergeSuccess=Les tiers ont été fusionnés SaleRepresentativeLogin=Login du commercial SaleRepresentativeFirstname=Prénom du commercial @@ -461,3 +462,6 @@ ExternalSystemID=ID système externe IDOfPaymentInAnExternalSystem=ID du mode de paiement dans un système externe (comme Stripe, Paypal, ...) AADEWebserviceCredentials=Références du Webservice de l'AADE ThirdPartyMustBeACustomerToCreateBANOnStripe=Le tiers doit être un client pour permettre la création de ces informations bancaires côté Stripe +NewSocNameForClone=Nouveau nom société +ConfirmCloneThirdparties=Êtes-vous sûr de vouloir cloner %s société ? +SocialNetworksBusiness=Réseaux sociaux de la société diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang index ea95262f6bf..d4dd5f25ee7 100644 --- a/htdocs/langs/fr_FR/salaries.lang +++ b/htdocs/langs/fr_FR/salaries.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - salaries -SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable par défaut pour les salaires "utilisateurs" +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable général par défaut pour les salaires "utilisateurs" SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte dédié défini sur la fiche utilisateur sera utilisé pour le compte auxiliaire uniquement. Celui-ci sera utilisé pour le compte général, mais également comme valeur par défaut du compte auxiliaire s'il n'y a pas de compte comptable défini sur l'utilisateur. SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable par défaut pour les paiements de salaires CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Par défaut, laissez vide l’option "Créer automatiquement un paiement complet" lors de la création d’un salaire @@ -9,6 +9,8 @@ NewSalary=Nouveau salaire AddSalary=Ajouter un salaire NewSalaryPayment=Nouveau salaire AddSalaryPayment=Ajouter paiement de salaire +SalaryID=ID du salaire +SalaryAmount=Montant du salaire SalaryPayment=Règlement salaire SalariesPayments=Règlements des salaires SalariesPaymentsOf=Paiements des salaires de %s @@ -31,3 +33,4 @@ BankTransferAmount=Montant du virement WithdrawalReceipt=Ordres de virement OrderWaiting=En attente FillEndOfMonth=Remplir avec fin de mois +UserPaySlip=Bulletin de paie diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang index d41460f4028..c8aece70148 100644 --- a/htdocs/langs/fr_FR/website.lang +++ b/htdocs/langs/fr_FR/website.lang @@ -12,7 +12,7 @@ WEBSITE_ALIASALTDesc=Utilisez ici la liste des autres noms / alias afin que la p WEBSITE_CSS_URL=URL du fichier de la feuille de style (CSS) externe WEBSITE_CSS_INLINE=Contenu du fichier CSS (commun à toute les pages) WEBSITE_JS_INLINE=Contenu du fichier JavaScript (commun à toutes les pages) -WEBSITE_HTML_HEADER=En-tête HTML (commun à toutes les pages) +WEBSITE_HTML_HEADER=Ajout en bas de l'en-tête HTML (commun à toutes les pages) WEBSITE_ROBOT=Fichier robot (robots.txt) WEBSITE_HTACCESS=Fichier .htaccess du site web WEBSITE_MANIFEST_JSON=Fichier manifest.json de site Web @@ -56,16 +56,17 @@ ReadPerm=Lire WritePerm=Écrire TestDeployOnWeb=Tester/déployer sur le web PreviewSiteServedByWebServer=Prévisualiser %s dans un nouvel onglet.

. Le %s sera servi par un serveur web externe (comme Apache, Nginx, IIS). Vous pouvez installer et configurer ce serveur auparavant pour pointer sur le répertoire :
%s
URL servie par un serveur externe:
%s -PreviewSiteServedByDolibarr=Aperçu %s dans un nouvel onglet.

Le %s sera servi par le serveur Dolibarr aussi aucun serveur Web supplémentaire (comme Apache, Nginx, IIS) n'est nécessaire.
L'inconvénient est que l'URL des pages ne sont pas sexy et commencent par un chemin de votre Dolibarr.
URL servie par Dolibarr:
%s

Pour utiliser votre propre serveur web externe pour servir ce site web, créez un virtual host sur votre serveur web qui pointe sur le répertoire
%s
ensuite entrez le nom de ce virtual host dans les propriétés de ce site web et cliquer sur le lien "Tester/Déployer sur le web". +PreviewSiteServedByDolibarr=Aperçu %s dans un nouvel onglet.

Le %s sera servi par le serveur Dolibarr, il n'a donc pas besoin d'installer de serveur Web supplémentaire (comme Apache, Nginx, IIS).
L'inconvénient est que les URL des pages ne sont pas sexys et commencent par le chemin de votre Dolibarr.
URL servie par Dolibarr:
%s

Pour déployer ou tester en utilisant votre propre serveur Web externe (comme Apache, Nginx, Lighttp), utilisez le lien "%s". VirtualHostUrlNotDefined=URL du virtual host servit par le serveur web externe non défini NoPageYet=Pas de page pour l'instant YouCanCreatePageOrImportTemplate=Vous pouvez créer une nouvelle page ou importer un modèle de site Web complet. SyntaxHelp=Aide sur quelques astuces spécifiques de syntaxe YouCanEditHtmlSourceckeditor=Vous pouvez éditer le code source en activant l'éditeur HTML avec le bouton "Source". YouCanEditHtmlSource=
Vous pouvez inclure du code PHP dans cette source en utilisant les tags <?php ?>. Les variables globales suivantes sont disponibles : $conf, $db, $mysoc, $utilisateur, $website, $websitepage, $weblangs, $pagelangs.

Vous pouvez également inclure du contenu d'une autre page/conteneur avec la syntaxe suivante :
<?php includeContainer('alias_of_container_to_include'); ?>

Vous pouvez effectuer une redirection vers une autre page/conteneur avec la syntaxe suivante (Remarque : ne génère aucun contenu avant une redirection) :
<?php redirectToContainer(' alias_of_container_to_redirect_to'); ?>
Vous pouvez également effectuer une redirection avec les paramètres GET :
<?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?>

Pour ajouter un lien vers une autre page, utilisez la syntaxe :
<a href="alias_of_page_to_link_to.php" >monlien<a>

Pour inclure un lien pour télécharger un fichier stocké dans le répertoire documents, utilisez l'encapsuleur document.php :
Exemple, pour un fichier dans documents/ecm (besoin d'être loggué), la syntaxe est :
<a href="/document.php?modulepart=ecm&fichier= [relative_dir/]filename.ext">
Pour un fichier dans des documents/médias (répertoire ouvert en accès public), la syntaxe est:
<a href="/document.php?modulepart=medias&fichier=[relative_dir/]filename.ext">
Pour un fichier partagé avec un lien de partage (accès ouvert en utilisant la clé de partage de fichier), la syntaxe est:
<a href="/document.php?hashp=publicsharekeyoffile">
-YouCanEditHtmlSource1=
Pour inclure une image stockée dans le répertoire documents, utilisez l'encapsuleurviewimage.php.
Par exemple, pour une image dans documents/medias (répertoire ouvert en accès public), la syntaxe est :
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
-YouCanEditHtmlSource2=Pour une image partagée avec un lien de partage (accès ouvert à l'aide de la clé de partage du fichier), la syntaxe est la suivante:
<img src = "/viewimage.php?hashp=12345679012...">
+YouCanEditHtmlSource1=
Pour inclure une image stockée dans le répertoire medias (répertoire ouvert au public), utilisez le chemin relatif commençant par /medias, exemple:
<img src="/medias/image/myimagepath/filename.ext">
+YouCanEditHtmlSource2=Pour une image partagée avec un lien de partage (accès libre à l'aide de la clé de partage de fichier), utilisez l'encapsuleur :
<img src="/viewimage.php?hashp=12345679012...">
YouCanEditHtmlSource3=Pour obtenir l'adresse URL de l'image d'un objet PHP, utilisez
<img src="<?php print getImagePublicURLOfObject($object, 1, "_small") ?>">
+YouCanEditHtmlSource4=Pour obtenir l'URL d'une image à l'intérieur du contenu HTML d'un article, utilisez
<img src="<?php print getImageFromHtmlContent($htmlcontent, 1) ?>">
YouCanEditHtmlSourceMore=
Plus d'exemples de code HTML ou dynamique disponibles sur la documentation wiki.
ClonePage=Cloner la page/container CloneSite=Cloner le site @@ -94,8 +95,8 @@ SorryWebsiteIsCurrentlyOffLine=Désolé, ce site est actuellement hors ligne. Me WEBSITE_USE_WEBSITE_ACCOUNTS=Activer la table des comptes de site Web WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Activer la table pour stocker les comptes de site Web (login / pass) pour chaque site web / tiers YouMustDefineTheHomePage=Vous devez d'abord définir la page d'accueil par défaut -OnlyEditionOfSourceForGrabbedContentFuture=Avertissement : La création d'une page Web en important une page Web externe est réservée aux utilisateurs expérimentés. Selon la complexité de la page source, le résultat de l'importation peut différer de l'original. De même, si la page source utilise un style CSS en conflit ou un code JavaScript non compatible, cela peut altérer l'apparence ou les fonctionnalités de l'éditeur de site Web lorsque vous travaillez sur cette page. Cette méthode est un moyen plus rapide de créer une nouvelle page, mais il est recommandé de créer votre nouvelle page à partir de zéro ou à partir d’un modèle de page suggéré.
Notez également que l’éditeur en ligne peut ne pas fonctionner correctement quand il est utilisé sur une page créée par aspiration. -OnlyEditionOfSourceForGrabbedContent=Seule l'édition de source HTML est possible lorsque le contenu a été aspiré depuis un site externe +OnlyEditionOfSourceForGrabbedContentFuture=Avertissement : la création d'une page Web en important une page Web externe est réservée aux utilisateurs expérimentés. Selon la complexité de la page source, le résultat de l'importation peut différer de l'original. De plus, si la page source utilise des styles CSS en conflit ou un code JavaScript non compatible, cela peut altérer l'apparence ou les fonctionnalités de l'éditeur de site Web lorsque vous travaillez sur cette page. Cette méthode est un moyen plus rapide de créer une page, mais il est recommandé de créer votre nouvelle page à partir de zéro ou d'un modèle de page suggéré.
Notez également que l'éditeur en ligne peut ne pas fonctionner correctement lorsqu'il est utilisé sur une page externe récupérée. +OnlyEditionOfSourceForGrabbedContent=Seule la modification de la source HTML est possible lorsque le contenu est récupéré à partir d'un site externe GrabImagesInto=Aspirer aussi les images trouvées dans les css et la page. ImagesShouldBeSavedInto=Les images doivent être sauvegardées dans le répertoire WebsiteRootOfImages=Répertoire racine pour les images de site Web @@ -260,7 +261,7 @@ freeShipping=Expédition gratuite ! noProducts=Aucun produits nbrItemsInCart=Il y a 0 articles dans votre panier. pricesMayVaryDependingOnYourCountry=Les prix peuvent varier en fonction de votre pays. -checkOut=Vérifier +checkOut=Finaliser la commande productAddedToCart=Produit ajouté avec succès à votre panier thereIsItemInYourCart=Il y a 1 article dans votre panier. continueShopping=Continuer vos achats @@ -273,7 +274,7 @@ sidebarCategories=Catégories noSubCat=Pas de sous-catégorie specialPromo=Promotions allSpecials=Toutes les promotions -newProducts=Nouveau produits +newProducts=Nouveaux produits allNewProducts= Tous les nouveaux produits view=Voir : grid=Grille @@ -289,7 +290,7 @@ showAll=Afficher tout showing= Affichage nbrOfProducts= Il y a %s produits. noResultsHaveBeenFound=0 résultats ont été trouvés. -noResultsWereFound= Aucun résultat n'a été trouvé. +noResultsWereFound=Aucun résultat n'a été trouvé. addToCart=Ajouter au panier backHome=Revenir à l'Accueil priceDrop=Baisse des prix @@ -357,3 +358,4 @@ subtract=Soustraire LoginCheckout=Connectez-vous et procédez au paiement paymentSuccessProcessed=Votre paiement a été traité avec succès. youWillBeRedirectedToOrderPage=Vous serez rapidement redirigé vers la page de détails commande. +WebPortalSetupNotComplete=La configuration du portail Web n'est pas terminée diff --git a/htdocs/langs/fr_GA/banks.lang b/htdocs/langs/fr_GA/banks.lang deleted file mode 100644 index e3f16ee0ec6..00000000000 --- a/htdocs/langs/fr_GA/banks.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - banks -EventualyAddCategory=Optionally, a category in which to classify the operations diff --git a/htdocs/langs/fr_GA/blockedlog.lang b/htdocs/langs/fr_GA/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/fr_GA/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/fr_GA/categories.lang b/htdocs/langs/fr_GA/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/fr_GA/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/fr_GA/datapolicy.lang b/htdocs/langs/fr_GA/datapolicy.lang new file mode 100644 index 00000000000..37f9d1f48dc --- /dev/null +++ b/htdocs/langs/fr_GA/datapolicy.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). +DATAPOLICY_Tooltip_SETUP=Define the delay with no interaction after which you want the record to be automatically purged. diff --git a/htdocs/langs/fr_GA/eventorganization.lang b/htdocs/langs/fr_GA/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/fr_GA/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/fr_GA/mails.lang b/htdocs/langs/fr_GA/mails.lang deleted file mode 100644 index 9d40474152d..00000000000 --- a/htdocs/langs/fr_GA/mails.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - mails -OutGoingEmailSetupForEmailing=Outgoing emails (%s) diff --git a/htdocs/langs/fr_GA/members.lang b/htdocs/langs/fr_GA/members.lang new file mode 100644 index 00000000000..49313a51d14 --- /dev/null +++ b/htdocs/langs/fr_GA/members.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - members +MembersByCountryDesc=This screen shows you the statistics of members by countries. Graphs and charts depend on the availability of the Google online graph service as well as on the availability of a working internet connection. diff --git a/htdocs/langs/fr_GA/website.lang b/htdocs/langs/fr_GA/website.lang deleted file mode 100644 index 862b8469033..00000000000 --- a/htdocs/langs/fr_GA/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.

You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include'); ?>

You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
You can also make a redirection with GET parameters:
<?php redirectToContainer('alias_of_container_to_redirect_to', '', 0, 0, $array_of_get_params); ?>

To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>

You can dynamically set the page title and SEO meta tags (title, keywords, description). Simply define the following variables:
$__PAGE__TITLE__ = "Title value …";
$__PAGE__KEYWORDS__ = "keyword1, keyword2, keyword3 …"; // Comma separated
$__PAGE__DESC__ = "Description …";


To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">
diff --git a/htdocs/langs/fr_TN/main.lang b/htdocs/langs/fr_TN/main.lang index ae3db1eeb17..a3a5442d2cd 100644 --- a/htdocs/langs/fr_TN/main.lang +++ b/htdocs/langs/fr_TN/main.lang @@ -1,15 +1,5 @@ # Dolibarr language file - Source file is en_US - main DIRECTION=ltr -# Default for FONTFORPDF=helvetica -# Note for Chinese: -# msungstdlight or cid0ct are for traditional Chinese zh_TW (traditional does not render with Ubuntu pdf reader) -# stsongstdlight or cid0cs are for simplified Chinese zh_CN -# To read Chinese pdf with Linux: sudo apt-get install poppler-data -# cid0jp is for Japanish -# cid0kr is for Korean -# DejaVuSans is for some Eastern languages, some Asian languages and some Arabic languages -# freemono is for ru_RU or uk_UA, uz_UZ -# freeserif is for Tamil or Ethiopian FONTFORPDF=helvetica FONTSIZEFORPDF=10 SeparatorDecimal=, diff --git a/htdocs/langs/it_CH/blockedlog.lang b/htdocs/langs/it_CH/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/it_CH/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/it_CH/categories.lang b/htdocs/langs/it_CH/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/it_CH/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/it_CH/datapolicy.lang b/htdocs/langs/it_CH/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/it_CH/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/it_CH/errors.lang b/htdocs/langs/it_CH/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/it_CH/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/it_CH/eventorganization.lang b/htdocs/langs/it_CH/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/it_CH/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/it_CH/mails.lang b/htdocs/langs/it_CH/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/it_CH/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/nl_BE/datapolicy.lang b/htdocs/langs/nl_BE/datapolicy.lang new file mode 100644 index 00000000000..ed66a2bc0ab --- /dev/null +++ b/htdocs/langs/nl_BE/datapolicy.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - datapolicy +datapolicySetupPage =Depending on the laws of your countries (Example Article 5 of the GDPR), personal data must be kept for a period not exceeding the duration the data is needed for the purpose for which it was collected, except for archival purposes.
The deletion will be done automatically after a certain duration without events (the duration which you will have indicated below). diff --git a/htdocs/langs/nl_BE/eventorganization.lang b/htdocs/langs/nl_BE/eventorganization.lang deleted file mode 100644 index 263f2dc1e43..00000000000 --- a/htdocs/langs/nl_BE/eventorganization.lang +++ /dev/null @@ -1,4 +0,0 @@ -# Dolibarr language file - Source file is en_US - eventorganization -EventOrganizationConfOrBoothes=Conferences or Booths -ListOfConfOrBoothOfEvent=List of conferences or booths of event projects -EventRegistrationAreClosed=Event registrations are closed diff --git a/htdocs/langs/nl_BE/mrp.lang b/htdocs/langs/nl_BE/mrp.lang new file mode 100644 index 00000000000..64b1c7fa33e --- /dev/null +++ b/htdocs/langs/nl_BE/mrp.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - mrp +DisableStockChange=Voorraadwijziging uitgeschakeld diff --git a/htdocs/langs/nl_BE/multicurrency.lang b/htdocs/langs/nl_BE/multicurrency.lang new file mode 100644 index 00000000000..1ff628d8cb9 --- /dev/null +++ b/htdocs/langs/nl_BE/multicurrency.lang @@ -0,0 +1,9 @@ +# Dolibarr language file - Source file is en_US - multicurrency +multicurrency_appId=API-sleutel +multicurrency_appCurrencySource=Bronvaluta +multicurrency_alternateCurrencySource=Alternatieve bronvaluta +MulticurrencyReceived=Ontvangen, oorspronkele valuta +Codemulticurrency=valutacode +CancelUpdate=Annuleren +CurrencyCode=Valutacode +MutltiCurrencyAutoUpdateCurrencies=Alle valutakoersen bijwerken diff --git a/htdocs/langs/nl_BE/receptions.lang b/htdocs/langs/nl_BE/receptions.lang index 92cd96f1727..4ec8e2fc94d 100644 --- a/htdocs/langs/nl_BE/receptions.lang +++ b/htdocs/langs/nl_BE/receptions.lang @@ -3,7 +3,6 @@ RefReception=Ref. ontvangst Receptions=Ontvangen ShowReception=Ontvangsten weergeven ReceptionsArea=Ontvangsten gedeelte -ListOfReceptions=Lijst van ontvangsten StatisticsOfReceptions=Statistieken voor ontvangsten CreateReception=Creëer ontvangst QtyInOtherReceptions=Aantal in andere ontvangsten diff --git a/htdocs/langs/nl_BE/stocks.lang b/htdocs/langs/nl_BE/stocks.lang index ccfeb00e7ba..9339ccdd4ce 100644 --- a/htdocs/langs/nl_BE/stocks.lang +++ b/htdocs/langs/nl_BE/stocks.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - stocks -ListOfStockMovements=Voorraadmutatielijst LastMovements=Laatste verplaatsingen WarehouseAskWarehouseDuringOrder=Stel een magazijn in op Verkooporders QtyToDispatchShort=Aantal te verzenden diff --git a/htdocs/langs/nl_BE/ticket.lang b/htdocs/langs/nl_BE/ticket.lang index 327cd02c5ee..cdca62fba01 100644 --- a/htdocs/langs/nl_BE/ticket.lang +++ b/htdocs/langs/nl_BE/ticket.lang @@ -48,7 +48,6 @@ TicketsDisableCustomerEmail=Schakel e-mails altijd uit wanneer een ticket wordt TicketList=Lijst met tickets CreateTicket=Maak een ticket TicketsManagement=Ticket beheer -CreatedBy=Gemaakt door NewTicket=Nieuw ticket MarkAsRead=Markeer ticket als gelezen TicketHistory=Ticket geschiedenis diff --git a/htdocs/langs/pt_AO/blockedlog.lang b/htdocs/langs/pt_AO/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/pt_AO/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/pt_AO/categories.lang b/htdocs/langs/pt_AO/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/pt_AO/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/pt_AO/errors.lang b/htdocs/langs/pt_AO/errors.lang new file mode 100644 index 00000000000..259151779e4 --- /dev/null +++ b/htdocs/langs/pt_AO/errors.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - errors +ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so. diff --git a/htdocs/langs/pt_AO/hrm.lang b/htdocs/langs/pt_AO/hrm.lang new file mode 100644 index 00000000000..73b810239f7 --- /dev/null +++ b/htdocs/langs/pt_AO/hrm.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - hrm +RequiredRank=Required rank for the job profile +RequiredRankShort=Required rank +EmployeeRank=Employee rank for this skill +EmployeeRankShort=Employee rank diff --git a/htdocs/langs/pt_AO/mails.lang b/htdocs/langs/pt_AO/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/pt_AO/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/pt_AO/website.lang b/htdocs/langs/pt_AO/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/pt_AO/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 684952477cb..21bc7630a05 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -1389,7 +1389,6 @@ MailToSendSupplierInvoice=Faturas de fornecedores MailToSendReception=Recebimentos MailToContact=Contatos MailToUser=Usuários -ByDefaultInList=Exibir como padrão na visualização em lista YouUseLastStableVersion=Você utiliza a última versão estável TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta importante versão (sinta-se à vontade para usar isso nos seus websites) TitleExampleForMaintenanceRelease=Exemplo de mensagem que você pode usar para anunciar esta versão de manutenção (sinta-se à vontade para usar isso nos seus websites) diff --git a/htdocs/langs/pt_BR/assets.lang b/htdocs/langs/pt_BR/assets.lang index 00729988913..9c6e3ee5a4d 100644 --- a/htdocs/langs/pt_BR/assets.lang +++ b/htdocs/langs/pt_BR/assets.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - assets -DeleteType=Excluir DeleteAnAssetType=Excluir um tipo de recurso ConfirmDeleteAssetType=Tem certeza de que deseja excluir este tipo de recurso? AssetsTypeId=Id Tipo de ativo diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang index 6d279f4600e..c1a163024d8 100644 --- a/htdocs/langs/pt_BR/banks.lang +++ b/htdocs/langs/pt_BR/banks.lang @@ -18,7 +18,6 @@ EndBankBalance=Saldo final CurrentBalance=Saldo atual FutureBalance=Saldo futuro ShowAllTimeBalance=Mostrar saldo desde o início -AllTime=Desde o início Reconciliation=Reconciliação RIB=Número da conta bancária SwiftValid=Código de identificação bancária / Sociedade para Telecomunicações Financeiras Interbancárias Internacionais válido diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang index ed905d4a99c..f6254ef6eb9 100644 --- a/htdocs/langs/pt_BR/bills.lang +++ b/htdocs/langs/pt_BR/bills.lang @@ -225,7 +225,6 @@ IdSocialContribution=ID contribuição social PaymentId=ID pagamento PaymentRef=Ref. do pagamento InvoiceId=ID fatura -InvoiceRef=Ref. fatura InvoiceDateCreation=Data da criação da fatura InvoiceStatus=Status da fatura InvoiceNote=Nota de fatura @@ -284,7 +283,6 @@ BankCode=Código bancário BankAccountNumber=Número da conta BankAccountNumberKey=Soma de verificação Residence=Endereço -IBAN=Agencia CustomerIBAN=IBAN do cliente SupplierIBAN=IBAN do fornecedor BICNumber=Código BIC/SWIFT diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang index b161e0bae5e..5c166e6e8ca 100644 --- a/htdocs/langs/pt_BR/commercial.lang +++ b/htdocs/langs/pt_BR/commercial.lang @@ -9,7 +9,6 @@ AddActionRendezVous=Criar um evento de reunião ConfirmDeleteAction=Tem certeza que quer deleitaar este evento ? CardAction=Ficha de evento ActionOnContact=Contato relacionado -ShowTask=Mostrar tarefa ShowAction=Mostrar evento ActionsReport=Relatório de eventos SaleRepresentativesOfThirdParty=Representantes de vendas de terceiros diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang index 5023a202ddd..504b6f9976c 100644 --- a/htdocs/langs/pt_BR/donations.lang +++ b/htdocs/langs/pt_BR/donations.lang @@ -18,7 +18,6 @@ DonationReceipt=Recibo de doação DonationsModels=Modelo de documento de recepção de Doação DonationRecipient=Recipiente doaçaõ IConfirmDonationReception=O beneficiário declara ter recebido, como doação, o seguinte montante -MinimumAmount=O montante mínimo é de %s DONATION_ART200=Mostrar o artigo 200 do CGI se você está preocupado DONATION_ART238=Mostrar o artigo 238 do CGI se você está preocupado DonationPayment=Pagamento de doação diff --git a/htdocs/langs/pt_BR/receptions.lang b/htdocs/langs/pt_BR/receptions.lang index 6e61dee4b69..43ca663b869 100644 --- a/htdocs/langs/pt_BR/receptions.lang +++ b/htdocs/langs/pt_BR/receptions.lang @@ -6,7 +6,6 @@ Receptions=Recebimentos AllReceptions=Todos recebimentos ShowReception=Mostrar recebimentos ReceptionsArea=Local de recebimentos -ListOfReceptions=Lista de recebimentos ReceptionMethod=Methodo recebimento LastReceptions=Ultimos 1%s recebimentos StatisticsOfReceptions=Estatisticas dos recebimentos diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang index 8f9094adf39..312de833749 100644 --- a/htdocs/langs/pt_BR/stocks.lang +++ b/htdocs/langs/pt_BR/stocks.lang @@ -12,7 +12,6 @@ StocksByLotSerial=Estoques por lote/nº de série LotSerial=Lotes/Series LotSerialList=Listagem de lotes/series ErrorWarehouseRefRequired=A referência do armazém é necessária -ListOfWarehouses=Lista de armazéns MovementId=ID de movimento StockMovementForId=ID de movimento %d StocksArea=Setor de armazenagem diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang index bae9741d81b..d3a3335a318 100644 --- a/htdocs/langs/pt_BR/ticket.lang +++ b/htdocs/langs/pt_BR/ticket.lang @@ -113,7 +113,6 @@ TicketNewEmailBodyAdmin=

O ticket acabou de ser criado com a ID #%s, consulte TicketPublicInterfaceForbidden=A interface pública dos tickets não foi ativada ErrorEmailOrTrackingInvalid=Valor ruim para o ID ou o e-mail de rastreamento OldUser=Usuário antigo -NewUser=Novo usuário NumberOfTicketsByMonth=Número de tickets por mês NbOfTickets=Número de tickets TicketNotificationEmailSubject=Bilhete %s atualizado diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang index 4a6ce3dfe2d..0fdccebb183 100644 --- a/htdocs/langs/pt_BR/withdrawals.lang +++ b/htdocs/langs/pt_BR/withdrawals.lang @@ -4,7 +4,6 @@ StandingOrderPayment=Pedido com pagamento em Débito direto NewStandingOrder=Novo pedido para Débito direto StandingOrderToProcess=A Processar WithdrawalsReceipts=Pedidos com Débito direto -WithdrawalReceipt=Ordem de débito direto LastWithdrawalReceipts=Últimos %s arquivos de Débito direto WithdrawalsLines=Linhas do pedido para Débito direto NotPossibleForThisStatusOfWithdrawReceiptORLine=Ainda não é possível. Retirar o status deve ser definido como 'creditado' antes de declarar rejeitar em linhas específicas. @@ -34,7 +33,6 @@ StatusMotif3=Nenhum pedido para pagamento por Débito direto StatusMotif4=Pedido de venda StatusMotif8=Outras razões CreateGuichet=Apenas do escritório -OrderWaiting=Aguardando resolução NumeroNationalEmetter=Nacional Número Transmissor BankToReceiveWithdraw=Conta bancária de recebimento CreditDate=A crédito diff --git a/htdocs/langs/pt_MZ/admin.lang b/htdocs/langs/pt_MZ/admin.lang index 20610301d08..757f4c5ceb2 100644 --- a/htdocs/langs/pt_MZ/admin.lang +++ b/htdocs/langs/pt_MZ/admin.lang @@ -1354,7 +1354,6 @@ MailToSendSupplierInvoice=Faturas de fornecedores MailToSendReception=Recebimentos MailToContact=Contatos MailToUser=Usuários -ByDefaultInList=Exibir como padrão na visualização em lista YouUseLastStableVersion=Você utiliza a última versão estável TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta importante versão (sinta-se à vontade para usar isso nos seus websites) TitleExampleForMaintenanceRelease=Exemplo de mensagem que você pode usar para anunciar esta versão de manutenção (sinta-se à vontade para usar isso nos seus websites) diff --git a/htdocs/langs/pt_MZ/assets.lang b/htdocs/langs/pt_MZ/assets.lang index 00729988913..9c6e3ee5a4d 100644 --- a/htdocs/langs/pt_MZ/assets.lang +++ b/htdocs/langs/pt_MZ/assets.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - assets -DeleteType=Excluir DeleteAnAssetType=Excluir um tipo de recurso ConfirmDeleteAssetType=Tem certeza de que deseja excluir este tipo de recurso? AssetsTypeId=Id Tipo de ativo diff --git a/htdocs/langs/pt_MZ/bills.lang b/htdocs/langs/pt_MZ/bills.lang index 9dd21fdcde1..ba85707e9a8 100644 --- a/htdocs/langs/pt_MZ/bills.lang +++ b/htdocs/langs/pt_MZ/bills.lang @@ -229,7 +229,6 @@ IdSocialContribution=ID contribuição social PaymentId=ID pagamento PaymentRef=Ref. do pagamento InvoiceId=ID fatura -InvoiceRef=Ref. fatura InvoiceDateCreation=Data da criação da fatura InvoiceStatus=Status da fatura InvoiceNote=Nota de fatura @@ -290,7 +289,6 @@ BankCode=Código bancário BankAccountNumber=Número da conta BankAccountNumberKey=Soma de verificação Residence=Endereço -IBAN=Agencia CustomerIBAN=IBAN do cliente SupplierIBAN=IBAN do fornecedor BICNumber=Código BIC/SWIFT diff --git a/htdocs/langs/pt_MZ/commercial.lang b/htdocs/langs/pt_MZ/commercial.lang index 1ac6d8509b5..5ee89bae87b 100644 --- a/htdocs/langs/pt_MZ/commercial.lang +++ b/htdocs/langs/pt_MZ/commercial.lang @@ -9,7 +9,6 @@ AddActionRendezVous=Criar um evento de reunião ConfirmDeleteAction=Tem certeza que quer deleitaar este evento ? CardAction=Ficha de evento ActionOnContact=Contato relacionado -ShowTask=Mostrar tarefa ShowAction=Mostrar evento ActionsReport=Relatório de eventos SaleRepresentativesOfThirdParty=Representantes de vendas de terceiros diff --git a/htdocs/langs/pt_MZ/donations.lang b/htdocs/langs/pt_MZ/donations.lang index 5b30ada29d5..c576431eab8 100644 --- a/htdocs/langs/pt_MZ/donations.lang +++ b/htdocs/langs/pt_MZ/donations.lang @@ -18,7 +18,6 @@ DonationReceipt=Recibo de doação DonationsModels=Modelo de documento de recepção de Doação DonationRecipient=Recipiente doaçaõ IConfirmDonationReception=O beneficiário declara ter recebido, como doação, o seguinte montante -MinimumAmount=O montante mínimo é de %s DONATION_ART200=Mostrar o artigo 200 do CGI se você está preocupado DONATION_ART238=Mostrar o artigo 238 do CGI se você está preocupado DonationPayment=Pagamento de doação diff --git a/htdocs/langs/pt_MZ/receiptprinter.lang b/htdocs/langs/pt_MZ/receiptprinter.lang new file mode 100644 index 00000000000..51c20fa5b39 --- /dev/null +++ b/htdocs/langs/pt_MZ/receiptprinter.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - receiptprinter +InvoiceRef=Ref. de fatura diff --git a/htdocs/langs/ru_UA/blockedlog.lang b/htdocs/langs/ru_UA/blockedlog.lang new file mode 100644 index 00000000000..95e99de46ae --- /dev/null +++ b/htdocs/langs/ru_UA/blockedlog.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - blockedlog +KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists) or has modified checksum of the previous record. +DataOfArchivedEvent=Full data of archived event diff --git a/htdocs/langs/ru_UA/categories.lang b/htdocs/langs/ru_UA/categories.lang new file mode 100644 index 00000000000..067e1fcef81 --- /dev/null +++ b/htdocs/langs/ru_UA/categories.lang @@ -0,0 +1,4 @@ +# Dolibarr language file - Source file is en_US - categories +AddCustomerIntoCategory=Assign category to customer +AddSupplierIntoCategory=Assign category to supplier +AssignCategoryTo=Assign category to diff --git a/htdocs/langs/ru_UA/mails.lang b/htdocs/langs/ru_UA/mails.lang new file mode 100644 index 00000000000..faa6ff93e2c --- /dev/null +++ b/htdocs/langs/ru_UA/mails.lang @@ -0,0 +1,20 @@ +# Dolibarr language file - Source file is en_US - mails +EMailings=EMailings +AllEMailings=All eMailings +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error +DeleteMailing=Delete emailing +PreviewMailing=Preview emailing +CreateMailing=Create emailing +ValidMailing=Valid emailing +MailingArea=EMailings area +LastMailings=Latest %s emailings +SearchAMailing=Search mailing +SendMailing=Send emailing +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent diff --git a/htdocs/langs/ru_UA/website.lang b/htdocs/langs/ru_UA/website.lang deleted file mode 100644 index 5ee33d4418e..00000000000 --- a/htdocs/langs/ru_UA/website.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - website -specialPromo=Promotions diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang index 34ce5392ee0..7064c4bfd5b 100644 --- a/htdocs/langs/vi_VN/companies.lang +++ b/htdocs/langs/vi_VN/companies.lang @@ -65,6 +65,7 @@ State=Bang/Tỉnh StateId=ID tiểu bang StateCode=Mã tiểu bang / tỉnh StateShort=Tỉnh/ thành +DepartmentBuyer=Buyer's state/province Region=Vùng Region-State=Vùng - Tỉnh/ thành Country=Quốc gia @@ -252,7 +253,7 @@ Prospect=KH tiềm năng CustomerCard=Thẻ khách hàng Customer=Khách hàng CustomerRelativeDiscount=Giảm giá theo số tiền -SupplierRelativeDiscount=Giảm giá tương đối nhà cung cấp (%) +SupplierRelativeDiscount=Chiết khấu của nhà cung cấp tương đối CustomerRelativeDiscountShort=Giảm giá theo % CustomerAbsoluteDiscountShort=Giảm giá theo số tiền CompanyHasRelativeDiscount=Khách hàng này có giảm giá mặc định là %s%% @@ -384,10 +385,10 @@ DolibarrLogin=Đăng nhập Dolibarr NoDolibarrAccess=Không truy cập Dolibarr ExportDataset_company_1=Bên thứ ba (công ty / tổ chức / người) và tính chất của họ ExportDataset_company_2=Liên lạc và tính chất của họ -ExportDataset_company_3=Tài khoản ngân hàng của bên thứ ba +ExportDataset_company_3=Third-parties payment modes (bank accounts) ImportDataset_company_1=Bên thứ ba và tính chất của họ ImportDataset_company_2=Các liên lạc/ địa chỉ và thuộc tính bổ sung của bên thứ ba -ImportDataset_company_3=Tài khoản ngân hàng của bên thứ ba +ImportDataset_company_3=Third-parties payment modes (bank accounts) ImportDataset_company_4=Đại diện bán hàng của bên thứ ba (chỉ định đại diện bán hàng/ người dùng cho các công ty) PriceLevel=Mức giá PriceLevelLabels=Nhãn mức giá @@ -431,7 +432,7 @@ LeopardNumRefModelDesc=Free code without verification. ManagingDirectors=Tên quản lý (CEO, giám đốc, chủ tịch...) MergeOriginThirdparty=Duplicated third party (the third party you want to delete) MergeThirdparties=Hợp nhất bên thứ ba -ConfirmMergeThirdparties=Bạn có chắc chắn muốn hợp nhất bên thứ ba đã chọn với bên hiện tại không? Tất cả các đối tượng được liên kết (hóa đơn, đơn đặt hàng, ...) sẽ được chuyển sang bên thứ ba hiện tại, sau đó bên thứ ba được chọn sẽ bị xóa. +ConfirmMergeThirdparties=Are you sure you want to merge the chosen third party with the current one? All linked objects (invoices, orders, ...) will be moved to the current third party, then the chosen third party will be deleted. ThirdpartiesMergeSuccess=Các bên thứ ba đã được sáp nhập SaleRepresentativeLogin=Đăng nhập của đại diện bán hàng SaleRepresentativeFirstname=Tên đại diện bán hàng @@ -461,3 +462,6 @@ ExternalSystemID=ID hệ thống bên ngoài IDOfPaymentInAnExternalSystem=ID của chế độ thanh toán vào hệ thống bên ngoài (như Stripe, Paypal, ...) AADEWebserviceCredentials=Thông tin xác thực dịch vụ web AADE ThirdPartyMustBeACustomerToCreateBANOnStripe=Bên thứ ba phải là khách hàng để cho phép tạo thông tin ngân hàng của mình ở phía Stripe +NewSocNameForClone=New company name +ConfirmCloneThirdparties=Are you sure that you want to clone %s company ? +SocialNetworksBusiness=Social networks for company From 3ab49cf061cce96688e50eee48311fdaf0f04e45 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 18:00:01 +0100 Subject: [PATCH 48/72] Debug v21 - Standardize code and translation of RefExt --- htdocs/adherents/class/adherent.class.php | 4 +- htdocs/categories/class/categorie.class.php | 2 +- htdocs/comm/propal/class/propal.class.php | 4 +- htdocs/commande/class/commande.class.php | 2 + htdocs/compta/facture/class/facture.class.php | 2 +- htdocs/contact/class/contact.class.php | 4 +- htdocs/contrat/class/contrat.class.php | 2 +- .../class/expensereport.class.php | 4 +- htdocs/fichinter/class/fichinter.class.php | 2 +- .../class/fournisseur.commande.class.php | 2 +- htdocs/product/list.php | 38 ++++++++++++++++--- htdocs/salaries/class/paymentsalary.class.php | 2 +- htdocs/salaries/class/salary.class.php | 4 +- .../variants/class/ProductAttribute.class.php | 2 +- 14 files changed, 57 insertions(+), 17 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 0e168adddb2..bc7e0c14462 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -323,7 +323,7 @@ class Adherent extends CommonObject 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10), 'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'default' => '1', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 12, 'index' => 1), 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1), - 'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20), + 'ref_ext' => array('type' => 'varchar(128)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 20), 'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => -1, 'position' => 25), 'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 30, 'showoncombobox' => 1), 'firstname' => array('type' => 'varchar(50)', 'label' => 'Firstname', 'enabled' => 1, 'visible' => 1, 'position' => 35, 'showoncombobox' => 1), @@ -399,6 +399,8 @@ class Adherent extends CommonObject $this->isextrafieldmanaged = 1; // les champs optionnels sont vides $this->array_options = array(); + + $this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT'); } diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 69ecf8b44bf..f8c77afa6c0 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -298,7 +298,7 @@ class Categorie extends CommonObject 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'visible' => -1,), 'fk_parent' => array('type' => 'integer', 'label' => 'Fkparent', 'enabled' => 1, 'position' => 20, 'notnull' => 1, 'visible' => -1, 'css' => 'maxwidth500 widthcentpercentminusxx',), 'label' => array('type' => 'varchar(180)', 'label' => 'Label', 'enabled' => 1, 'position' => 25, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1, 'css' => 'minwidth300', 'cssview' => 'wordbreak', 'csslist' => 'tdoverflowmax150',), - 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Refext', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 0, 'alwayseditable' => 1,), + 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'position' => 30, 'notnull' => 0, 'visible' => 0, 'alwayseditable' => 1,), 'type' => array('type' => 'integer', 'label' => 'Type', 'enabled' => 1, 'position' => 35, 'notnull' => 1, 'visible' => -1, 'alwayseditable' => 1,), 'description' => array('type' => 'text', 'label' => 'Description', 'enabled' => 1, 'position' => 40, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,), 'color' => array('type' => 'varchar(8)', 'label' => 'Color', 'enabled' => 1, 'position' => 45, 'notnull' => 0, 'visible' => -1, 'alwayseditable' => 1,), diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index a043f0b2627..4db467dc34b 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -452,7 +452,9 @@ class Propal extends CommonObject $this->socid = $socid; $this->id = $propalid; - $this->duree_validite = getDolGlobalInt('PROPALE_VALIDITY_DURATION', 0); + $this->duree_validite = getDolGlobalInt('PROPALE_VALIDITY_DURATION'); + + $this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT'); } diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 6cfffd457db..a7f395116b0 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -426,6 +426,8 @@ class Commande extends CommonOrder $this->ismultientitymanaged = 1; $this->isextrafieldmanaged = 1; + + $this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT'); } /** diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 367b2ca8228..73ae657c12f 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -324,7 +324,7 @@ class Facture extends CommonInvoice 'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 5), 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20, 'index' => 1), 'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 10), - 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 12), + 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 12), 'type' => array('type' => 'smallint(6)', 'label' => 'Type', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 15), 'subtype' => array('type' => 'smallint(6)', 'label' => 'InvoiceSubtype', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 15), //'increment' =>array('type'=>'varchar(10)', 'label'=>'Increment', 'enabled'=>1, 'visible'=>-1, 'position'=>45), diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index f6acb419e47..4e46f88bb23 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -92,7 +92,7 @@ class Contact extends CommonObject public $fields = array( 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'), 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => 3, 'notnull' => 1, 'position' => 30, 'index' => 1), - 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 3, 'position' => 35), + 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 35), 'civility' => array('type' => 'varchar(6)', 'label' => 'Civility', 'enabled' => 1, 'visible' => 3, 'position' => 40), 'lastname' => array('type' => 'varchar(50)', 'label' => 'Lastname', 'enabled' => 1, 'visible' => 1, 'position' => 45, 'showoncombobox' => 1, 'searchall' => 1), 'name_alias' => array('type' => 'varchar(255)', 'label' => 'Name alias', 'enabled' => 1, 'visible' => -1, 'position' => 46, 'searchall' => 1), @@ -386,6 +386,8 @@ class Contact extends CommonObject $this->ismultientitymanaged = 1; $this->isextrafieldmanaged = 1; + $this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT'); + if (!isModEnabled('mailing')) { $this->fields['no_email']['enabled'] = 0; } diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 9e87b95609f..8e8600420be 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -268,7 +268,7 @@ class Contrat extends CommonObject public $fields = array( 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 10), 'ref' => array('type' => 'varchar(50)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'showoncombobox' => 1, 'position' => 15, 'searchall' => 1), - 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 20), + 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 20), 'ref_customer' => array('type' => 'varchar(50)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 25, 'searchall' => 1), 'ref_supplier' => array('type' => 'varchar(50)', 'label' => 'RefSupplier', 'enabled' => 1, 'visible' => -1, 'position' => 26, 'searchall' => 1), 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 30, 'index' => 1), diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 3bd2e0feb35..afd28c3d3c6 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -296,7 +296,7 @@ class ExpenseReport extends CommonObject 'ref' => array('type' => 'varchar(50)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 15), 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 20), 'ref_number_int' => array('type' => 'integer', 'label' => 'Ref number int', 'enabled' => 1, 'visible' => -1, 'position' => 25), - 'ref_ext' => array('type' => 'integer', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => -1, 'position' => 30), + 'ref_ext' => array('type' => 'integer', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 30), 'total_ht' => array('type' => 'double(24,8)', 'label' => 'Total ht', 'enabled' => 1, 'visible' => -1, 'position' => 35), 'total_tva' => array('type' => 'double(24,8)', 'label' => 'Total tva', 'enabled' => 1, 'visible' => -1, 'position' => 40), 'localtax1' => array('type' => 'double(24,8)', 'label' => 'Localtax1', 'enabled' => 1, 'visible' => -1, 'position' => 45), @@ -357,6 +357,8 @@ class ExpenseReport extends CommonObject // List of language codes for status $this->labelStatusShort = array(0 => 'Draft', 2 => 'Validated', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused'); $this->labelStatus = array(0 => 'Draft', 2 => 'ValidatedWaitingApproval', 4 => 'Canceled', 5 => 'Approved', 6 => 'Paid', 99 => 'Refused'); + + $this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT'); } /** diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 98dd96d141e..37d0bb8ad95 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -48,7 +48,7 @@ class Fichinter extends CommonObject 'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Fk projet', 'enabled' => 'isModEnabled("project")', 'visible' => -1, 'position' => 20), 'fk_contrat' => array('type' => 'integer', 'label' => 'Fk contrat', 'enabled' => '$conf->contrat->enabled', 'visible' => -1, 'position' => 25), 'ref' => array('type' => 'varchar(30)', 'label' => 'Ref', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'showoncombobox' => 1, 'position' => 30), - 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 35), + 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 35), 'ref_client' => array('type' => 'varchar(255)', 'label' => 'RefCustomer', 'enabled' => 1, 'visible' => -1, 'position' => 36), 'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => '1', 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 40, 'index' => 1), 'tms' => array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => 1, 'visible' => -1, 'notnull' => 1, 'position' => 45), diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 9fe9b26f578..3e529a3727a 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -376,7 +376,7 @@ class CommandeFournisseur extends CommonOrder public $fields = array( 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'position' => 10), 'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'enabled' => 1, 'visible' => 1, 'showoncombobox' => 1, 'position' => 25, 'searchall' => 1), - 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 35), + 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 35), 'ref_supplier' => array('type' => 'varchar(255)', 'label' => 'RefOrderSupplierShort', 'enabled' => 1, 'visible' => 1, 'position' => 40, 'searchall' => 1), 'fk_projet' => array('type' => 'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label' => 'Project', 'enabled' => "isModEnabled('project')", 'visible' => -1, 'position' => 45), 'date_valid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 710), diff --git a/htdocs/product/list.php b/htdocs/product/list.php index a1b8ebb62d2..461151ccd66 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -89,7 +89,8 @@ $fourn_id = GETPOSTINT("fourn_id"); $search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_id = GETPOST("search_id", 'alpha'); $search_ref = GETPOST("search_ref", 'alpha'); -$search_ref_supplier = GETPOST("search_ref_supplier", 'alpha'); +$search_ref_ext = trim(GETPOST("search_ref_ext", 'alpha')); +$search_ref_supplier = GETPOST("search_ref_supplier", 'alpha'); // ref of supplier price $search_barcode = GETPOST("search_barcode", 'alpha'); $search_label = GETPOST("search_label", 'alpha'); $search_default_workstation = GETPOST("search_default_workstation", 'alpha'); @@ -238,7 +239,8 @@ $arraypricelevel = array(); // Definition of array of fields for columns $arrayfields = array( 'p.rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => -2, 'noteditable' => 1, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id', 'css' => 'left'), - 'p.ref' => array('label' => 'ProductRef', 'checked' => 1, 'position' => 10), + 'p.ref' => array('label' => 'ProductRef', 'checked' => 1, 'position' => 5), + 'p.ref_ext' => array('label' => 'RefExt', 'checked' => 1, 'position' => 6, 'visible' => getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT')), //'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(isModEnabled('barcode'))), 'thumbnail' => array('label' => 'Photo', 'checked' => 0, 'position' => 10), 'p.description' => array('label' => 'Description', 'checked' => 0, 'position' => 10), @@ -365,6 +367,7 @@ if (empty($reshook)) { $search_all = ""; $search_id = ''; $search_ref = ""; + $search_ref_ext = ""; $search_ref_supplier = ""; $search_label = ""; $search_default_workstation = ""; @@ -556,6 +559,9 @@ if ($search_id) { if ($search_ref) { $sql .= natural_search('p.ref', $search_ref); } +if ($search_ref_ext) { + $sql .= natural_search('p.ref_ext', $search_ref_ext); +} if ($search_label) { $sql .= natural_search('p.label', $search_label); } @@ -783,6 +789,9 @@ foreach ($searchCategoryProductList as $searchCategoryProduct) { if ($search_ref) { $param .= "&search_ref=".urlencode($search_ref); } +if ($search_ref_ext) { + $param .= "&search_ref_ext=".urlencode($search_ref_ext); +} if ($search_ref_supplier) { $param .= "&search_ref_supplier=".urlencode($search_ref_supplier); } @@ -1007,17 +1016,22 @@ if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { } if (!empty($arrayfields['p.rowid']['checked'])) { print ''; - print ''; + print ''; print ''; } if (!empty($arrayfields['p.ref']['checked'])) { print ''; - print ''; + print ''; + print ''; +} +if (!empty($arrayfields['p.ref_ext']['checked'])) { + print ''; + print ''; print ''; } if (!empty($arrayfields['pfp.ref_fourn']['checked'])) { print ''; - print ''; + print ''; print ''; } // Thumbnail @@ -1308,6 +1322,10 @@ if (!empty($arrayfields['p.ref']['checked'])) { print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder); $totalarray['nbfield']++; } +if (!empty($arrayfields['p.ref_ext']['checked'])) { + print_liste_field_titre($arrayfields['p.ref_ext']['label'], $_SERVER["PHP_SELF"], "p.ref_ext", "", $param, "", $sortfield, $sortorder); + $totalarray['nbfield']++; +} if (!empty($arrayfields['pfp.ref_fourn']['checked'])) { print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"], "pfp.ref_fourn", "", $param, "", $sortfield, $sortorder); $totalarray['nbfield']++; @@ -1674,6 +1692,16 @@ while ($i < $imaxinloop) { } } + // Ref ext + if (!empty($arrayfields['p.ref_ext']['checked'])) { + print ''; + print dolPrintHTML($product_static->ref_ext); + print "\n"; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Ref supplier if (!empty($arrayfields['pfp.ref_fourn']['checked'])) { print ''; diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php index 816837e13b8..1097eb06f6d 100644 --- a/htdocs/salaries/class/paymentsalary.class.php +++ b/htdocs/salaries/class/paymentsalary.class.php @@ -179,7 +179,7 @@ class PaymentSalary extends CommonObject 'paye' => array('type' => 'smallint(6)', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 180), 'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => 0, 'position' => 190), 'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 200, 'visible' => 0,), - 'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 210), + 'ref_ext' => array('type' => 'varchar(128)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 210), 'note_public' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 220), ); diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php index 941cee025bc..da4fed65b02 100644 --- a/htdocs/salaries/class/salary.class.php +++ b/htdocs/salaries/class/salary.class.php @@ -162,6 +162,7 @@ class Salary extends CommonObject public $fields = array( 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'visible' => 0, 'notnull' => 1, 'index' => 1, 'position' => 1, 'comment' => 'Id'), 'ref' => array('type' => 'varchar(128)', 'label' => 'Ref', 'enabled' => 1, 'position' => 10, 'visible' => 1, 'index' => 1, 'comment' => "Reference of object"), + 'ref_ext' => array('type' => 'varchar(128)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 11), 'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 12, 'notnull' => 0, 'visible' => 1), 'datec' => array('type' => 'datetime', 'label' => 'DateCreation', 'enabled' => 1, 'visible' => 0, 'position' => 30), 'datep' => array('type' => 'date', 'label' => 'Date', 'enabled' => 1, 'visible' => 0, 'position' => 40, 'comment' => 'Date'), @@ -181,7 +182,6 @@ class Salary extends CommonObject 'paye' => array('type' => 'smallint(6)', 'label' => 'Status', 'enabled' => 1, 'visible' => 1, 'notnull' => 1, 'position' => 180), 'fk_user_author' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserAuthor', 'enabled' => 1, 'visible' => 0, 'position' => 190), 'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 200, 'visible' => 0,), - 'ref_ext' => array('type' => 'varchar(128)', 'label' => 'Ref ext', 'enabled' => 1, 'visible' => 0, 'position' => 210), 'note_public' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 220), ); @@ -196,6 +196,8 @@ class Salary extends CommonObject $this->db = $db; $this->element = 'salary'; $this->table_element = 'salary'; + + $this->fields['ref_ext']['visible'] = getDolGlobalInt('MAIN_LIST_SHOW_REF_EXT'); } /** diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php index 698d6f211fe..07554b580d3 100644 --- a/htdocs/variants/class/ProductAttribute.class.php +++ b/htdocs/variants/class/ProductAttribute.class.php @@ -102,7 +102,7 @@ class ProductAttribute extends CommonObject public $fields = array( 'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'visible' => 0, 'noteditable' => 1, 'index' => 1, 'css' => 'left', 'comment' => "Id"), 'ref' => array('type' => 'varchar(255)', 'label' => 'Ref', 'visible' => 1, 'enabled' => 1, 'position' => 10, 'notnull' => 1, 'index' => 1, 'searchall' => 1, 'comment' => "Reference of object", 'css' => 'width200'), - 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'ExternalRef', 'enabled' => 1, 'visible' => 0, 'position' => 20, 'searchall' => 1), + 'ref_ext' => array('type' => 'varchar(255)', 'label' => 'RefExt', 'enabled' => 1, 'visible' => 0, 'position' => 20, 'searchall' => 1), 'label' => array('type' => 'varchar(255)', 'label' => 'Label', 'enabled' => 1, 'position' => 30, 'notnull' => 1, 'visible' => 1, 'searchall' => 1, 'css' => 'minwidth300', 'help' => "", 'showoncombobox' => 1,), 'position' => array('type' => 'integer', 'label' => 'Rank', 'enabled' => 1, 'visible' => 0, 'default' => '0', 'position' => 40, 'notnull' => 1,), ); From 4bdbf05eb7800494fbea1537e44d39a96c3ec7dc Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 18:19:32 +0100 Subject: [PATCH 49/72] Debug v21 --- htdocs/core/lib/website2.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php index 80d6d7a735d..c2260b72b9e 100644 --- a/htdocs/core/lib/website2.lib.php +++ b/htdocs/core/lib/website2.lib.php @@ -202,7 +202,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage, $tplcontent .= ''."\n"; // Add favicon - if ($objectpage->id == $object->fk_default_home) { + if (in_array($objectpage->type_container, array('page', 'blogpost'))) { $tplcontent .= ''."\n"; } From c65c2fabcd5a9eb25c4442ed05b82cd87198deff Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 18:53:47 +0100 Subject: [PATCH 50/72] Debug v21 - ref ext on contact --- htdocs/contact/list.php | 47 +++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index ae6fd816681..ef36490d557 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -79,6 +79,7 @@ $search_cti = preg_replace('/^0+/', '', preg_replace('/[^0-9]/', '', GETPOST('se $search_phone = GETPOST("search_phone", 'alpha'); $search_id = GETPOST("search_id", "intcomma"); +$search_ref_ext = GETPOST("search_ref_ext", "alpha"); $search_firstlast_only = GETPOST("search_firstlast_only", 'alpha'); $search_lastname = GETPOST("search_lastname", 'alpha'); $search_firstname = GETPOST("search_firstname", 'alpha'); @@ -367,6 +368,7 @@ if (empty($reshook)) { if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers $search_all = ""; $search_id = ''; + $search_ref = ''; $search_firstlast_only = ""; $search_lastname = ""; $search_firstname = ""; @@ -661,6 +663,9 @@ if (strlen($search_firstlast_only)) { if ($search_id > 0) { $sql .= natural_search('p.rowid', $search_id, 1); } +if ($search_ref_ext) { + $sql .= natural_search('p.ref_ext', $search_ref_ext); +} if ($search_lastname) { $sql .= natural_search('p.lastname', $search_lastname); } @@ -859,7 +864,10 @@ if ($search_all != '') { $param .= '&search_all='.urlencode($search_all); } if ($search_id > 0) { - $param .= "&search_id=".urlencode((string) ($search_id)); + $param .= "&search_id=".((int) $search_id); +} +if ($search_ref) { + $param .= "&search_ref=".urlencode($search_ref); } if ($search_lastname != '') { $param .= '&search_lastname='.urlencode($search_lastname); @@ -1082,32 +1090,37 @@ if (!empty($arrayfields['p.rowid']['checked'])) { } if (!empty($arrayfields['p.lastname']['checked'])) { print ''; - print ''; + print ''; print ''; } if (!empty($arrayfields['p.firstname']['checked'])) { print ''; - print ''; + print ''; + print ''; +} +if (!empty($arrayfields['p.ref_ext']['checked'])) { + print ''; + print ''; print ''; } if (!empty($arrayfields['p.poste']['checked'])) { print ''; - print ''; + print ''; print ''; } if (!empty($arrayfields['p.address']['checked'])) { print ''; - print ''; + print ''; print ''; } if (!empty($arrayfields['p.zip']['checked'])) { print ''; - print ''; + print ''; print ''; } if (!empty($arrayfields['p.town']['checked'])) { print ''; - print ''; + print ''; print ''; } @@ -1279,6 +1292,10 @@ if (!empty($arrayfields['p.firstname']['checked'])) { print_liste_field_titre($arrayfields['p.firstname']['label'], $_SERVER["PHP_SELF"], "p.firstname", $begin, $param, '', $sortfield, $sortorder); $totalarray['nbfield']++; } +if (!empty($arrayfields['p.ref_ext']['checked'])) { + print_liste_field_titre($arrayfields['p.ref_ext']['label'], $_SERVER["PHP_SELF"], "p.ref_ext", $begin, $param, '', $sortfield, $sortorder); + $totalarray['nbfield']++; +} if (!empty($arrayfields['p.poste']['checked'])) { print_liste_field_titre($arrayfields['p.poste']['label'], $_SERVER["PHP_SELF"], "p.poste", $begin, $param, '', $sortfield, $sortorder); $totalarray['nbfield']++; @@ -1483,7 +1500,7 @@ while ($i < $imaxinloop) { // (Last) Name if (!empty($arrayfields['p.lastname']['checked'])) { - print ''; + print ''; if ($contextpage == 'poslist') { print $contactstatic->lastname; } else { @@ -1497,7 +1514,19 @@ while ($i < $imaxinloop) { // Firstname if (!empty($arrayfields['p.firstname']['checked'])) { - print ''.dol_escape_htmltag($obj->firstname).''; + print ''; + print dolPrintHTML($obj->firstname); + print ''; + if (!$i) { + $totalarray['nbfield']++; + } + } + + // Ref ext + if (!empty($arrayfields['p.ref_ext']['checked'])) { + print ''; + print dolPrintHTML($contactstatic->ref_ext); + print ''; if (!$i) { $totalarray['nbfield']++; } From 3c9373dd6d0fab65215f81745bd26ceb78aa3de8 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 20:03:05 +0100 Subject: [PATCH 51/72] Debug v21 --- htdocs/contact/list.php | 2 +- htdocs/product/list.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index ef36490d557..c97860a078e 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -484,7 +484,7 @@ if ($resql) { // Build and execute select // -------------------------------------------------------------------- $sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias as alias,"; -$sql .= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.address, p.zip, p.town, p.poste, p.email, p.birthday,"; +$sql .= " p.rowid, p.ref_ext, p.lastname as lastname, p.statut, p.firstname, p.address, p.zip, p.town, p.poste, p.email, p.birthday,"; $sql .= " p.socialnetworks, p.photo,"; $sql .= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_modification,"; $sql .= " p.import_key, p.fk_stcommcontact as stcomm_id, p.fk_prospectlevel,"; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index 461151ccd66..c4e85553fd6 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -457,7 +457,7 @@ if ($search_type != '' && $search_type != '-1') { // Build and execute select // -------------------------------------------------------------------- -$sql = 'SELECT p.rowid, p.ref, p.description, p.label, p.fk_product_type, p.barcode, p.price, p.tva_tx, p.price_ttc, p.price_base_type, p.entity,'; +$sql = 'SELECT p.rowid, p.ref, p.ref_ext, p.description, p.label, p.fk_product_type, p.barcode, p.price, p.tva_tx, p.price_ttc, p.price_base_type, p.entity,'; $sql .= ' p.fk_product_type, p.duration, p.finished, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,'; $sql .= ' p.tobatch, '; if (isModEnabled('workstation')) { From 2e87ad4e35854ad05a0d2f311cfa1e329110f613 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 20:06:28 +0100 Subject: [PATCH 52/72] Debug v21 --- htdocs/contact/list.php | 3 ++- htdocs/product/list.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php index c97860a078e..48d54d40f5f 100644 --- a/htdocs/contact/list.php +++ b/htdocs/contact/list.php @@ -1422,9 +1422,10 @@ while ($i < $imaxinloop) { } $arraysocialnetworks = (array) json_decode($obj->socialnetworks, true); + $contactstatic->id = $obj->rowid; + $contactstatic->ref_ext = $obj->ref_ext; $contactstatic->lastname = $obj->lastname; $contactstatic->firstname = $obj->firstname; - $contactstatic->id = $obj->rowid; $contactstatic->statut = $obj->statut; $contactstatic->poste = $obj->poste; $contactstatic->email = $obj->email; diff --git a/htdocs/product/list.php b/htdocs/product/list.php index c4e85553fd6..b83d3a871ba 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -1577,6 +1577,7 @@ while ($i < $imaxinloop) { if (empty($reshook)) { $product_static->id = $obj->rowid; $product_static->ref = $obj->ref; + $product_static->ref_ext = $obj->ref_ext; $product_static->description = $obj->description; $product_static->ref_fourn = empty($obj->ref_supplier) ? '' : $obj->ref_supplier; // deprecated $product_static->ref_supplier = empty($obj->ref_supplier) ? '' : $obj->ref_supplier; From 89e063060383078bfa17c8c485cf20d5c97dc9dd Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 21:04:34 +0100 Subject: [PATCH 53/72] Debug v21 --- htdocs/commande/list.php | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index cf144d8d151..63f4f2f27f0 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -102,6 +102,7 @@ $search_all = trim(GETPOST('search_all', 'alphanohtml')); $search_product_category = GETPOST('search_product_category', 'intcomma'); $search_id = GETPOST('search_id', 'int'); $search_ref = GETPOST('search_ref', 'alpha') != '' ? GETPOST('search_ref', 'alpha') : GETPOST('sref', 'alpha'); +$search_ref_ext = GETPOST('search_ref_ext', 'alpha'); $search_ref_customer = GETPOST('search_ref_customer', 'alpha'); $search_company = GETPOST('search_company', 'alpha'); $search_company_alias = GETPOST('search_company_alias', 'alpha'); @@ -201,6 +202,7 @@ $checkedtypetiers = 0; $arrayfields = array( 'c.rowid' => array('label' => "ID", 'checked' => 1, 'enabled' => getDolGlobalInt('MAIN_SHOW_TECHNICAL_ID'), 'position' => 1), 'c.ref' => array('label' => "Ref", 'checked' => 1, 'position' => 5, 'searchall' => 1), + 'c.ref_ext' => array('label' => "RefExt", 'checked' => 1, 'position' => 5, 'visible' => 0, 'searchall' => 1), 'c.ref_client' => array('label' => "RefCustomerOrder", 'checked' => -1, 'position' => 10, 'searchall' => 1), 'p.ref' => array('label' => "ProjectRef", 'checked' => -1, 'enabled' => (!isModEnabled('project') ? 0 : 1), 'position' => 20), 'p.title' => array('label' => "ProjectLabel", 'checked' => 0, 'enabled' => (!isModEnabled('project') ? 0 : 1), 'position' => 25), @@ -309,6 +311,7 @@ if (empty($reshook)) { $search_product_category = ''; $search_id = ''; $search_ref = ''; + $search_ref_ext = ''; $search_ref_customer = ''; $search_company = ''; $search_company_alias = ''; @@ -715,6 +718,9 @@ if (empty($reshook)) { if ($search_ref) { $param .= '&search_ref='.urlencode($search_ref); } + if ($search_ref_ext) { + $param .= '&search_ref_ext='.urlencode($search_ref_ext); + } if ($search_company) { $param .= '&search_company='.urlencode($search_company); } @@ -897,7 +903,7 @@ $sql .= " s2.nom as name2,"; $sql .= " typent.code as typent_code,"; $sql .= " state.code_departement as state_code, state.nom as state_name,"; $sql .= " country.code as country_code,"; -$sql .= ' c.rowid, c.ref, c.total_ht, c.total_tva, c.total_ttc, c.ref_client, c.fk_user_author,'; +$sql .= ' c.rowid, c.ref, c.ref_ext, c.total_ht, c.total_tva, c.total_ttc, c.ref_client, c.fk_user_author,'; $sql .= ' c.fk_multicurrency, c.multicurrency_code, c.multicurrency_tx, c.multicurrency_total_ht, c.multicurrency_total_tva as multicurrency_total_vat, c.multicurrency_total_ttc,'; $sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as billed,'; $sql .= ' c.date_creation as date_creation, c.tms as date_modification, c.date_cloture as date_cloture,'; @@ -931,7 +937,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label']) && is_arra $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)"; } if ($search_all) { - $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande'; + $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid = pd.fk_commande'; } $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = c.fk_projet"; $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON c.fk_user_author = u.rowid'; @@ -961,6 +967,9 @@ if ($search_id > 0) { if ($search_ref) { $sql .= natural_search('c.ref', $search_ref); } +if ($search_ref_ext) { + $sql .= natural_search('c.ref_ext', $search_ref_ext); +} if ($search_ref_customer) { $sql .= natural_search('c.ref_client', $search_ref_customer); } @@ -1316,6 +1325,9 @@ if ($search_id) { if ($search_ref) { $param .= '&search_ref='.urlencode($search_ref); } +if ($search_ref_ext) { + $param .= '&search_ref_ext='.urlencode($search_ref_ext); +} if ($search_company) { $param .= '&search_company='.urlencode($search_company); } @@ -1647,6 +1659,12 @@ if (!empty($arrayfields['c.ref']['checked'])) { print ''; print ''; } +// Ref ext +if (!empty($arrayfields['c.ref_ext']['checked'])) { + print ''; + print ''; + print ''; +} // Ref customer if (!empty($arrayfields['c.ref_client']['checked'])) { print ''; @@ -1944,6 +1962,10 @@ if (!empty($arrayfields['c.ref']['checked'])) { print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder); $totalarray['nbfield']++; } +if (!empty($arrayfields['c.ref_ext']['checked'])) { + print_liste_field_titre($arrayfields['c.ref_ext']['label'], $_SERVER["PHP_SELF"], 'c.ref_ext', '', $param, '', $sortfield, $sortorder); + $totalarray['nbfield']++; +} if (!empty($arrayfields['c.ref_client']['checked'])) { print_liste_field_titre($arrayfields['c.ref_client']['label'], $_SERVER["PHP_SELF"], 'c.ref_client', '', $param, '', $sortfield, $sortorder); $totalarray['nbfield']++; @@ -2283,6 +2305,16 @@ while ($i < $imaxinloop) { } } + // Ref customer + if (!empty($arrayfields['c.ref_ext']['checked'])) { + print ''; + print dol_escape_htmltag($obj->ref_ext); + print ''; + if (!$i) { + $totalarray['nbfield']++; + } + } + // Ref customer if (!empty($arrayfields['c.ref_client']['checked'])) { print ''; From e5249391f04d4035fa9fcad209f79143115adc00 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 22:33:20 +0100 Subject: [PATCH 54/72] Debug v21 - Fix trans --- dev/tools/codespell/codespell-ignore.txt | 4 +++ htdocs/core/class/translate.class.php | 18 ++++++------ test/phpunit/LangTest.php | 35 ++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 9 deletions(-) diff --git a/dev/tools/codespell/codespell-ignore.txt b/dev/tools/codespell/codespell-ignore.txt index f8205fc6495..9c957630967 100644 --- a/dev/tools/codespell/codespell-ignore.txt +++ b/dev/tools/codespell/codespell-ignore.txt @@ -86,6 +86,10 @@ espace methode datee +# Some string found because part of a text the is html entities escaped into file +tre +activ + # Translation keys addin amountin diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php index 4e3fa70483a..0c95a0d3d55 100644 --- a/htdocs/core/class/translate.class.php +++ b/htdocs/core/class/translate.class.php @@ -682,14 +682,6 @@ class Translate } } - // We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because - // we want to keep '"' '' '' '' '' '
' '< ' '' that are reliable HTML tags inside translation strings. - $str = str_replace( - array('"', '', '', '', '', '', '

', '
', '', '', '', '
', '', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>' - array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'), - $str - ); - if (strpos($key, 'Format') !== 0) { try { // @phan-suppress-next-line PhanPluginPrintfVariableFormatString @@ -699,13 +691,21 @@ class Translate } } + // We replace some HTML tags by __xx__ to avoid having them encoded by htmlentities because + // we want to keep '"' '' '' '' '' '' '' '
'
' '' '
' '
' '' '< ' that are reliable HTML tags inside translation strings. + $str = str_replace( + array('"', '', '', '', '', '', '', '
', '
', '', '', '
', '
', '', '< ', '>'), // We accept '< ' but not '<'. We can accept however '>' + array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__tagb__', '__tagbend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'), + $str + ); + // Encode string into HTML $str = htmlentities($str, ENT_COMPAT, $this->charset_output); // Do not convert simple quotes in translation (strings in html are embraced by "). Use dol_escape_htmltag around text in HTML content // Restore reliable HTML tags into original translation string $str = str_replace( array('__quot__', '__tagb__', '__tagbend__', '__tagu__', '__taguend__', '__tagi__', '__tagiend__', '__tagcenter__', '__tagcenterend__', '__taga__', '__tagaend__', '__tagbr__', '__tagspan__', '__tagspanend__', '__ltspace__', '__gt__'), - array('"', '', '', '', '', '', '
', '
', '
', '
', '', '< ', '>'), + array('"', '', '', '', '', '', '', '
', '
', '
', '
', '', '< ', '>'), $str ); diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php index 9276c9c0323..5b7a22b247e 100644 --- a/test/phpunit/LangTest.php +++ b/test/phpunit/LangTest.php @@ -103,6 +103,40 @@ class LangTest extends CommonClassTest return $langCodes; } + /** + * testLang + * + * @return void + */ + public function testTransWithHTMLInParam(): void + { + global $conf,$user,$langs,$db; + $conf = $this->savconf; + $user = $this->savuser; + $langs = $this->savlangs; + $db = $this->savdb; + + include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php'; + + $newlang = new Translate('', $conf); + $newlang->setDefaultLang('fr_FR'); + $newlang->load("admin"); + + // ErrorModuleRequirePHPVersion is a string than contains accent é and + // The ->transnoentities() does not escape nothing into entities. + $result = $newlang->transnoentities("ModuleMustBeEnabled", 'éaaa'); + print "result=".$result.PHP_EOL; + $this->assertEquals('Le module éaaa doit être activé', $result, 'Translation transnoentities ko'); + + // ErrorModuleRequirePHPVersion is a string than contains accent é and + // The ->trans() escapes content into ModuleMustBeEnabled except b, strong, a, i, br and span tags, + // but content of parameters are escaped + $result = $newlang->trans("ModuleMustBeEnabled", 'éaaa'); + print "result=".$result.PHP_EOL; + $this->assertEquals('Le module éaaa doit être activé', $result, 'Translation trans ko'); + + return; + } /** * testLang @@ -110,6 +144,7 @@ class LangTest extends CommonClassTest * * @param string $code Language code for which to verify translations * @return void + * @depends testTransWithHTMLInParam */ public function testLang($code): void { From f3ddd7f60a35642bef5a37bdcc6626e07939d07e Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 23:00:37 +0100 Subject: [PATCH 55/72] Fix size of field --- htdocs/install/mysql/migration/20.0.0-21.0.0.sql | 4 ++++ htdocs/install/mysql/tables/llx_societe_rib.sql | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql index 19a8b90a04c..0de47403ce0 100644 --- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql +++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql @@ -394,7 +394,11 @@ ALTER TABLE llx_facture_rec ADD COLUMN fk_societe_rib integer DEFAULT NULL; ALTER TABLE llx_facture ADD COLUMN is_also_delivery_note tinyint DEFAULT 0 NOT NULL; ALTER TABLE llx_user MODIFY COLUMN signature LONGTEXT; + +ALTER TABLE llx_societe_rib MODIFY COLUMN label varchar(180); -- 200 is too long to allow index after + -- Add entity field ALTER TABLE llx_societe_rib DROP INDEX uk_societe_rib; ALTER TABLE llx_societe_rib ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid; +-- select entity, label, fk_soc, MIN(rowid), MAX(rowid), COUNT(rowid) from llx_societe_rib GROUP BY entity, label, fk_soc HAVING COUNT(rowid) > 1; ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(entity, label, fk_soc); diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index e5ef25a45b3..46e2903e3a4 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -26,7 +26,7 @@ create table llx_societe_rib rowid integer AUTO_INCREMENT PRIMARY KEY, entity integer DEFAULT 1 NOT NULL, -- multi company id type varchar(32) DEFAULT 'ban' NOT NULL, -- 'ban' or 'paypal' or 'card' or 'stripe' - label varchar(200), + label varchar(180), fk_soc integer NOT NULL, datec datetime, tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, From 30f804706f4ac9fb1064f1dc921ccd5bf319d9bd Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 23:04:08 +0100 Subject: [PATCH 56/72] Comment --- htdocs/install/mysql/migration/20.0.0-21.0.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql index 0de47403ce0..05463e8fd7f 100644 --- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql +++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql @@ -400,5 +400,5 @@ ALTER TABLE llx_societe_rib MODIFY COLUMN label varchar(180); -- 200 is too long -- Add entity field ALTER TABLE llx_societe_rib DROP INDEX uk_societe_rib; ALTER TABLE llx_societe_rib ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid; --- select entity, label, fk_soc, MIN(rowid), MAX(rowid), COUNT(rowid) from llx_societe_rib GROUP BY entity, label, fk_soc HAVING COUNT(rowid) > 1; +--select entity, label, fk_soc, MIN(iban_prefix), MAX(iban_prefix), MIN(rowid), MAX(rowid), COUNT(rowid) from llx_societe_rib GROUP BY entity, label, fk_soc HAVING COUNT(rowid) > 1; ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(entity, label, fk_soc); From 22772adc4864b999bd8850dd941cff92487776f0 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Sun, 12 Jan 2025 23:45:13 +0100 Subject: [PATCH 57/72] Doc --- htdocs/install/mysql/migration/20.0.0-21.0.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql index 05463e8fd7f..49e7647d723 100644 --- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql +++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql @@ -400,5 +400,5 @@ ALTER TABLE llx_societe_rib MODIFY COLUMN label varchar(180); -- 200 is too long -- Add entity field ALTER TABLE llx_societe_rib DROP INDEX uk_societe_rib; ALTER TABLE llx_societe_rib ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid; ---select entity, label, fk_soc, MIN(iban_prefix), MAX(iban_prefix), MIN(rowid), MAX(rowid), COUNT(rowid) from llx_societe_rib GROUP BY entity, label, fk_soc HAVING COUNT(rowid) > 1; +-- select entity, label, fk_soc, default_rib, MIN(iban_prefix), MAX(iban_prefix), MIN(rowid), MAX(rowid), COUNT(rowid) from llx_societe_rib GROUP BY entity, label, fk_soc, default_rib HAVING COUNT(rowid) > 1; ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(entity, label, fk_soc); From 1fa16d7aa0bf107dc3e01d4fd93ad59302412a79 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Mon, 13 Jan 2025 00:02:38 +0100 Subject: [PATCH 58/72] Debug v21 - ban was truncated --- htdocs/install/mysql/migration/20.0.0-21.0.0.sql | 1 + htdocs/install/mysql/tables/llx_societe_rib.sql | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql index 49e7647d723..2ea5cf7a51e 100644 --- a/htdocs/install/mysql/migration/20.0.0-21.0.0.sql +++ b/htdocs/install/mysql/migration/20.0.0-21.0.0.sql @@ -396,6 +396,7 @@ ALTER TABLE llx_user MODIFY COLUMN signature LONGTEXT; ALTER TABLE llx_societe_rib MODIFY COLUMN label varchar(180); -- 200 is too long to allow index after +ALTER TABLE llx_societe_rib MODIFY COLUMN iban_prefix varchar(100); -- Add entity field ALTER TABLE llx_societe_rib DROP INDEX uk_societe_rib; diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql index 46e2903e3a4..71a618b4acb 100644 --- a/htdocs/install/mysql/tables/llx_societe_rib.sql +++ b/htdocs/install/mysql/tables/llx_societe_rib.sql @@ -40,7 +40,7 @@ create table llx_societe_rib bic varchar(20), -- 11 according to ISO 9362 (we keep 20 for backward compatibility) bic_intermediate varchar(11), -- 11 according to ISO 9362. Same as bic but for intermediate bank - iban_prefix varchar(80), -- full iban. 34 according to ISO 13616 but we set 80 to allow to store it with encryption information + iban_prefix varchar(100), -- full iban. 34 according to ISO 13616 but we set 100 to allow to store it with encryption information domiciliation varchar(255), proprio varchar(60), From b17846657710c5902a2fcd1c96edf4a34b2b8ec5 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Mon, 13 Jan 2025 00:08:16 +0100 Subject: [PATCH 59/72] Fix migration --- htdocs/install/mysql/migration/21.0.0-22.0.0.sql | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql index 3f36f041b14..5af4f5bd7a9 100644 --- a/htdocs/install/mysql/migration/21.0.0-22.0.0.sql +++ b/htdocs/install/mysql/migration/21.0.0-22.0.0.sql @@ -32,6 +32,11 @@ -- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences(); +-- V21 forgotten + +ALTER TABLE llx_societe_rib MODIFY COLUMN label varchar(180); +ALTER TABLE llx_societe_rib MODIFY COLUMN iban_prefix varchar(100); + -- V22 migration From a021c4e667067529508713ec21c6b5018d758831 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Mon, 13 Jan 2025 01:05:34 +0100 Subject: [PATCH 60/72] Fix date selector html --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6d7a26c9453..29de7398bac 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7287,7 +7287,7 @@ class Form // You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery' $usecalendar = 'combo'; if (!empty($conf->use_javascript_ajax) && (!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') != "none")) { - $usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR); + $usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : getDolGlobalString("MAIN_POPUP_CALENDAR")); } if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) { // If we use a text browser or screen reader, we use the 'combo' date selector @@ -7317,7 +7317,7 @@ class Form if (!$disabled) { $retstringbuttom = ''; } else { $retstringbuttom = ''; @@ -7364,7 +7364,7 @@ class Form // Input area to enter date manually $retstring .= '
'; - $retstring .= 'trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript From be6869f388c1ea7029a2df6b180b6ce953a89725 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Mon, 13 Jan 2025 01:05:34 +0100 Subject: [PATCH 61/72] Fix date selector html --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index d148f8fd784..7a7ebef6936 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -7287,7 +7287,7 @@ class Form // You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery' $usecalendar = 'combo'; if (!empty($conf->use_javascript_ajax) && (!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') != "none")) { - $usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR); + $usecalendar = ((!getDolGlobalString('MAIN_POPUP_CALENDAR') || getDolGlobalString('MAIN_POPUP_CALENDAR') == 'eldy') ? 'jquery' : getDolGlobalString("MAIN_POPUP_CALENDAR")); } if (getDolGlobalString('MAIN_OPTIMIZEFORTEXTBROWSER')) { // If we use a text browser or screen reader, we use the 'combo' date selector @@ -7317,7 +7317,7 @@ class Form if (!$disabled) { $retstringbuttom = ''; } else { $retstringbuttom = ''; @@ -7364,7 +7364,7 @@ class Form // Input area to enter date manually $retstring .= '
'; - $retstring .= 'trans("FormatDateShortJavaInput")) . '\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript From 0a80d437dec235b3796a2d51014846e0237dcef3 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Mon, 13 Jan 2025 12:31:08 +0100 Subject: [PATCH 62/72] Doc --- htdocs/theme/eldy/badges.inc.php | 3 +++ htdocs/theme/eldy/btn.inc.php | 3 ++- htdocs/theme/eldy/dropdown.inc.php | 4 +++- htdocs/theme/eldy/emaillayout.inc.php | 2 ++ htdocs/theme/eldy/flags-sprite.inc.php | 2 +- htdocs/theme/eldy/global.inc.php | 2 +- htdocs/theme/eldy/info-box.inc.php | 2 +- htdocs/theme/eldy/main_menu_fa_icons.inc.php | 2 +- htdocs/theme/eldy/manifest.json.php | 1 + htdocs/theme/eldy/progress.inc.php | 5 +++-- htdocs/theme/eldy/timeline.inc.php | 3 ++- htdocs/theme/md/badges.inc.php | 4 +++- htdocs/theme/md/btn.inc.php | 3 ++- htdocs/theme/md/dropdown.inc.php | 4 +++- htdocs/theme/md/flags-sprite.inc.php | 3 ++- htdocs/theme/md/info-box.inc.php | 3 ++- htdocs/theme/md/main_menu_fa_icons.inc.php | 3 ++- htdocs/theme/md/progress.inc.php | 3 --- htdocs/theme/md/style.css.php | 3 ++- 19 files changed, 36 insertions(+), 19 deletions(-) diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php index afd7e020886..01a3f1d4824 100644 --- a/htdocs/theme/eldy/badges.inc.php +++ b/htdocs/theme/eldy/badges.inc.php @@ -28,6 +28,9 @@ if (!defined('ISLOADEDBYSTEELSHEET')) { @phan-var-force string $colorblind_deuteranopes_badgeWarning '; ?> + +/* IDE Hack
'; + print '
'; - print '
'; ?> - - -
-
-
-
- - ">trans('Reset') ?> + print ''; ?> + + +
+
+
+
+ + ">trans('Reset') ?> -   -
- '; +   +
+ '; - print '
'; - print '
'; - ?> + print '