From f26b0f917fcde4f8e0dcd0b352b275ca6ddf381d Mon Sep 17 00:00:00 2001 From: Sylvain Legrand Date: Sun, 14 Aug 2022 16:31:34 +0200 Subject: [PATCH 1/5] Improve french phone settings (international numbering) --- htdocs/core/lib/functions.lib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 2f9cb532708..ca21a5d922b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2920,6 +2920,8 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2); } elseif (dol_strlen($phone) == 12) { $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2); + } elseif (dol_strlen($phone) == 13) { + $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 2); // InfraS add } } elseif (strtoupper($countrycode) == "CA") { if (dol_strlen($phone) == 10) { From e9181815e8155a92d60f33b3863dddb00d9cb91f Mon Sep 17 00:00:00 2001 From: Sylvain Legrand Date: Wed, 17 Aug 2022 08:02:55 +0200 Subject: [PATCH 2/5] Update functions.lib.php --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index ca21a5d922b..e9be536650f 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2921,7 +2921,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli } elseif (dol_strlen($phone) == 12) { $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2); } elseif (dol_strlen($phone) == 13) { - $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 2); // InfraS add + $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 2); } } elseif (strtoupper($countrycode) == "CA") { if (dol_strlen($phone) == 10) { From ccbae643246831fecb10158718e9704b15e413f4 Mon Sep 17 00:00:00 2001 From: atm-greg Date: Fri, 19 Aug 2022 15:36:57 +0200 Subject: [PATCH 3/5] fix put line errase desc and label of line --- htdocs/comm/propal/class/api_proposals.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index e4b9a266198..f569bfaaa8f 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -395,8 +395,8 @@ class Proposals extends DolibarrApi $request_data = (object) $request_data; - $request_data->desc = checkVal($request_data->desc, 'restricthtml'); - $request_data->label = checkVal($request_data->label); + if (isset($request_data->desc)) $request_data->desc = checkVal($request_data->desc, 'restricthtml'); + if (isset($request_data->label)) $request_data->label = checkVal($request_data->label); $propalline = new PropaleLigne($this->db); $result = $propalline->fetch($lineid); From c4e88b739fac44efab09470a9bef9927920cd895 Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Fri, 19 Aug 2022 13:46:44 +0000 Subject: [PATCH 4/5] Fixing style errors. --- htdocs/comm/propal/class/api_proposals.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php index f569bfaaa8f..1ce7f82b99d 100644 --- a/htdocs/comm/propal/class/api_proposals.class.php +++ b/htdocs/comm/propal/class/api_proposals.class.php @@ -395,7 +395,7 @@ class Proposals extends DolibarrApi $request_data = (object) $request_data; - if (isset($request_data->desc)) $request_data->desc = checkVal($request_data->desc, 'restricthtml'); + if (isset($request_data->desc)) $request_data->desc = checkVal($request_data->desc, 'restricthtml'); if (isset($request_data->label)) $request_data->label = checkVal($request_data->label); $propalline = new PropaleLigne($this->db); From 1927131799511e671b565b007a7a20ed8c2b2737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 24 Aug 2022 16:38:05 +0200 Subject: [PATCH 5/5] add trans --- htdocs/user/bank.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index 597372fc17c..77db07fe7d8 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -543,10 +543,10 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac if ($permissiontoaddbankaccount) { $morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=create'); } else { - $morehtmlright = dolGetButtonTitle($langs->trans('Add'), 'NotEnoughPermission', 'fa fa-plus-circle', '', '', -2); + $morehtmlright = dolGetButtonTitle($langs->trans('Add'), $langs->trans('NotEnoughPermission'), 'fa fa-plus-circle', '', '', -2); } } else { - $morehtmlright = dolGetButtonTitle($langs->trans('Add'), 'AlreadyOneBankAccount', 'fa fa-plus-circle', '', '', -2); + $morehtmlright = dolGetButtonTitle($langs->trans('Add'), $langs->trans('AlreadyOneBankAccount'), 'fa fa-plus-circle', '', '', -2); } print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank_account');