From b92190ac697f682fb0000eb68820586d365eb1b3 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 10 Jul 2018 09:32:55 +0200 Subject: [PATCH 1/2] Docs : Update and complete --- htdocs/core/modules/modPrinting.class.php | 8 +++++--- htdocs/core/modules/modProduct.class.php | 7 +++++-- htdocs/core/modules/modProductBatch.class.php | 8 +++++--- htdocs/core/modules/modProjet.class.php | 10 ++++++---- htdocs/core/modules/modPropale.class.php | 9 ++++++--- htdocs/core/modules/modReceiptPrinter.class.php | 8 +++++--- htdocs/core/modules/modResource.class.php | 2 +- htdocs/core/modules/modSalaries.class.php | 8 +++++--- htdocs/core/modules/modService.class.php | 9 ++++++--- htdocs/core/modules/modSkype.class.php | 17 ++++++----------- 10 files changed, 50 insertions(+), 36 deletions(-) diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php index 1aa36bdacce..17d2f398e2b 100644 --- a/htdocs/core/modules/modPrinting.class.php +++ b/htdocs/core/modules/modPrinting.class.php @@ -66,9 +66,11 @@ class modPrinting extends DolibarrModules $this->config_page_url = array("printing.php@printing"); // Dependencies - $this->depends = array(); - $this->requiredby = array(); - $this->phpmin = array(5,1); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $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(5,4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,7,-2); // Minimum version of Dolibarr required by module $this->conflictwith = array(); $this->langfiles = array("printing"); diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php index 6ad67ac089c..ab62edc00f6 100644 --- a/htdocs/core/modules/modProduct.class.php +++ b/htdocs/core/modules/modProduct.class.php @@ -65,8 +65,11 @@ class modProduct extends DolibarrModules $this->dirs = array("/product/temp"); // Dependencies - $this->depends = array(); - $this->requiredby = array("modStock","modBarcode","modProductBatch"); + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $this->requiredby = array("modStock","modBarcode","modProductBatch"); // 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(5,4); // Minimum version of PHP required by module // Config pages $this->config_page_url = array("product.php@product"); diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php index 91e8ddbae3c..ac968233772 100644 --- a/htdocs/core/modules/modProductBatch.class.php +++ b/htdocs/core/modules/modProductBatch.class.php @@ -68,9 +68,11 @@ class modProductBatch extends DolibarrModules $this->config_page_url = array("product_lot_extrafields.php@product"); // Dependencies - $this->depends = array("modProduct","modStock","modExpedition","modFournisseur"); // List of modules id that must be enabled if this module is enabled. modExpedition is required to manage batch exit (by manual stock decrease on shipment), modSupplier to manage batch entry (after supplier order). - $this->requiredby = array(); // List of modules id to disable if this one is disabled - $this->phpmin = array(5,0); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array("modProduct","modStock","modExpedition","modFournisseur"); // List of module class names as string that must be enabled if this module is enabled + $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(5,4); // 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"); diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php index d38fc743de1..3e440d3330a 100644 --- a/htdocs/core/modules/modProjet.class.php +++ b/htdocs/core/modules/modProjet.class.php @@ -64,10 +64,12 @@ class modProjet extends DolibarrModules // Data directories to create when module is enabled $this->dirs = array("/projet/temp"); - // Dependancies - $this->depends = array(); - $this->requiredby = array(); - $this->conflictwith = array(); + // Dependencies + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $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(5,4); // Minimum version of PHP required by module $this->langfiles = array('projects'); // Constants diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php index c0701d3bfe2..5b3b2fdd4d8 100644 --- a/htdocs/core/modules/modPropale.class.php +++ b/htdocs/core/modules/modPropale.class.php @@ -63,9 +63,12 @@ class modPropale extends DolibarrModules // Data directories to create when module is enabled $this->dirs = array("/propale/temp"); - // Dependancies - $this->depends = array("modSociete"); - $this->requiredby = array(); + // Dependencies + $this->hidden = false; // A condition to hide module + $this->depends = array("modSociete"); // List of module class names as string that must be enabled if this module is enabled + $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(5,4); // Minimum version of PHP required by module $this->config_page_url = array("propal.php"); $this->langfiles = array("propal","bills","companies","deliveries","products"); diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php index 19df7ca0726..77f264f0d52 100644 --- a/htdocs/core/modules/modReceiptPrinter.class.php +++ b/htdocs/core/modules/modReceiptPrinter.class.php @@ -67,9 +67,11 @@ class modReceiptPrinter extends DolibarrModules $this->config_page_url = array("receiptprinter.php"); // Dependencies - $this->depends = array(); - $this->requiredby = array(); - $this->phpmin = array(5,1); // Minimum version of PHP required by module + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $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(5,4); // Minimum version of PHP required by module $this->need_dolibarr_version = array(3,9,-2); // Minimum version of Dolibarr required by module $this->conflictwith = array(); $this->langfiles = array("receiptprinter"); diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php index 15b414947ef..b088a301c6b 100644 --- a/htdocs/core/modules/modResource.class.php +++ b/htdocs/core/modules/modResource.class.php @@ -95,7 +95,7 @@ class modResource extends DolibarrModules // List of modules id to disable if this one is disabled $this->requiredby = array('modPlace'); // Minimum version of PHP required by module - $this->phpmin = array(5, 3); + $this->phpmin = array(5, 4); $this->langfiles = array("resource"); // langfiles@resource // Constants diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php index e3d418d182e..9e319c8bf41 100644 --- a/htdocs/core/modules/modSalaries.class.php +++ b/htdocs/core/modules/modSalaries.class.php @@ -70,9 +70,11 @@ class modSalaries extends DolibarrModules $this->config_page_url = array(); // Dependencies - $this->depends = array(); - $this->requiredby = array(); - $this->conflictwith = array(); + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $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(5,4); // Minimum version of PHP required by module $this->langfiles = array("salaries","bills"); // Constants diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php index df09d27ca51..6db325f8f55 100644 --- a/htdocs/core/modules/modService.class.php +++ b/htdocs/core/modules/modService.class.php @@ -62,9 +62,12 @@ class modService extends DolibarrModules // Data directories to create when module is enabled $this->dirs = array("/product/temp"); - // Dependancies - $this->depends = array(); - $this->requiredby = array(); + // Dependencies + $this->hidden = false; // A condition to hide module + $this->depends = array(); // List of module class names as string that must be enabled if this module is enabled + $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(5,4); // Minimum version of PHP required by module // Config pages $this->config_page_url = array("product.php@product"); diff --git a/htdocs/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php index d84520318a3..4a8b3013fe0 100644 --- a/htdocs/core/modules/modSkype.class.php +++ b/htdocs/core/modules/modSkype.class.php @@ -59,31 +59,26 @@ class modSkype extends DolibarrModules $this->dirs = array(); // Config pages - //------------- $this->config_page_url = array(); - // Dependancies - //------------- - $this->hidden = ! empty($conf->global->MODULE_SKYPE_DISABLED); // A condition to disable module - $this->depends = array('modSociete'); // List of modules id that must be enabled if this module is enabled - $this->requiredby = array(); // List of modules id to disable if this one is disabled - $this->conflictwith = array(); // List of modules id this module is in conflict with + // Dependencies + $this->hidden = ! empty($conf->global->MODULE_SKYPE_DISABLED); // A condition to hide module + $this->depends = array('modSociete'); // List of module class names as string that must be enabled if this module is enabled + $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(5,4); // Minimum version of PHP required by module $this->langfiles = array(); // Constants - //----------- // New pages on tabs - // ----------------- $this->tabs = array(); // Boxes - //------ $this->boxes = array(); // Main menu entries - //------------------ $this->menu = array(); } } From 243bc49a9028df7805ac4e56c09a4979fc113173 Mon Sep 17 00:00:00 2001 From: Philippe GRAND Date: Tue, 10 Jul 2018 09:38:05 +0200 Subject: [PATCH 2/2] Docs : Typo --- htdocs/core/modules/modSkype.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/modules/modSkype.class.php b/htdocs/core/modules/modSkype.class.php index 4a8b3013fe0..84a55ac365f 100644 --- a/htdocs/core/modules/modSkype.class.php +++ b/htdocs/core/modules/modSkype.class.php @@ -25,7 +25,7 @@ include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; /** - * Class to describe a Cron module + * Class to describe a Skype module */ class modSkype extends DolibarrModules {