From 0513ae8cd02829cf337225e140ce60c26115dc69 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Fri, 5 Apr 2019 09:41:27 +0200 Subject: [PATCH 01/21] to avoid : Warning: A non-numeric value encountered --- htdocs/fourn/facture/paiement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index aa24196ec2f..f38fc1efa0c 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -136,7 +136,7 @@ if (empty($reshook)) if (substr($key, 0, 7) == 'amount_') { $cursorfacid = substr($key, 7); - $amounts[$cursorfacid] = price2num(trim(GETPOST($key))); + $amounts[$cursorfacid] = (float) price2num(trim(GETPOST($key))); $totalpayment = $totalpayment + $amounts[$cursorfacid]; if (! empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++; $result=$tmpinvoice->fetch($cursorfacid); From 2722760d1da0a59af9caba873df89f7340324896 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:12:54 +0200 Subject: [PATCH 02/21] backward --- htdocs/fourn/facture/paiement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index f38fc1efa0c..aa24196ec2f 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -136,7 +136,7 @@ if (empty($reshook)) if (substr($key, 0, 7) == 'amount_') { $cursorfacid = substr($key, 7); - $amounts[$cursorfacid] = (float) price2num(trim(GETPOST($key))); + $amounts[$cursorfacid] = price2num(trim(GETPOST($key))); $totalpayment = $totalpayment + $amounts[$cursorfacid]; if (! empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++; $result=$tmpinvoice->fetch($cursorfacid); From 68c1332244718acf80df200ff281944b15495206 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:19:16 +0200 Subject: [PATCH 03/21] update code --- .../commande/doc/doc_generic_order_odt.modules.php | 10 +++++----- .../core/modules/commande/doc/pdf_einstein.modules.php | 4 ++-- .../modules/commande/doc/pdf_eratosthene.modules.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php index d2f2ba9af07..5685a839314 100644 --- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php +++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2012 Juanjo Menent * Copyright (C) 2014 Marcos García * Copyright (C) 2016 Charlie Benke - * Copyright (C) 2018 Philippe Grand + * Copyright (C) 2018-2019 Philippe Grand * Copyright (C) 2018 Frédéric France * * This program is free software; you can redistribute it and/or modify @@ -47,10 +47,10 @@ class doc_generic_order_odt extends ModelePDFCommandes public $emetteur; /** - * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) - */ - public $phpmin = array(5, 4); + * @var array Minimum version of PHP required by module. + * e.g.: PHP ≥ 5.5 = array(5, 5) + */ + public $phpmin = array(5, 5); /** * @var string Dolibarr version of the loaded document diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 39cfff534b7..3f3c5b5b93f 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -69,9 +69,9 @@ class pdf_einstein extends ModelePDFCommandes /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php index e0ded421e35..1f6248a8655 100644 --- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php @@ -69,9 +69,9 @@ class pdf_eratosthene extends ModelePDFCommandes /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From f833bbcb322e4b2d2a13123d037390c939be53df Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:21:34 +0200 Subject: [PATCH 04/21] update code --- .../modules/contract/doc/doc_generic_contract_odt.modules.php | 4 ++-- htdocs/core/modules/contract/doc/pdf_strato.modules.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php index 8319bff919b..124d51a33ad 100644 --- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php +++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php @@ -46,9 +46,9 @@ class doc_generic_contract_odt extends ModelePDFContract /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php index fd0f5cd38a0..e592e893437 100644 --- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php +++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php @@ -62,9 +62,9 @@ class pdf_strato extends ModelePDFContract /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 0de76fc128eea2db32249dff037f063f8a921b79 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:23:50 +0200 Subject: [PATCH 05/21] update code --- .../expedition/doc/doc_generic_shipment_odt.modules.php | 8 ++++---- .../core/modules/expedition/doc/pdf_espadon.modules.php | 4 ++-- htdocs/core/modules/expedition/doc/pdf_merou.modules.php | 4 ++-- htdocs/core/modules/expedition/doc/pdf_rouget.modules.php | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php index 53891a1c340..28e5addd2b2 100644 --- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php +++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php @@ -3,8 +3,8 @@ * Copyright (C) 2012 Juanjo Menent * Copyright (C) 2014 Marcos García * Copyright (C) 2016 Charlie Benke - * Copyright (C) 2018 Philippe Grand - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018-2019 Philippe Grand + * Copyright (C) 2018 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 @@ -48,9 +48,9 @@ class doc_generic_shipment_odt extends ModelePdfExpedition /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php index a250b92be40..f84afc7e55c 100644 --- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php @@ -58,9 +58,9 @@ class pdf_espadon extends ModelePdfExpedition /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php index 649d20154e4..be4a25a1a7d 100644 --- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php @@ -59,9 +59,9 @@ class pdf_merou extends ModelePdfExpedition /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php index 945132e0a85..3b3d79adb92 100644 --- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php +++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php @@ -58,9 +58,9 @@ class pdf_rouget extends ModelePdfExpedition /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From baecb2056283b50323d225be06aff8a136387711 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:24:41 +0200 Subject: [PATCH 06/21] update code --- .../core/modules/expensereport/doc/pdf_standard.modules.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php index 4e7a6bec088..aa3e49f837f 100644 --- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php @@ -1,7 +1,7 @@ * Copyright (C) 2015 Alexandre Spangaro - * Copyright (C) 2016-2018 Philippe Grand + * Copyright (C) 2016-2019 Philippe Grand * Copyright (C) 2018 Frédéric France * Copyright (C) 2018 Francis Appels * Copyright (C) 2019 Markus Welters @@ -65,9 +65,9 @@ class pdf_standard extends ModeleExpenseReport /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 2ed71b00395dce1278e7b5e63631031c6bba6c18 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:26:39 +0200 Subject: [PATCH 07/21] update code --- .../facture/doc/doc_generic_invoice_odt.modules.php | 8 ++++---- htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 4 ++-- htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php index 77a779d8ce0..642140e0ce8 100644 --- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -46,10 +46,10 @@ class doc_generic_invoice_odt extends ModelePDFFactures public $emetteur; /** - * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) - */ - public $phpmin = array(5, 4); + * @var array Minimum version of PHP required by module. + * e.g.: PHP ≥ 5.5 = array(5, 5) + */ + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 10314734d9b..8795544f565 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -70,9 +70,9 @@ class pdf_crabe extends ModelePDFFactures /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php index e4f8d56f652..10834dd7a28 100644 --- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php @@ -70,9 +70,9 @@ class pdf_sponge extends ModelePDFFactures /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 327ac2973e5fe0db420c05252b58e96f420c4659 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:27:25 +0200 Subject: [PATCH 08/21] update code --- htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 559b4cd6d5e..09473e4b65d 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -60,9 +60,9 @@ class pdf_soleil extends ModelePDFFicheinter /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 30e2d8fa6b5d3454691c9d6b75192f9d5f47092d Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:28:01 +0200 Subject: [PATCH 09/21] update code --- htdocs/core/modules/livraison/doc/pdf_typhon.modules.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php index e84a05dd227..a2124b801a6 100644 --- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php +++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php @@ -3,7 +3,7 @@ * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2008 Chiptronik - * Copyright (C) 2011-2018 Philippe Grand + * Copyright (C) 2011-2019 Philippe Grand * Copyright (C) 2015 Marcos García * This program is free software; you can redistribute it and/or modify @@ -61,9 +61,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 42df91e4e2757c2c3608a8c77bf7c6df8b20d435 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:29:01 +0200 Subject: [PATCH 10/21] update code --- .../product/doc/doc_generic_product_odt.modules.php | 8 ++++---- htdocs/core/modules/product/doc/pdf_standard.modules.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php index edb54b13ace..49dc1b7598c 100644 --- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php +++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php @@ -44,10 +44,10 @@ class doc_generic_product_odt extends ModelePDFProduct public $emetteur; /** - * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) - */ - public $phpmin = array(5, 4); + * @var array Minimum version of PHP required by module. + * e.g.: PHP ≥ 5.5 = array(5, 5) + */ + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php index b8b05410fb1..e9b95b4e1d7 100644 --- a/htdocs/core/modules/product/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php @@ -58,9 +58,9 @@ class pdf_standard extends ModelePDFProduct /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 3a209d2454eea0f276963e237eefe71928c6d4f8 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:30:32 +0200 Subject: [PATCH 11/21] update code --- .../project/doc/doc_generic_project_odt.modules.php | 4 ++-- htdocs/core/modules/project/doc/pdf_baleine.modules.php | 4 ++-- .../project/task/doc/doc_generic_task_odt.modules.php | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index b925a29327c..2c217aec260 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -62,9 +62,9 @@ class doc_generic_project_odt extends ModelePDFProjects /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php index e5f5e9a9654..f99a68b29d7 100644 --- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php @@ -60,9 +60,9 @@ class pdf_baleine extends ModelePDFProjects /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index 151d800f04d..4d2e47f0593 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -62,10 +62,10 @@ class doc_generic_task_odt extends ModelePDFTask public $emetteur; /** - * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) - */ - public $phpmin = array(5, 4); + * @var array Minimum version of PHP required by module. + * e.g.: PHP ≥ 5.5 = array(5, 5) + */ + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From edd5661f1aeba0096271e80e59dd13e56499d95c Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:31:33 +0200 Subject: [PATCH 12/21] update code --- .../modules/propale/doc/doc_generic_proposal_odt.modules.php | 4 ++-- htdocs/core/modules/propale/doc/pdf_azur.modules.php | 4 ++-- htdocs/core/modules/propale/doc/pdf_cyan.modules.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php index d303e52d734..7b274ac0c9a 100644 --- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php +++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php @@ -45,9 +45,9 @@ class doc_generic_proposal_odt extends ModelePDFPropales /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * @var string Dolibarr version of the loaded document diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 24fe36b3213..548b8eb81e5 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -68,9 +68,9 @@ class pdf_azur extends ModelePDFPropales /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php index aa40bdcfb68..655d6a5d98e 100644 --- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php @@ -68,9 +68,9 @@ class pdf_cyan extends ModelePDFPropales /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 350a04108f1fa6fa2a45bedaea2e40e44b157dbf Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:32:18 +0200 Subject: [PATCH 13/21] update code --- .../reception/doc/doc_generic_reception_odt.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php index 4854af7bfac..588b848f3d3 100644 --- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php +++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php @@ -43,9 +43,9 @@ class doc_generic_reception_odt extends ModelePdfReception /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); // Minimum version of PHP required by module + public $phpmin = array(5, 5); /** * @var string Dolibarr version of the loaded document From c26afe15fff8fe7d53b27a95db9c804ed787c36b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:33:20 +0200 Subject: [PATCH 14/21] update code --- .../core/modules/societe/doc/doc_generic_odt.modules.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php index 0043f14990d..a6738ddcc90 100644 --- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php +++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php @@ -1,7 +1,7 @@ - * Copyright (C) 2016 Charlie Benke - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2016 Charlie Benke + * Copyright (C) 2018 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 @@ -44,9 +44,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** From 1d84dcbe17c286524c2f57b42d9b937f14f52007 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:34:26 +0200 Subject: [PATCH 15/21] update code --- .../modules/stock/doc/doc_generic_stock_odt.modules.php | 6 +++--- htdocs/core/modules/stock/doc/pdf_standard.modules.php | 4 ++-- htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php index 4c8f33b3506..35c467c110c 100644 --- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php +++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php @@ -1,7 +1,7 @@ * Copyright (C) 2012 Juanjo Menent - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018 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 @@ -45,9 +45,9 @@ class doc_generic_stock_odt extends ModelePDFStock /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php index 7f174149e09..af03aa8daee 100644 --- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php @@ -58,9 +58,9 @@ class pdf_standard extends ModelePDFStock /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php index 563c2ea1011..dd52b001479 100644 --- a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php +++ b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php @@ -59,9 +59,9 @@ class pdf_stdmovement extends ModelePDFMovement /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 144ebb2f89f630f5f06e5b409329721dccf747db Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:35:39 +0200 Subject: [PATCH 16/21] update code --- .../supplier_invoice/pdf/pdf_canelle.modules.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index a28644f0e60..bfccb0dbcc2 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -1,8 +1,8 @@ - * Copyright (C) 2010-2014 Laurent Destailleur - * Copyright (C) 2015 Marcos García - * Copyright (C) 2018 Frédéric France +/* Copyright (C) 2010-2011 Juanjo Menent + * Copyright (C) 2010-2014 Laurent Destailleur + * Copyright (C) 2015 Marcos García + * Copyright (C) 2018 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 @@ -59,9 +59,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 3ff5c6b42b7bafd64efdea6f634c26ca12bebf53 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:36:51 +0200 Subject: [PATCH 17/21] update code --- .../modules/supplier_order/pdf/pdf_cornas.modules.php | 8 ++++---- .../modules/supplier_order/pdf/pdf_muscadet.modules.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php index d32cb71c1e9..270450b86a2 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php @@ -3,9 +3,9 @@ * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2015 Marcos García + * Copyright (C) 2015 Marcos García * Copyright (C) 2017 Ferran Marcet - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018 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 @@ -63,9 +63,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 0cc9d4f6af3..4962a09dfbb 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -3,9 +3,9 @@ * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2007 Franky Van Liedekerke * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2015 Marcos García + * Copyright (C) 2015 Marcos García * Copyright (C) 2017 Ferran Marcet - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018 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 @@ -63,9 +63,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 1b2aa27c2f2edfa8f712edd43a1e04d1244b07fe Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:37:21 +0200 Subject: [PATCH 18/21] update code --- .../modules/supplier_payment/doc/pdf_standard.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php index cb52a14f721..79ad993ef81 100644 --- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php +++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php @@ -60,9 +60,9 @@ class pdf_standard extends ModelePDFSuppliersPayments /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 2e7256a0949627867102519a670b52fb95033234 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:38:35 +0200 Subject: [PATCH 19/21] update code --- .../doc/doc_generic_supplier_proposal_odt.modules.php | 10 +++++----- .../supplier_proposal/doc/pdf_aurore.modules.php | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php index d2dffce83c4..7b38ec52c0e 100644 --- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php @@ -2,7 +2,7 @@ /* Copyright (C) 2010-2012 Laurent Destailleur * Copyright (C) 2012 Juanjo Menent * Copyright (C) 2016 Charlie Benke - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018 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 @@ -45,10 +45,10 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal public $emetteur; /** - * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) - */ - public $phpmin = array(5, 4); + * @var array Minimum version of PHP required by module. + * e.g.: PHP ≥ 5.5 = array(5, 5) + */ + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php index e5759d9ff6d..2d9f6796df7 100644 --- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php +++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php @@ -3,8 +3,8 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2008 Raphael Bertrand * Copyright (C) 2010-2014 Juanjo Menent - * Copyright (C) 2012 Christophe Battarel - * Copyright (C) 2017 Ferran Marcet + * Copyright (C) 2012 Christophe Battarel + * Copyright (C) 2017 Ferran Marcet * * 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 @@ -60,9 +60,9 @@ class pdf_aurore extends ModelePDFSupplierProposal /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From 9b8297ee158fc9ef00c6c882e9382501d7eb421b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:39:00 +0200 Subject: [PATCH 20/21] update code --- htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php index 80e95037d24..80576bfcca0 100644 --- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php +++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php @@ -43,9 +43,9 @@ class doc_generic_user_odt extends ModelePDFUser /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document From bb5e60ad54686b4388857cd6bef2840dcd910a39 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 9 Apr 2019 09:39:38 +0200 Subject: [PATCH 21/21] update code --- .../usergroup/doc/doc_generic_usergroup_odt.modules.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php index 0840f40a868..023bc714ac3 100644 --- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php +++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php @@ -1,7 +1,7 @@ * Copyright (C) 2012 Juanjo Menent - * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018 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 @@ -46,9 +46,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup /** * @var array Minimum version of PHP required by module. - * e.g.: PHP ≥ 5.4 = array(5, 4) + * e.g.: PHP ≥ 5.5 = array(5, 5) */ - public $phpmin = array(5, 4); + public $phpmin = array(5, 5); /** * Dolibarr version of the loaded document