Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

Browse Source 
develop

Conflicts:
	htdocs/langs/en_US/admin.lang
This commit is contained in:
Laurent Destailleur
2018-07-10 14:06:51 +02:00
parent 5f52dfa873 3231f0031c
commit 64517d4c0b
81 changed files with 835 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/modImport.class.php
View File

@@ -60,9 +60,11 @@ class modImport extends DolibarrModules
$this->config_page_url = array();
// Dependencies
$this->depends = array();
$this->requiredby = array();
$this->phpmin = array(4,3,0); // Need auto_detect_line_endings php option to solve MAC pbs.
$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 - Need auto_detect_line_endings php option to solve MAC pbs.
$this->phpmax = array();
$this->need_dolibarr_version = array(2,7,-1); // Minimum version of Dolibarr required by module
$this->need_javascript_ajax = 1;

8
htdocs/core/modules/modIncoterm.class.php
View File

@@ -65,9 +65,11 @@ class modIncoterm extends DolibarrModules
$this->config_page_url = array();
// Dependencies
$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,0); // 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,0); // Minimum version of Dolibarr required by module
$this->langfiles = array("incoterm");

9
htdocs/core/modules/modLabel.class.php
View File

@@ -56,9 +56,12 @@ class modLabel extends DolibarrModules
// Data directories to create when module is enabled
$this->dirs = array("/label/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("label.php");

9
htdocs/core/modules/modLdap.class.php
View File

@@ -60,9 +60,12 @@ class modLdap extends DolibarrModules
// Config pages
$this->config_page_url = array("ldap.php");
// 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
// Constants
$this->const = array(

8
htdocs/core/modules/modLoan.class.php
View File

@@ -63,9 +63,11 @@ class modLoan extends DolibarrModules
$this->config_page_url = array('loan.php');
// 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("loan");
// Constants

7
htdocs/core/modules/modMailing.class.php
View File

@@ -57,8 +57,11 @@ class modMailing extends DolibarrModules
$this->dirs = array("/mailing/temp");
// Dependencies
$this->depends = array();
$this->requiredby = 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("mails");
// Config pages

7
htdocs/core/modules/modMailmanSpip.class.php
View File

@@ -58,8 +58,11 @@ class modMailmanSpip extends DolibarrModules
$this->dirs = array();
// Dependencies
$this->depends = array('modAdherent');
$this->requiredby = array();
$this->hidden = false; // A condition to hide module
$this->depends = array('modAdherent'); // 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('mailman.php');

8
htdocs/core/modules/modMargin.class.php
View File

@@ -68,9 +68,11 @@ class modMargin extends DolibarrModules
$this->config_page_url = array("margin.php@margin");
// Dependencies
$this->depends = array("modPropale", "modProduct"); // 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,1); // Minimum version of PHP required by module
$this->hidden = false; // A condition to hide module
$this->depends = array("modPropale", "modProduct"); // 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,2); // Minimum version of Dolibarr required by module
$this->langfiles = array("margins");

2
htdocs/core/modules/modModuleBuilder.class.php
View File

@@ -62,7 +62,7 @@ class modModuleBuilder extends DolibarrModules
//-------------
$this->config_page_url = array('setup@modulebuilder');
// Dependancies
// Dependencies
//-------------
$this->hidden = false; // A condition to disable module
$this->depends = array(); // List of modules id that must be enabled if this module is enabled

2
htdocs/core/modules/modMultiCurrency.class.php
View File

@@ -88,7 +88,7 @@ class modMultiCurrency extends DolibarrModules
$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->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->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("multicurrency");

7
htdocs/core/modules/modNotification.class.php
View File

@@ -55,8 +55,11 @@ class modNotification extends DolibarrModules
$this->dirs = array();
// Dependencies
$this->depends = array();
$this->requiredby = 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("mails");
// Config pages

8
htdocs/core/modules/modOauth.class.php
View File

@@ -67,9 +67,11 @@ class modOauth extends DolibarrModules
$this->config_page_url = array("oauth.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 // 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("oauth");

8
htdocs/core/modules/modOpenSurvey.class.php
View File

@@ -72,9 +72,11 @@ class modOpenSurvey extends DolibarrModules
//$this->dirs[1] = DOL_DATA_ROOT.'/mymodule/temp;
// Dependencies
$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(4,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,4,0); // Minimum version of Dolibarr required by module
// Constants

8
htdocs/core/modules/modPaybox.class.php
View File

@@ -69,9 +69,11 @@ class modPayBox extends DolibarrModules
$this->config_page_url = array("paybox.php@paybox");
// Dependencies
$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(4,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(2,6); // Minimum version of Dolibarr required by module
$this->langfiles = array("paybox");

8
htdocs/core/modules/modPaypal.class.php
View File

@@ -70,9 +70,11 @@ class modPaypal extends DolibarrModules
$this->config_page_url = array("paypal.php@paypal");
// Dependencies
$this->depends = array(); // List of modules id that must be enabled if this module is enabled
$this->requiredby = array('modPaypalPlus'); // List of modules id to disable if this one is disabled
$this->phpmin = array(5,2); // 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('modPaypalPlus'); // 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("paypal");

9
htdocs/core/modules/modPrelevement.class.php
View File

@@ -63,9 +63,12 @@ class modPrelevement extends DolibarrModules
// Data directories to create when module is enabled
$this->dirs = array("/prelevement/temp","/prelevement/receipts");
// Dependancies
$this->depends = array("modFacture","modBanque");
$this->requiredby = array();
// Dependencies
$this->hidden = false; // A condition to hide module
$this->depends = array("modFacture","modBanque"); // 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("prelevement.php");

8
htdocs/core/modules/modPrinting.class.php
View File

@@ -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");

7
htdocs/core/modules/modProduct.class.php
View File

@@ -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");

8
htdocs/core/modules/modProductBatch.class.php
View File

@@ -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");

10
htdocs/core/modules/modProjet.class.php
View File

@@ -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

9
htdocs/core/modules/modPropale.class.php
View File

@@ -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");

8
htdocs/core/modules/modReceiptPrinter.class.php
View File

@@ -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");

2
htdocs/core/modules/modResource.class.php
View File

@@ -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

8
htdocs/core/modules/modSalaries.class.php
View File

@@ -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

9
htdocs/core/modules/modService.class.php
View File

@@ -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");

19
htdocs/core/modules/modSkype.class.php
View File

@@ -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
{
@@ -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();
}
}