From c9b8da8acbc15c1b56129e3fe40ef5fa8dd7324e Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 19 Sep 2018 16:06:39 +0200 Subject: [PATCH 01/19] Missing translation --- htdocs/expedition/shipment.php | 5 +++-- htdocs/langs/en_US/deliveries.lang | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index 24ccda2157901..33e1dd97f7b88 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -4,6 +4,7 @@ * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012-2015 Juanjo Menent * Copyright (C) 2018 Frédéric France + * Copyright (C) 2018 Philippe Grand * * 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 @@ -921,8 +922,8 @@ } else { - /* Commande non trouvee */ - print "Commande inexistante"; + /* Order not found */ + setEventMessages($langs->trans("NonExistentOrder"), null, 'errors'); } } diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang index 7e39f48ea5552..1c9cb7919002b 100644 --- a/htdocs/langs/en_US/deliveries.lang +++ b/htdocs/langs/en_US/deliveries.lang @@ -28,3 +28,4 @@ ErrorStockIsNotEnough=There's not enough stock Shippable=Shippable NonShippable=Not Shippable ShowReceiving=Show delivery receipt +NonExistentOrder=Non-existent order From 30e426e4872e2c9412d01299b0dce4211c12a55b Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 19 Sep 2018 16:21:52 +0200 Subject: [PATCH 02/19] Standardize and update code --- .../commande/doc/doc_generic_order_odt.modules.php | 7 ++++++- .../core/modules/commande/doc/pdf_einstein.modules.php | 6 +++--- .../contract/doc/doc_generic_contract_odt.modules.php | 7 ++++++- .../doc/doc_generic_shipment_odt.modules.php | 7 ++++++- .../facture/doc/doc_generic_invoice_odt.modules.php | 5 +++++ .../product/doc/doc_generic_product_odt.modules.php | 7 ++++++- .../core/modules/product/doc/pdf_standard.modules.php | 10 +++++++--- 7 files changed, 39 insertions(+), 10 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 ba9a9490daaea..1230bcad52de5 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 @@ -38,9 +38,14 @@ */ class doc_generic_order_odt extends ModelePDFCommandes { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 1bae075142f8e..cba8ed016b921 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -114,9 +114,9 @@ class pdf_einstein extends ModelePDFCommandes public $marge_basse; /** - * Issuer - * @var Societe - */ + * Issuer + * @var Societe + */ public $emetteur; // Objet societe qui emet 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 f8940dd95efc2..ab43829a30519 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 @@ -37,9 +37,14 @@ */ class doc_generic_contract_odt extends ModelePDFContract { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; 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 f5e2b182a7339..6e058f4a92d7a 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 @@ -39,9 +39,14 @@ */ class doc_generic_shipment_odt extends ModelePdfExpedition { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; 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 ddd2df87b9397..fb34a3da1f9a9 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 @@ -38,9 +38,14 @@ */ class doc_generic_invoice_odt extends ModelePDFFactures { + /** + * Issuer + * @var Societe + */ public $emetteur; // Objet societe qui emet public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; 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 ca50317fe814f..f4a829dcc5121 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 @@ -36,9 +36,14 @@ */ class doc_generic_product_odt extends ModelePDFProduct { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php index 16efd19083675..b163e22c7125a 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.3 = array(5, 3) + * e.g.: PHP ≥ 5.4 = array(5, 4) */ - public $phpmin = array(5, 2); + public $phpmin = array(5, 4); /** * Dolibarr version of the loaded document @@ -76,7 +76,11 @@ class pdf_standard extends ModelePDFProduct public $marge_haute; public $marge_basse; - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; /** From 57fc8cf06fccbc51f1bc446dc9b2176cce54759d Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 19 Sep 2018 16:31:36 +0200 Subject: [PATCH 03/19] Standardize and update code --- .../project/task/doc/doc_generic_task_odt.modules.php | 5 +++++ .../propale/doc/doc_generic_proposal_odt.modules.php | 5 +++++ .../stock/doc/doc_generic_stock_odt.modules.php | 7 ++++++- htdocs/core/modules/stock/doc/pdf_standard.modules.php | 10 +++++++--- .../core/modules/stock/doc/pdf_stdmovement.modules.php | 10 +++++++--- .../doc/doc_generic_supplier_proposal_odt.modules.php | 7 ++++++- .../modules/user/doc/doc_generic_user_odt.modules.php | 7 ++++++- .../doc/doc_generic_usergroup_odt.modules.php | 7 ++++++- 8 files changed, 48 insertions(+), 10 deletions(-) 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 7846c68af7a77..b7500731ab951 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 @@ -54,9 +54,14 @@ */ class doc_generic_task_odt extends ModelePDFTask { + /** + * Issuer + * @var Societe + */ public $emetteur; // Objet societe qui emet public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; 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 7483c2a9623e9..03a555435c451 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 @@ -37,9 +37,14 @@ */ class doc_generic_proposal_odt extends ModelePDFPropales { + /** + * Issuer + * @var Societe + */ public $emetteur; // Objet societe qui emet public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; 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 d5e0f1ba984cd..a433287a63ce5 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 @@ -36,9 +36,14 @@ */ class doc_generic_stock_odt extends ModelePDFStock { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php index 66799612d8fe7..957a4fc2e3206 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.3 = array(5, 3) + * e.g.: PHP ≥ 5.4 = array(5, 4) */ - public $phpmin = array(5, 2); + public $phpmin = array(5, 4); /** * Dolibarr version of the loaded document @@ -76,7 +76,11 @@ class pdf_standard extends ModelePDFStock public $marge_haute; public $marge_basse; - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; /** diff --git a/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php b/htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php index a4795926cc4f9..0c9c55b5e7fb4 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.3 = array(5, 3) + * e.g.: PHP ≥ 5.4 = array(5, 4) */ - public $phpmin = array(5, 2); + public $phpmin = array(5, 4); /** * Dolibarr version of the loaded document @@ -77,7 +77,11 @@ class pdf_stdmovement extends ModelePDFMovement public $marge_haute; public $marge_basse; - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; /** 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 5a318a3a6b3ab..423804b284c96 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 @@ -37,9 +37,14 @@ */ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; 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 e3d44050149a3..1f993bfcd861f 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 @@ -35,9 +35,14 @@ */ class doc_generic_user_odt extends ModelePDFUser { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; 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 76cc423eb32aa..ffb356cbb9bf5 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 @@ -37,9 +37,14 @@ */ class doc_generic_usergroup_odt extends ModelePDFUserGroup { - public $emetteur; // Objet societe qui emet + /** + * Issuer + * @var Societe + */ + public $emetteur; public $phpmin = array(5,4,0); // Minimum version of PHP required by module + public $version = 'dolibarr'; From bd3ba04e2401e912ac7fcc80ef739fd2631733b8 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 19 Sep 2018 16:36:08 +0200 Subject: [PATCH 04/19] Standardize and update code --- .../modules/commande/doc/doc_generic_order_odt.modules.php | 4 ++++ .../modules/contract/doc/doc_generic_contract_odt.modules.php | 4 ++++ .../expedition/doc/doc_generic_shipment_odt.modules.php | 4 ++++ .../modules/facture/doc/doc_generic_invoice_odt.modules.php | 4 ++++ .../modules/product/doc/doc_generic_product_odt.modules.php | 4 ++++ .../modules/project/task/doc/doc_generic_task_odt.modules.php | 4 ++++ .../modules/propale/doc/doc_generic_proposal_odt.modules.php | 4 ++++ .../core/modules/stock/doc/doc_generic_stock_odt.modules.php | 4 ++++ 8 files changed, 32 insertions(+) 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 1230bcad52de5..7c3ca5bd2e67d 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 @@ -46,6 +46,10 @@ class doc_generic_order_odt extends ModelePDFCommandes public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; 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 ab43829a30519..eca3f13d57f52 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 @@ -45,6 +45,10 @@ class doc_generic_contract_odt extends ModelePDFContract public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; 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 6e058f4a92d7a..729663bf625fe 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 @@ -47,6 +47,10 @@ class doc_generic_shipment_odt extends ModelePdfExpedition public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; 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 fb34a3da1f9a9..77824b75c8c5e 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,6 +46,10 @@ class doc_generic_invoice_odt extends ModelePDFFactures public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; 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 f4a829dcc5121..b11e17a662318 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,6 +44,10 @@ class doc_generic_product_odt extends ModelePDFProduct public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; 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 b7500731ab951..c881c6c5b465b 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,6 +62,10 @@ class doc_generic_task_odt extends ModelePDFTask public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; 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 03a555435c451..469d154ddc595 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,6 +45,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; 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 a433287a63ce5..4f9de22f9751a 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 @@ -44,6 +44,10 @@ class doc_generic_stock_odt extends ModelePDFStock public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; From 52533a0210dbd4c2be0e2987e109c04019fd67d3 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Wed, 19 Sep 2018 16:43:37 +0200 Subject: [PATCH 05/19] Standardize and update code --- .../doc/doc_generic_supplier_proposal_odt.modules.php | 4 ++++ htdocs/core/modules/ticket/mod_ticket_simple.php | 7 ++++++- htdocs/core/modules/ticket/mod_ticket_universal.php | 7 ++++++- .../core/modules/user/doc/doc_generic_user_odt.modules.php | 4 ++++ .../usergroup/doc/doc_generic_usergroup_odt.modules.php | 4 ++++ 5 files changed, 24 insertions(+), 2 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 423804b284c96..a259fbbe7eeb1 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 @@ -45,6 +45,10 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php index aa8b4c4e3f583..a220120853444 100644 --- a/htdocs/core/modules/ticket/mod_ticket_simple.php +++ b/htdocs/core/modules/ticket/mod_ticket_simple.php @@ -30,7 +30,12 @@ */ class mod_ticket_simple extends ModeleNumRefTicket { - public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + public $prefix = 'TS'; public $error = ''; public $nom = "Simple"; diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php index c3dad0aa482b3..ee201740eed71 100644 --- a/htdocs/core/modules/ticket/mod_ticket_universal.php +++ b/htdocs/core/modules/ticket/mod_ticket_universal.php @@ -29,7 +29,12 @@ */ class mod_ticket_universal extends ModeleNumRefTicket { - public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + /** + * Dolibarr version of the loaded document + * @public string + */ + public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr' + public $error = ''; public $nom = 'Universal'; public $name = 'Universal'; 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 1f993bfcd861f..41fb48ecec577 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,6 +43,10 @@ class doc_generic_user_odt extends ModelePDFUser public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; 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 ffb356cbb9bf5..571a12aaf7b59 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 @@ -45,6 +45,10 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup public $phpmin = array(5,4,0); // Minimum version of PHP required by module + /** + * Dolibarr version of the loaded document + * @public string + */ public $version = 'dolibarr'; From 042555e716c80ed9897e2368821dc140a5c6d342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 20 Sep 2018 20:44:17 +0200 Subject: [PATCH 06/19] remove warning Line exceeds 500 characters --- htdocs/core/modules/modSyslog.class.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php index d401b2f162171..7166a7878092b 100644 --- a/htdocs/core/modules/modSyslog.class.php +++ b/htdocs/core/modules/modSyslog.class.php @@ -85,7 +85,20 @@ function __construct($db) // Cronjobs $this->cronjobs = array( - 0=>array('label'=>'CompressSyslogs', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'compressSyslogs', 'parameters'=>'', 'comment'=>'Compress and archive log files. Warning: batch must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission "rws" on this directory so log files will always have the group and permissions of the web server Operating System group', 'frequency'=>1, 'unitfrequency'=> 3600 * 24, 'priority'=>50, 'status'=>0, 'test'=>true), + 0 => array( + 'label' => 'CompressSyslogs', + 'jobtype' => 'method', + 'class' => 'core/class/utils.class.php', + 'objectname' => 'Utils', + 'method' => 'compressSyslogs', + 'parameters' => '', + 'comment' => 'Compress and archive log files. Warning: batch must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission "rws" on this directory so log files will always have the group and permissions of the web server Operating System group', + 'frequency' => 1, + 'unitfrequency' => 3600 * 24, + 'priority' => 50, + 'status' => 0, + 'test' => true, + ), ); } } From 0073d63464c1b18061685e8401e33f619666d7ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Sep 2018 09:42:33 +0200 Subject: [PATCH 07/19] Fix phpcs --- test/phpunit/LoanTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/test/phpunit/LoanTest.php b/test/phpunit/LoanTest.php index 8341f788edea9..d54c810049d41 100644 --- a/test/phpunit/LoanTest.php +++ b/test/phpunit/LoanTest.php @@ -214,5 +214,4 @@ public function testLoanDelete($id) $this->assertLessThan($result, 0); return $result; } - } From d0fafe8f0f1299cfdd73eb5cf823b7c2372bf1dc Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Fri, 21 Sep 2018 09:49:13 +0200 Subject: [PATCH 08/19] fix link with connect transaction.php --- htdocs/stripe/transaction.php | 81 ++++++++++++++++------------------- 1 file changed, 37 insertions(+), 44 deletions(-) diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index 9d9a1c84597a1..2a62144a6e14e 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -1,6 +1,5 @@ - * Copyright (C) 2018 Frédéric France +/* Copyright (C) 2018 PtibogXIV * * 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 @@ -26,9 +25,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; -if (! empty($conf->accounting->enabled)) { - require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php'; -} +if (! empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingjournal.class.php'; // Load translation files required by the page $langs->loadLangs(array('compta', 'salaries', 'bills', 'hrm', 'stripe')); @@ -65,16 +62,16 @@ if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha'))) { $service = 'StripeTest'; - $servicestatus = '0'; + $servicestatus = '0'; dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); } else { $service = 'StripeLive'; - $servicestatus = '1'; + $servicestatus = '1'; } -$stripeaccount = $stripe->getStripeAccount($service); +$stripeacc = $stripe->getStripeAccount($service); /*if (empty($stripeaccount)) { print $langs->trans('ErrorStripeAccountNotDefined'); @@ -83,9 +80,8 @@ if (! $rowid) { print '
'; - if ($optioncss != '') { - print ''; - } + if ($optioncss != '') + print ''; print ''; print ''; print ''; @@ -94,7 +90,7 @@ print ''; $title=$langs->trans("StripeTransactionList"); - $title.=($stripeaccount?' (Stripe connection with Stripe OAuth Connect account '.$stripeaccount.')':' (Stripe connection with keys from Stripe module setup)'); + $title.=($stripeaccount?' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')':' (Stripe connection with keys from Stripe module setup)'); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', '', $limit); @@ -115,9 +111,9 @@ print "\n"; - if ($stripeaccount) + if ($stripeacc) { - $txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeaccount)); + $txn = \Stripe\BalanceTransaction::all(array("limit" => $limit), array("stripe_account" => $stripeacc)); } else { @@ -128,10 +124,10 @@ { //$charge = $txn; //var_dump($txn); - + // The metadata FULLTAG is defined by the online payment page /*$FULLTAG=$charge->metadata->FULLTAG; - + // Save into $tmparray all metadata $tmparray = dolExplodeIntoArray($FULLTAG,'.','='); // Load origin object according to metadata @@ -151,7 +147,7 @@ { $memberstatic->id = 0; }*/ - + $societestatic->fetch($charge->metadata->idcustomer); $societestatic->id = $charge->metadata->idcustomer; $societestatic->lastname = $obj->lastname; @@ -162,28 +158,28 @@ $societestatic->societe_id = $obj->fk_soc; print ''; - + + // Ref + if (!empty($stripeacc)) $connect=$stripeacc.'/'; + // Ref - if (! empty($conf->stripe->enabled) && !empty($stripeacc)) $connect=$stripeacc.'/'; - if (preg_match('/po_/i', $txn->source)){ $origin="payouts"; } elseif (preg_match('/fee_/i', $txn->source)) { - $origin="connect/application_fees"; + $origin="connect/application_fees"; } else { - $origin="payments"; - } - + $origin="payments"; + } + $url='https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source; - - if ($servicestatus) - { - $url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source; - } - + if ($servicestatus) + { + $url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source; + } if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') { - print "".$txn->type.""; - } else print "".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "\n"; + print "".$txn->type.""; + } else print "".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "\n"; + // Stripe customer //print "".$charge->customer."\n"; // Link @@ -198,16 +194,15 @@ } print "\n";*/ // Origine - //print ""; ////if ($charge->metadata->dol_type=="order"){ // $object = new Commande($db); // $object->fetch($charge->metadata->dol_id); - // print "".img_picto('', 'object_order')." ".$object->ref.""; + // print "".img_picto('', 'object_order')." ".$object->ref.""; //} elseif ($charge->metadata->dol_type=="invoice"){ // $object = new Facture($db); // $object->fetch($charge->metadata->dol_id); - // print "".img_picto('', 'object_invoice')." ".$object->ref.""; + // print "".img_picto('', 'object_invoice')." ".$object->ref.""; //} //print "\n"; // Date payment @@ -219,21 +214,19 @@ print "" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . ""; // Status print ""; - if ($txn->status=='available') { - print img_picto($langs->trans("".$txn->status.""),'statut4'); - } elseif ($txn->status=='pending') { - print img_picto($langs->trans("".$txn->status.""),'statut7'); - } elseif ($txn->status=='failed') { - print img_picto($langs->trans("".$txn->status.""),'statut8'); - } +if ($txn->status=='available') + {print img_picto($langs->trans("".$txn->status.""),'statut4');} +elseif ($txn->status=='pending') + {print img_picto($langs->trans("".$txn->status.""),'statut7');} +elseif ($txn->status=='failed') + {print img_picto($langs->trans("".$txn->status.""),'statut8');} print ''; print "\n"; } print ""; print ''; print '
'; -} +} else {} -// End of page llxFooter(); $db->close(); From d544f0598b8b90fe69ba5b777433fd548355b843 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Fri, 21 Sep 2018 09:50:31 +0200 Subject: [PATCH 09/19] fix link in connect mode --- htdocs/stripe/charge.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php index d39cac84eca16..0f26bf0e11a5e 100644 --- a/htdocs/stripe/charge.php +++ b/htdocs/stripe/charge.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2018 Thibault FOUCART * * 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 @@ -62,13 +62,13 @@ if (! empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox','alpha'))) { $service = 'StripeTest'; - $servicestatus = '0'; + $servicestatus = '0'; dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning'); } else { - $service = 'StripeLive'; - $servicestatus = '1'; + $service = 'StripeLive'; + $servicestatus = '1'; } $stripeacc = $stripe->getStripeAccount($service); @@ -150,7 +150,7 @@ print ''; - if (! empty($conf->stripe->enabled) && !empty($stripeacc)) $connect=$stripeacc.'/'; + if (!empty($stripeacc)) $connect=$stripeacc.'/'; // Ref $url='https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id; From 61d0aa66a57f1c28aaf141c41699744de0a51a1f Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Fri, 21 Sep 2018 09:52:08 +0200 Subject: [PATCH 10/19] Update transaction.php --- htdocs/stripe/transaction.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index 2a62144a6e14e..79da90d4c10f8 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2018 Thibault FOUCART + * 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 From 933f253c86bb9397109a6c3bfa4de28f560b6cb2 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Fri, 21 Sep 2018 09:52:27 +0200 Subject: [PATCH 11/19] Update transaction.php --- htdocs/stripe/transaction.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index 79da90d4c10f8..200eb8ee15844 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2018 Thibault FOUCART * Copyright (C) 2018 Frédéric France * * This program is free software; you can redistribute it and/or modify @@ -227,7 +227,7 @@ print ""; print ''; print ''; -} else {} +} llxFooter(); $db->close(); From d09b74abe5150b8a9bd72bef6f369a123d31afa6 Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Fri, 21 Sep 2018 09:54:07 +0200 Subject: [PATCH 12/19] Update transaction.php --- htdocs/stripe/transaction.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index 200eb8ee15844..c75b252ee4367 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -125,10 +125,10 @@ { //$charge = $txn; //var_dump($txn); - + // The metadata FULLTAG is defined by the online payment page /*$FULLTAG=$charge->metadata->FULLTAG; - + // Save into $tmparray all metadata $tmparray = dolExplodeIntoArray($FULLTAG,'.','='); // Load origin object according to metadata @@ -148,7 +148,7 @@ { $memberstatic->id = 0; }*/ - + $societestatic->fetch($charge->metadata->idcustomer); $societestatic->id = $charge->metadata->idcustomer; $societestatic->lastname = $obj->lastname; @@ -167,11 +167,11 @@ if (preg_match('/po_/i', $txn->source)){ $origin="payouts"; } elseif (preg_match('/fee_/i', $txn->source)) { - $origin="connect/application_fees"; + $origin="connect/application_fees"; } else { - $origin="payments"; - } - + $origin="payments"; + } + $url='https://dashboard.stripe.com/'.$connect.'test/'.$origin.'/'.$txn->source; if ($servicestatus) { @@ -229,5 +229,6 @@ print ''; } +// End of page llxFooter(); $db->close(); From 60cb83cf25af445544654fbb3ed25f94338d3d7b Mon Sep 17 00:00:00 2001 From: ptibogxiv Date: Fri, 21 Sep 2018 09:55:24 +0200 Subject: [PATCH 13/19] Update transaction.php --- htdocs/stripe/transaction.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index c75b252ee4367..595583a63f115 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -215,12 +215,12 @@ print "" . price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency)) . ""; // Status print ""; -if ($txn->status=='available') - {print img_picto($langs->trans("".$txn->status.""),'statut4');} -elseif ($txn->status=='pending') - {print img_picto($langs->trans("".$txn->status.""),'statut7');} -elseif ($txn->status=='failed') - {print img_picto($langs->trans("".$txn->status.""),'statut8');} + if ($txn->status=='available') + {print img_picto($langs->trans("".$txn->status.""),'statut4');} + elseif ($txn->status=='pending') + {print img_picto($langs->trans("".$txn->status.""),'statut7');} + elseif ($txn->status=='failed') + {print img_picto($langs->trans("".$txn->status.""),'statut8');} print ''; print "\n"; } From a078951a94cd45a705ab61ffb95a1f38cb1603e7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Sep 2018 11:12:08 +0200 Subject: [PATCH 14/19] Add an help for user to avoid bad configuration --- htdocs/admin/dict.php | 8 +++++++- htdocs/langs/en_US/admin.lang | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 0c25f3a5bd817..b31a1972dd146 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -951,7 +951,6 @@ print $langs->trans("DictionaryDesc"); print " ".$langs->trans("OnlyActiveElementsAreShown")."
\n"; } -print "
\n"; $param = '&id='.urlencode($id); @@ -1016,6 +1015,13 @@ print ''; print ''; + if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION)) + { + print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation"))); + } + + print "
\n"; + // Form to add a new line if ($tabname[$id]) { diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 01d73f6c04b46..89af1ebbbc1b4 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1806,6 +1806,7 @@ YouCanDeleteFileOnServerWith=You can delete this file on server with Command Lin ChartLoaded=Chart of account loaded SocialNetworkSetup=Setup of module Social Networks EnableFeatureFor=Enable features for %s +VATIsUsedIsOff=Note: The option to use sales Tax or VAT has been set to Off in the menu %s - %s, so Sale tax or Vat used will always be 0 for sales. ##### Resource #### ResourceSetup=Configuration du module Resource UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list). From 7434b076d8dc0866a0bab323a81f2caee06c5863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 21 Sep 2018 11:12:19 +0200 Subject: [PATCH 15/19] correct link to setup modulebuilder --- htdocs/core/modules/modModuleBuilder.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php index b27a03cc798dc..7f4132d7e4421 100644 --- a/htdocs/core/modules/modModuleBuilder.class.php +++ b/htdocs/core/modules/modModuleBuilder.class.php @@ -60,7 +60,7 @@ function __construct($db) // Config pages //------------- - $this->config_page_url = array('setup@modulebuilder'); + $this->config_page_url = array('setup.php@modulebuilder'); // Dependencies //------------- From 0abe05c6b7819f09b5d2d99df34779e3b094ac6a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Sep 2018 11:29:01 +0200 Subject: [PATCH 16/19] Fix no form inside a table --- htdocs/modulebuilder/admin/setup.php | 89 +++++++++++++++------------- 1 file changed, 47 insertions(+), 42 deletions(-) diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php index 26e647855240d..6ca9bfe2a1e1c 100644 --- a/htdocs/modulebuilder/admin/setup.php +++ b/htdocs/modulebuilder/admin/setup.php @@ -73,7 +73,7 @@ } } - + /* * View */ @@ -87,73 +87,78 @@ $linkback = '' . $langs->trans("BackToModuleList") . ''; } +print '
'; +print ''; +print ''; + print load_fiche_titre($langs->trans("ModuleSetup") . ' ' . $langs->trans('Modulebuilder'), $linkback); if (GETPOST('withtab', 'alpha')) { dol_fiche_head($head, 'modulebuilder', '', -1); } - print '' . $langs->trans("ModuleBuilderDesc") . "
\n"; print '
'; print ''; + print ''; print ''; print ''; print "\n"; -print ''; -print ''; -print ''; - - -print ''; -print ''; -print ''; + print ''; + print ''; + + print ''; + print ''; + print ''; } -print ''; - -print ''; -print ''; -print ''; print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; print '
' . $langs->trans("Key") . '' . $langs->trans("Value") . '
' . $langs->trans("UseAboutPage") . ''; -if ($conf->use_javascript_ajax) { - print ajax_constantonoff('MODULEBUILDER_USE_ABOUT'); -} else { - if (empty($conf->global->MODULEBUILDER_USE_ABOUT)) { - print '' . img_picto($langs->trans("Disabled"), 'off') . ''; - } else { - print '' . img_picto($langs->trans("Enabled"), 'on') . ''; - } -} -print '
' . $langs->trans("UseDocFolder") . ''; -if ($conf->use_javascript_ajax) { - print ajax_constantonoff('MODULEBUILDER_USE_DOCFOLDER'); -} else { - if (empty($conf->global->MODULEBUILDER_USE_DOCFOLDER)) { - print '' . img_picto($langs->trans("Disabled"), 'off') . ''; - } else { - print '' . img_picto($langs->trans("Enabled"), 'on') . ''; - } +if ($conf->global->MAIN_FEATURES_LEVEL >= 2) +{ + // What is use cas of this 2 options ? + + print '
' . $langs->trans("UseAboutPage") . ''; + if ($conf->use_javascript_ajax) { + print ajax_constantonoff('MODULEBUILDER_USE_ABOUT'); + } else { + if (empty($conf->global->MODULEBUILDER_USE_ABOUT)) { + print '' . img_picto($langs->trans("Disabled"), 'off') . ''; + } else { + print '' . img_picto($langs->trans("Enabled"), 'on') . ''; + } + } + print '
' . $langs->trans("UseDocFolder") . ''; + if ($conf->use_javascript_ajax) { + print ajax_constantonoff('MODULEBUILDER_USE_DOCFOLDER'); + } else { + if (empty($conf->global->MODULEBUILDER_USE_DOCFOLDER)) { + print '' . img_picto($langs->trans("Disabled"), 'off') . ''; + } else { + print '' . img_picto($langs->trans("Enabled"), 'on') . ''; + } + } + print '
' . $langs->trans("UseSpecificReadme") . ''; -print ''; -print '
'; -print ''; -print '
' . $langs->trans("UseSpecificReadme") . ''; +print ''; +print '
'; +print '
'; + if (GETPOST('withtab', 'alpha')) { dol_fiche_end(); } -print '

'; +print '
'; + +print '
'; // End of page llxFooter(); From 3be13f0cb6ac5071278803312d2a60397a67d0f9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Sep 2018 11:45:04 +0200 Subject: [PATCH 17/19] Fix css --- htdocs/core/lib/company.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 94dc94aee52e8..7082d6991a3e7 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -1583,7 +1583,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon='', $noprint= $out.=''; // Author of event - $out.=''; + $out.=''; //$userstatic->id=$histo[$key]['userid']; //$userstatic->login=$histo[$key]['login']; //$out.=$userstatic->getLoginUrl(1); From 7ece28ffd32aa2e836489995430e52e33659097d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Sep 2018 11:48:01 +0200 Subject: [PATCH 18/19] Trans --- htdocs/core/modules/modSocialNetworks.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modSocialNetworks.class.php b/htdocs/core/modules/modSocialNetworks.class.php index 063cce438fe31..6aceeff6a70b4 100644 --- a/htdocs/core/modules/modSocialNetworks.class.php +++ b/htdocs/core/modules/modSocialNetworks.class.php @@ -48,7 +48,7 @@ function __construct($db) $this->family = "interface"; // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) $this->name = preg_replace('/^mod/i','',get_class($this)); - $this->description = "Enable Social Networks fields into contacts"; + $this->description = "Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...)"; // Possible values for version are: 'development', 'experimental', 'dolibarr' or version $this->version = 'dolibarr'; // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase) From fab57e163ec71eec3f082832940936fc2a6de5cf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 21 Sep 2018 14:52:06 +0200 Subject: [PATCH 19/19] Fix phpcs --- htdocs/stripe/transaction.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php index 595583a63f115..10aac121e0bc4 100644 --- a/htdocs/stripe/transaction.php +++ b/htdocs/stripe/transaction.php @@ -159,10 +159,10 @@ $societestatic->societe_id = $obj->fk_soc; print ''; - + // Ref if (!empty($stripeacc)) $connect=$stripeacc.'/'; - + // Ref if (preg_match('/po_/i', $txn->source)){ $origin="payouts"; @@ -178,8 +178,8 @@ $url='https://dashboard.stripe.com/'.$connect.$origin.'/'.$txn->source; } if ($txn->type == 'stripe_fee' || $txn->type == 'reserve_transaction') { - print "".$txn->type.""; - } else print "".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "\n"; + print "".$txn->type.""; + } else print "".img_picto($langs->trans('ShowInStripe'), 'object_globe')." " . $txn->source . "\n"; // Stripe customer //print "".$charge->customer."\n"; @@ -216,11 +216,11 @@ // Status print ""; if ($txn->status=='available') - {print img_picto($langs->trans("".$txn->status.""),'statut4');} + {print img_picto($langs->trans("".$txn->status.""),'statut4');} elseif ($txn->status=='pending') {print img_picto($langs->trans("".$txn->status.""),'statut7');} elseif ($txn->status=='failed') - {print img_picto($langs->trans("".$txn->status.""),'statut8');} + {print img_picto($langs->trans("".$txn->status.""),'statut8');} print ''; print "\n"; }