Merge pull request #9090 from grandoc/new_branch_10_07_2018

New branch 10 07 2018

htdocs/core/modules/modSociete.class.php

@@ -66,8 +66,11 @@ class modSociete extends DolibarrModules
 		$this->dirs = array("/societe/temp");
 
 		// Dependencies
-		$this->depends = array();
+		$this->hidden = false;			// A condition to hide module
-		$this->requiredby = array("modExpedition","modFacture","modFournisseur","modFicheinter","modPropale","modContrat","modCommande");
+		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array("modExpedition","modFacture","modFournisseur","modFicheinter","modPropale","modContrat","modCommande");	// 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("companies",'bills');
 
 		// Constants

htdocs/core/modules/modStock.class.php

@@ -65,8 +65,11 @@ class modStock extends DolibarrModules
 		$this->config_page_url = array("stock.php");
 
 		// Dependencies
-		$this->depends = array("modProduct");
+		$this->hidden = false;			// A condition to hide module
-		$this->requiredby = array("modProductBatch");
+		$this->depends = array("modProduct");		// List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array("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
 		$this->langfiles = array("stocks");
 
 		// Constants

htdocs/core/modules/modStripe.class.php

@@ -65,10 +65,11 @@ class modStripe extends DolibarrModules
         // Data directories to create when module is enabled.
         $this->dirs = array();
 
-        // Config pages. Put here list of php page names stored in admmin directory used to setup module.
+        // Config pages. Put here list of php page names stored in admin directory used to setup module.
         $this->config_page_url = array("stripe.php@stripe");
 
         // Dependencies
+        $this->hidden = false;			// A condition to hide module
         $this->depends = array();		// 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->phpmin = array(5,4);					// Minimum version of PHP required by module

htdocs/core/modules/modSupplierProposal.class.php

@@ -57,13 +57,19 @@ class modSupplierProposal extends DolibarrModules
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->picto='supplier_proposal';
-
+        
+		// Data directories to create when module is enabled.
 		$this->dirs = array();
+		
+		 // Config pages. Put here list of php page names stored in admin directory used to setup module.
+        $this->config_page_url = array("supplier_proposal.php");
 
-		// Dependancies
+		// Dependencies
-		$this->depends = array('modFournisseur');
+		$this->hidden = false;			// A condition to hide module
-		$this->requiredby = array();
+		$this->depends = array('modFournisseur');		// List of module class names as string that must be enabled if this module is enabled
-		$this->config_page_url = array("supplier_proposal.php");
+		$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("supplier_proposal");
 
 		// Constants

htdocs/core/modules/modSyslog.class.php

@@ -67,8 +67,11 @@ class modSyslog extends DolibarrModules
 		$this->config_page_url = array("syslog.php");
 
 		// Dependencies
-		$this->depends = array();
+		$this->hidden = false;			// A condition to hide module
-		$this->requiredby = array();
+		$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
 
 		// Constants
 		$this->const = array();

htdocs/core/modules/modTax.class.php

@@ -67,9 +67,11 @@ class modTax extends DolibarrModules
 		$this->config_page_url = array("taxes.php");
 
 		// Dependencies
-		$this->depends = array();
+		$this->hidden = false;			// A condition to hide module
-		$this->requiredby = array();
+		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-		$this->conflictwith = array();
+		$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("compta","bills");
 
 		// Constants
@@ -117,13 +119,10 @@ class modTax extends DolibarrModules
 
 
 		// Menus
-		//-------
-
 		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
-		//--------
 		$r=0;
 
 		$r++;

htdocs/core/modules/modTicket.class.php

@@ -95,12 +95,11 @@ class modTicket extends DolibarrModules
         $this->config_page_url = array("ticket.php");
 
         // Dependencies
-        // List of modules id that must be enabled if this module is enabled
+        $this->hidden = false;			// A condition to hide module
-        $this->depends = array();
+		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-        // List of modules id to disable if this one is disabled
+		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-        $this->requiredby = array();
+		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-        // Minimum version of PHP required by module
+		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-        $this->phpmin = array(5, 3);
         $this->langfiles = array("ticket");
         // Constants
         // List of particular constants to add when module is enabled
@@ -115,7 +114,7 @@ class modTicket extends DolibarrModules
             'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__',
         );
 
-        // Dictionnaries
+        // Dictionaries
         if (! isset($conf->ticket->enabled)) {
             $conf->ticket=new stdClass();
             $conf->ticket->enabled=0;

htdocs/core/modules/modUser.class.php

@@ -63,9 +63,12 @@ class modUser extends DolibarrModules
 		// Config pages
 		$this->config_page_url = array("user.php");
 
-		// Dependancies
+		// Dependencies
-		$this->depends = array();
+		$this->hidden = false;			// A condition to hide module
-		$this->requiredby = array();
+		$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("main","users","companies","members",'salaries');
 		$this->always_enabled = true;	// Can't be disabled
 
@@ -205,13 +208,10 @@ class modUser extends DolibarrModules
 
 
         // Menus
-        //-------
-
         $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
-		//--------
 		$r=0;
 
 		$r++;
@@ -244,7 +244,6 @@ class modUser extends DolibarrModules
 		$this->export_sql_end[$r] .=' WHERE u.entity IN ('.getEntity('user').')';
 
 		// Imports
-		//--------
 		$r=0;
 
 		// Import list of users attributes

htdocs/core/modules/modVariants.class.php

@@ -79,12 +79,10 @@ class modVariants extends DolibarrModules
 
 		// Dependencies
 		$this->hidden = false;			// A condition to hide module
-		$this->depends = array(
+		$this->depends = array('modProduct');	// List of module class names as string that must be enabled if this module is enabled
-			'modProduct'
+		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		);		// List of modules id that must be enabled if this module is enabled
+		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->requiredby = array();	// List of modules id to disable if this one is disabled
+		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->conflictwith = array();	// List of modules id this module is in conflict with
-		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
 		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
 		$this->langfiles = array("products");
 

htdocs/core/modules/modWebServices.class.php

@@ -55,30 +55,26 @@ class modWebServices extends DolibarrModules
         $this->dirs = array();
 
         // Config pages
-        //-------------
         $this->config_page_url = array("index.php@webservices");
 
-        // Dependancies
+        // Dependencies
-        //-------------
+        $this->hidden = false;			// A condition to hide module
-        $this->depends = array();
+		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-        $this->requiredby = array();
+		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-        //$this->phpmax = array(7,1);					// Maximum version of PHP required by module
+		$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("other");
 
         // Constants
-        //-----------
         $this->const = array();
 
         // New pages on tabs
-        // -----------------
         $this->tabs = array();
 
         // Boxes
-        //------
         $this->boxes = array();
 
         // Permissions
-        //------------
         $this->rights = array();
         $this->rights_class = 'webservices';
         $r=0;

htdocs/core/modules/modWebServicesClient.class.php

@@ -55,29 +55,26 @@ class modWebServicesClient extends DolibarrModules
         $this->dirs = array();
 
         // Config pages
-        //-------------
         //$this->config_page_url = array();
 
-        // Dependancies
+        // Dependencies
-        //-------------
+        $this->hidden = false;			// A condition to hide module
-        $this->depends = array();
+		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-        $this->requiredby = array();
+		$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("other");
 
         // Constants
-        //-----------
         $this->const = array();
 
         // New pages on tabs
-        // -----------------
         $this->tabs = array();
 
         // Boxes
-        //------
         $this->boxes = array();
 
         // Permissions
-        //------------
         $this->rights = array();
         $this->rights_class = 'syncsupplierwebservices';
         $r=0;

htdocs/core/modules/modWebsite.class.php

@@ -61,27 +61,23 @@ class modWebsite extends DolibarrModules
 		$this->dirs = array("/website/temp");
 
         // Config pages
-        //-------------
         $this->config_page_url = array('website.php');
 
-        // Dependancies
+        // Dependencies
-        //-------------
 		$this->hidden = ! empty($conf->global->MODULE_WEBSITE_DISABLED);	// A condition to disable module
 		$this->depends = array('modFckeditor');		// 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
+		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
         $this->langfiles = array("website");
 
         // Constants
-        //-----------
        	$this->const = array();
 
         // New pages on tabs
-        // -----------------
        	//$this->tabs[] = array();  					// To add a new tab identified by code tabname1
 
         // Boxes
-        //------
         $this->boxes = array();
 
 		// Permissions

htdocs/core/modules/modWorkflow.class.php

@@ -68,9 +68,11 @@ class modWorkflow extends DolibarrModules
         $this->config_page_url = array('workflow.php');
 
         // Dependencies
-        $this->depends = array();       // List of modules id that must be enabled if this module is enabled
+       $this->hidden = false;			// A condition to hide module
-        $this->requiredby = array();    // List of modules id to disable if this one is disabled
+		$this->depends = array();		// List of module class names as string that must be enabled if this module is enabled
-        $this->phpmin = array(5,2);                 // Minimum version of PHP required by module
+		$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(2,8);  // Minimum version of Dolibarr required by module
         $this->langfiles = array("@workflow");