diff --git a/ChangeLog b/ChangeLog
index ceb1d847ddb..402bb45423b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ English Dolibarr ChangeLog
For Users:
NEW: Experimental module: Ticket
NEW: Experimental module: WebDAV
-NEW: Accept anonmymous events (no user assigned)
+NEW: Accept anonymous events (no user assigned)
NEW: Accountancy - Add import on general ledger
NEW: Accountancy - Show journal name on journal page and hide button draft export (Add an option in admin)
NEW: Can create event from record card of a company and member
@@ -19,7 +19,7 @@ NEW: Add a tab to specify accountant/auditor of the company
NEW: Add Date delivery and Availability on Propals List
NEW: Add date in goods reception supplier order table
NEW: Add delivery_time_days of suppliers in export profile
-NEW: Add Docments'tab to expedition module
+NEW: Add Documents'tab to expedition module
NEW: Use dol_print_phone in thirdparty list page to format phone
NEW: Add entry for the GDPR contact
NEW: Add extrafield type "html"
@@ -101,7 +101,7 @@ NEW: Filter export model is now by user
NEW: Finish implementation of option PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES
NEW: generalize use of button to create new element from list
NEW: hidden conf AGENDA_NB_WEEKS_IN_VIEW_PER_USER to set nb weeks to show into per user view
-NEW: hidden conf to assign category to thirparty that are not customer nor prospect nor supplier
+NEW: hidden conf to assign category to thirparty that are neither customer nor prospect or supplier
NEW: hidden conf to set nb weeks to show into user view
NEW: hidden option MAIN_DISABLE_FREE_LINES
NEW: improve way of adding users/sales representative to thirdparty
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 42cd67b9dab..ba56042ec61 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -66,7 +66,7 @@ class modAccounting extends DolibarrModules
$this->depends = array("modFacture","modBanque","modTax"); // 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("modComptabilite"); // List of modules are in conflict with this module
- $this->phpmin = array(5, 3); // 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, 9); // Minimum version of Dolibarr required by module
$this->langfiles = array("accountancy","compta");
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 5fde53c9653..74f61fd288f 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -62,17 +62,17 @@ class modAdherent extends DolibarrModules
$this->dirs = array("/adherent/temp");
// Config pages
- //-------------
$this->config_page_url = array("adherent.php@adherents");
// Dependencies
- //------------
- $this->depends = array();
- $this->requiredby = array('modMailmanSpip');
+ $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('modMailmanSpip'); // List of module class names as string this module is in conflict with
$this->langfiles = array("members","companies");
+ $this->phpmin = array(5,4); // Minimum version of PHP required by module
// Constants
- //-----------
$this->const = array();
$r=0;
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 5078f81ad05..d5620d6805b 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -65,14 +65,15 @@ class modAgenda extends DolibarrModules
$this->dirs = array("/agenda/temp");
// Config pages
- //-------------
$this->config_page_url = array("agenda_other.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->langfiles = array("companies");
+ $this->phpmin = array(5,4); // Minimum version of PHP required by module
// Module parts
$this->module_parts = array();
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index c8dc7ae84ba..71374e136e5 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -82,7 +82,7 @@ class modApi 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,3); // Minimum version of PHP required by module
+ $this->phpmin = array(5,4); // Minimum version of PHP required by module
$this->langfiles = array("other");
// Constants
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index 9b82a6015c4..d6a50ab9b07 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -96,7 +96,7 @@ class modAsset extends DolibarrModules
$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->langfiles = array("assets");
- $this->phpmin = array(5,3); // Minimum version of PHP required by module
+ $this->phpmin = array(5,4); // Minimum version of PHP required by module
$this->need_dolibarr_version = array(7,0); // Minimum version of Dolibarr required by module
$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index 4be7a937d1a..2b33e09c1ac 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -64,9 +64,10 @@ class modCashDesk extends DolibarrModules
$this->config_page_url = array("cashdesk.php@cashdesk");
// Dependencies
+ $this->hidden = false; // A condition to hide module
$this->depends = array('always'=>"modBanque", 'always'=>"modFacture", 'always'=>"modProduct", 'FR'=>'modBlockedLog'); // 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->phpmin = array(5,4); // Minimum version of PHP required by module
$this->need_dolibarr_version = array(2,4); // Minimum version of Dolibarr required by module
$this->langfiles = array("cashdesk");
$this->warnings_activation = array('FR'=>'WarningNoteModulePOSForFrenchLaw'); // Warning to show when we activate module. array('always'='text') or array('FR'='text')
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index 2dd46c9b788..78f517b6768 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -61,10 +61,11 @@ class modExpenseReport extends DolibarrModules
$this->config_page_url = array('expensereport.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->depends = array(); // List of module class names as string that must be enabled if this module is enabled
// $this->conflictwith = array("modDeplacement"); // Deactivate for access on old information
$this->requiredby = array(); // List of modules id to disable if this one is disabled
- $this->phpmin = array(4,3); // 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,7); // Minimum version of Dolibarr required by module
$this->langfiles = array("companies","trips");
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index 88bc8b7e8b9..81eddf86076 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -65,9 +65,11 @@ class modGeoIPMaxmind extends DolibarrModules
$this->config_page_url = array("geoipmaxmind.php");
// Dependencies
- $this->depends = array();
- $this->requiredby = array();
- $this->phpmin = array(4,2,0);
+ $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);
$this->phpmax = array();
$this->need_dolibarr_version = array(2,7,-1); // Minimum version of Dolibarr required by module
$this->need_javascript_ajax = 1;
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index b6b9d4c9a59..44b4f8a6e80 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -71,9 +71,11 @@ class modGravatar 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(4, 3); // 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, 7); // Minimum version of Dolibarr required by module
$this->langfiles = array();
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index a209fdccf2e..6b9f81a5a1f 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -66,27 +66,16 @@ class modHRM extends DolibarrModules
$this->config_page_url = array('admin_hrm.php@hrm');
// Dependencies
- $this->depends = array();
- $this->requiredby = array(/*"
- modSalaries,
- modExpenseReport,
- modHoliday
- "*/);
- $this->conflictwith = array();
- $this->phpmin = array (
- 5,
- 3
- ); // Minimum version of PHP required by module
- $this->need_dolibarr_version = array (
- 3,
- 9
- ); // Minimum version of Dolibarr required by module
- $this->langfiles = array (
- "hrm"
- );
+ $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(/*"modSalaries, modExpenseReport, modHoliday"*/); // 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); // Minimum version of Dolibarr required by module
+ $this->langfiles = array ("hrm");
- // Dictionnaries
- $this->dictionnaries=array();
+ // Dictionaries
+ $this->dictionaries=array();
// Constantes
$this->const = array ();
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index ffaba49e36e..88ebd6d94e2 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -81,9 +81,11 @@ class modHoliday extends DolibarrModules
// $this->config_page_url = array("holiday.php?leftmenu=setup@holiday");
// 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,3); // 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("holiday");
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index f9567a32a5c..bda0170397d 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -38,23 +38,78 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';
*/
class pdf_standard extends ModelePDFSuppliersPayments
{
- var $db;
- var $name;
- var $description;
- var $type;
+ /**
+ * @var DoliDb Database handler
+ */
+ public $db;
+
+ /**
+ * @var string model name
+ */
+ public $name;
+
+ /**
+ * @var string model description (short text)
+ */
+ public $description;
+
+ /**
+ * @var string document type
+ */
+ public $type;
- var $phpmin = array(4,3,0); // Minimum version of PHP required by module
- var $version = 'dolibarr';
-
- var $page_largeur;
- var $page_hauteur;
- var $format;
- var $marge_gauche;
- var $marge_droite;
- var $marge_haute;
- var $marge_basse;
-
- var $emetteur; // Objet societe qui emet
+ /**
+ * @var array() Minimum version of PHP required by module.
+ * e.g.: PHP ≥ 5.4 = array(5, 4)
+ */
+ public $phpmin = array(5, 4);
+
+ /**
+ * Dolibarr version of the loaded document
+ * @public string
+ */
+ public $version = 'dolibarr';
+
+ /**
+ * @var int page_largeur
+ */
+ public $page_largeur;
+
+ /**
+ * @var int page_hauteur
+ */
+ public $page_hauteur;
+
+ /**
+ * @var array format
+ */
+ public $format;
+
+ /**
+ * @var int marge_gauche
+ */
+ public $marge_gauche;
+
+ /**
+ * @var int marge_droite
+ */
+ public $marge_droite;
+
+ /**
+ * @var int marge_haute
+ */
+ public $marge_haute;
+
+ /**
+ * @var int marge_basse
+ */
+ public $marge_basse;
+
+ /**
+ * Issuer
+ * @var Societe
+ */
+ public $emetteur;
/**
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index bca4ae8425f..5f971cab2d1 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -60,9 +60,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
/**
* @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
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 03b2491ab59..c8b64790061 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -346,12 +346,12 @@ class Holiday extends CommonObject
$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid"; // Hack pour la recherche sur le tableau
$sql.= " AND cp.fk_user IN (".$user_id.")";
- // Filtre de séléction
+ // Selection filter
if(!empty($filter)) {
$sql.= $filter;
}
- // Ordre d'affichage du résultat
+ // Order of display of the result
if(!empty($order)) {
$sql.= $order;
}
@@ -359,19 +359,19 @@ class Holiday extends CommonObject
dol_syslog(get_class($this)."::fetchByUser", LOG_DEBUG);
$resql=$this->db->query($sql);
- // Si pas d'erreur SQL
+ // If no SQL error
if ($resql) {
$i = 0;
$tab_result = $this->holiday;
$num = $this->db->num_rows($resql);
- // Si pas d'enregistrement
+ // If no registration
if(!$num) {
return 2;
}
- // Liste les enregistrements et les ajoutent au tableau
+ // List the records and add them to the table
while($i < $num) {
$obj = $this->db->fetch_object($resql);
@@ -412,13 +412,13 @@ class Holiday extends CommonObject
$i++;
}
- // Retourne 1 avec le tableau rempli
+ // Returns 1 with the filled array
$this->holiday = $tab_result;
return 1;
}
else
{
- // Erreur SQL
+ // SQL Error
$this->error="Error ".$this->db->lasterror();
return -1;
}
@@ -471,12 +471,12 @@ class Holiday extends CommonObject
$sql.= " WHERE cp.entity IN (".getEntity('holiday').")";
$sql.= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid "; // Hack pour la recherche sur le tableau
- // Filtrage de séléction
+ // Selection filtering
if(!empty($filter)) {
$sql.= $filter;
}
- // Ordre d'affichage
+ // order of display
if(!empty($order)) {
$sql.= $order;
}
@@ -484,19 +484,19 @@ class Holiday extends CommonObject
dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
$resql=$this->db->query($sql);
- // Si pas d'erreur SQL
+ // If no SQL error
if ($resql) {
$i = 0;
$tab_result = $this->holiday;
$num = $this->db->num_rows($resql);
- // Si pas d'enregistrement
+ // If no registration
if(!$num) {
return 2;
}
- // On liste les résultats et on les ajoutent dans le tableau
+ // List the records and add them to the table
while($i < $num) {
$obj = $this->db->fetch_object($resql);
@@ -536,13 +536,13 @@ class Holiday extends CommonObject
$i++;
}
- // Retourne 1 et ajoute le tableau à la variable
+ // Returns 1 and adds the array to the variable
$this->holiday = $tab_result;
return 1;
}
else
{
- // Erreur SQL
+ // SQL Error
$this->error="Error ".$this->db->lasterror();
return -1;
}
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 675271a2947..8169cd9961f 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -116,7 +116,7 @@ class modMyModule extends DolibarrModules
$this->requiredby = array(); // List of module class names to disable if this one is disabled
$this->conflictwith = array(); // List of module class names as string this module is in conflict with
$this->langfiles = array("mymodule@mymodule");
- $this->phpmin = array(5,3); // Minimum version of PHP required by module
+ $this->phpmin = array(5,4); // Minimum version of PHP required by module
$this->need_dolibarr_version = array(4,0); // Minimum version of Dolibarr required by module
$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 34337218a62..83d59a26a90 100644
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -288,11 +288,11 @@ if ($object->id)
print '