';
- print ''.$langs->trans("Description").' ';
+ print ''.$langs->trans("Description").' ';
print '';
$text = $langs->trans("Value");
print $form->textwithpicto($text, $helptext, 1, 'help', '', 0, 2, 'idhelptext');
@@ -1614,24 +1614,24 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '')
foreach (array_keys($_Avery_Labels) as $codecards) {
$arrayoflabels[$codecards] = $_Avery_Labels[$codecards]['name'];
}
- print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : '[]'), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
+ print $form->selectarray('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $arrayoflabels, ($obj->value ? $obj->value : 'CARD'), 1, 0, 0);
print ' ';
} else {
print '';
- print ' ';
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5151a0a39dc..ab9a476c923 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -6322,7 +6322,7 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
*/
function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes = array("alt", "class", "contenteditable", "data-html", "href", "id", "name", "src", "style", "target", "title"))
{
- if (class_exists('DOMDocument')) {
+ if (class_exists('DOMDocument') && !empty($stringtoclean)) {
$dom = new DOMDocument();
$dom->loadHTML($stringtoclean, LIBXML_ERR_NONE|LIBXML_HTML_NOIMPLIED|LIBXML_HTML_NODEFDTD|LIBXML_NONET|LIBXML_NOWARNING|LIBXML_NOXMLDECL);
if (is_object($dom)) {
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 93378d77390..484f34c265c 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -177,12 +177,12 @@ function member_admin_prepare_head()
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent.php';
+ $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member.php';
$head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'general';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php';
+ $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_emails.php';
$head[$h][1] = $langs->trans("EMails");
$head[$h][2] = 'emails';
$h++;
@@ -193,12 +193,12 @@ function member_admin_prepare_head()
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin');
- $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php';
+ $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsMember");
$head[$h][2] = 'attributes';
$h++;
- $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php';
+ $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_type_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsMemberType");
$head[$h][2] = 'attributes_type';
$h++;
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index f048f070366..15710d71dfa 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -28,7 +28,7 @@
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
/**
- * Description and activation class for module accounting expert
+ * Class to describe and enable double entry accounting module
*/
class modAccounting extends DolibarrModules
{
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 57ec76e319d..16ecbee8526 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -27,7 +27,7 @@
* \brief Module to manage members of a foundation
* \file htdocs/core/modules/modAdherent.class.php
* \ingroup member
- * \brief File descriptor or module Member
+ * \brief Description and activation file for the module member
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
@@ -66,7 +66,7 @@ class modAdherent extends DolibarrModules
);
// Config pages
- $this->config_page_url = array("adherent.php@adherents");
+ $this->config_page_url = array("member.php@adherents");
// Dependencies
$this->hidden = false; // A condition to hide module
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index 7dd7a801f9d..691828cd9d2 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -28,7 +28,7 @@
* \brief Module to manage agenda and events
* \file htdocs/core/modules/modAgenda.class.php
* \ingroup agenda
- * \brief File of class to describe and enable/disable module Agenda
+ * \brief Description and activation file for the module agenda
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index aea29d25357..0c6ebeb6f37 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -23,7 +23,7 @@
* \brief Descriptor file for Api modulee
* \file htdocs/core/modules/modApi.class.php
* \ingroup api
- * \brief Description and activation file for module Api
+ * \brief Description and activation file for the module Api
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index 5dcb9f6637c..12b58bfcc38 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -22,7 +22,7 @@
*
* \file htdocs/core/modules/modAsset.class.php
* \ingroup asset
- * \brief Description and activation file for module Assets
+ * \brief Description and activation file for the module assets
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index 66634f4ad55..3a702007ef3 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -24,7 +24,7 @@
* \brief Module pour gerer la tenue d'un compte bancaire et rapprochements
* \file htdocs/core/modules/modBanque.class.php
* \ingroup banque
- * \brief Fichier de description et activation du module Banque
+ * \brief Description and activation file for the module bank
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index a3e2796aed6..fab12a0ae59 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -22,8 +22,8 @@
* \defgroup barcode Module barcode
* \brief Module pour gerer les codes barres
* \file htdocs/core/modules/modBarcode.class.php
- * \ingroup barcode,produit
- * \brief Fichier de description et activation du module Barcode
+ * \ingroup barcode, product
+ * \brief Description and activation file for the module barcode
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 3f9a6473a82..16f95a5e926 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -20,7 +20,7 @@
* \brief Add a log into a block chain for some actions.
* \file htdocs/core/modules/modBlockedLog.class.php
* \ingroup blockedlog
- * \brief Description and activation file for module BlockedLog
+ * \brief Description and activation file for the module BlockedLog
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index b040e4cec99..67a480dcc08 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -23,7 +23,7 @@
*
* \file htdocs/core/modules/modBom.class.php
* \ingroup bom
- * \brief Description and activation file for module Bom
+ * \brief Description and activation file for the module Bom
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
@@ -286,6 +286,7 @@ class modBom extends DolibarrModules
$langs->load("mrp");
$this->export_code[$r] = $this->rights_class.'_'.$r;
$this->export_label[$r] = 'BomAndBomLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+ $this->export_permission[$r] = array(array("bom", "read"));
$this->export_icon[$r] = 'bom';
$keyforclass = 'BOM';
$keyforclassfile = '/bom/class/bom.class.php';
diff --git a/htdocs/core/modules/modBookmark.class.php b/htdocs/core/modules/modBookmark.class.php
index e6ac76f0178..7b8d623bc6d 100644
--- a/htdocs/core/modules/modBookmark.class.php
+++ b/htdocs/core/modules/modBookmark.class.php
@@ -21,7 +21,7 @@
* \brief Module to manage Bookmarks
* \file htdocs/core/modules/modBookmark.class.php
* \ingroup bookmark
- * \brief Fichier de description et activation du module Bookmarks
+ * \brief Description and activation file for the module Bookmarks
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modCashDesk.class.php b/htdocs/core/modules/modCashDesk.class.php
index ca9ffa87d53..8e9ca1131b9 100644
--- a/htdocs/core/modules/modCashDesk.class.php
+++ b/htdocs/core/modules/modCashDesk.class.php
@@ -20,7 +20,7 @@
* \brief Module to manage points of sale
* \file htdocs/core/modules/modCashDesk.class.php
* \ingroup pos
- * \brief File to enable/disable module Point Of Sales
+ * \brief Description and activation file for the module Point Of Sales
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index d1f58dd7451..990fdb44bfe 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -23,7 +23,7 @@
* \brief Module to manage categories
* \file htdocs/core/modules/modCategorie.class.php
* \ingroup category
- * \brief Fichier de description et activation du module Categorie
+ * \brief Description and activation file for the module Category
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
diff --git a/htdocs/core/modules/modClickToDial.class.php b/htdocs/core/modules/modClickToDial.class.php
index 80a78aba2e9..f28659bbd5d 100644
--- a/htdocs/core/modules/modClickToDial.class.php
+++ b/htdocs/core/modules/modClickToDial.class.php
@@ -21,7 +21,7 @@
* \brief Module pour gerer l'appel automatique
* \file htdocs/core/modules/modClickToDial.class.php
* \ingroup clicktodial
- * \brief Fichier de description et activation du module de click to Dial
+ * \brief Description and activation file for the module Click to Dial
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index be82722f331..695efd6c3b1 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -20,7 +20,7 @@
* \brief Collab module descriptor.
* \file htdocs/core/modules/modCollab.class.php
* \ingroup collab
- * \brief Description and activation file for module Collab
+ * \brief Description and activation file for the module Collab
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 6fa8b730c24..29f4dc60515 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -27,7 +27,7 @@
* \brief Module pour gerer le suivi des commandes
* \file htdocs/core/modules/modCommande.class.php
* \ingroup commande
- * \brief Fichier de description et activation du module Commande
+ * \brief Description and activation file for the module command
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modComptabilite.class.php b/htdocs/core/modules/modComptabilite.class.php
index 7ee9fe3c70f..09f6cd85496 100644
--- a/htdocs/core/modules/modComptabilite.class.php
+++ b/htdocs/core/modules/modComptabilite.class.php
@@ -23,7 +23,7 @@
* \brief Module pour inclure des fonctions de comptabilite (gestion de comptes comptables et rapports)
* \file htdocs/core/modules/modComptabilite.class.php
* \ingroup comptabilite
- * \brief Fichier de description et activation du module Comptabilite
+ * \brief Description and activation file for the module simple accountancy
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 1b927346f1e..f91e54039f4 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -22,7 +22,7 @@
* \brief Module pour gerer la tenue de contrat de services
* \file htdocs/core/modules/modContrat.class.php
* \ingroup contrat
- * \brief Fichier de description et activation du module Contrat
+ * \brief Description and activation file for the module contract
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 95a3dd2c15d..60d713d5fc4 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -21,7 +21,7 @@
* \brief cron module descriptor.
* \file htdocs/core/modules/modCron.class.php
* \ingroup cron
- * \brief Description and activation file for module Jobs
+ * \brief Description and activation file for the module Jobs
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php
index 8c7cb2c4275..0e2027494e7 100644
--- a/htdocs/core/modules/modDataPolicy.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -23,7 +23,7 @@
*
* \file htdocs/core/modules/modDataPolicy.class.php
* \ingroup datapolicy
- * \brief Description and activation file for module DATAPOLICY
+ * \brief Description and activation file for the module datapolicy
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modDav.class.php b/htdocs/core/modules/modDav.class.php
index d581ce539c2..09f7d814553 100644
--- a/htdocs/core/modules/modDav.class.php
+++ b/htdocs/core/modules/modDav.class.php
@@ -21,7 +21,7 @@
*
* \file htdocs/core/modules/modDav.class.php
* \ingroup dav
- * \brief Description and activation file for module dav
+ * \brief Description and activation file for the module dav
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modDebugBar.class.php b/htdocs/core/modules/modDebugBar.class.php
index 4d38e848bbe..1b591f02da1 100644
--- a/htdocs/core/modules/modDebugBar.class.php
+++ b/htdocs/core/modules/modDebugBar.class.php
@@ -21,7 +21,7 @@
*
* \file htdocs/core/modules/modDebugBar.class.php
* \ingroup debugbar
- * \brief Description and activation file for module debugbar
+ * \brief Description and activation file for the module debugbar
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index 860a9c8ab7e..0f92e8a7e6c 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -21,7 +21,7 @@
* \brief Module pour gerer les deplacements et notes de frais
* \file htdocs/core/modules/modDeplacement.class.php
* \ingroup deplacement
- * \brief Fichier de description et activation du module Deplacement et notes de frais
+ * \brief Description and activation file for the module trips (deprecated)
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modDocumentGeneration.class.php b/htdocs/core/modules/modDocumentGeneration.class.php
index 2c2c2ed1888..466523e7f81 100644
--- a/htdocs/core/modules/modDocumentGeneration.class.php
+++ b/htdocs/core/modules/modDocumentGeneration.class.php
@@ -22,7 +22,7 @@
* \brief Module pour gerer des generations de documents
* \file htdocs/core/modules/modDocumentGeneration.class.php
* \ingroup document
- * \brief Fichier de description et activation du module Generation document
+ * \brief Description and activation file for the module Generation document
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index 64d9c045ad1..7d8a8fc9455 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -23,7 +23,7 @@
* \brief Module to manage the follow-up of the donations
* \file htdocs/core/modules/modDon.class.php
* \ingroup donations
- * \brief Description and activation file for module Donation
+ * \brief Description and activation file for the module Donation
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modDynamicPrices.class.php b/htdocs/core/modules/modDynamicPrices.class.php
index fc4863e1280..23a0f892014 100644
--- a/htdocs/core/modules/modDynamicPrices.class.php
+++ b/htdocs/core/modules/modDynamicPrices.class.php
@@ -20,7 +20,7 @@
* \brief Module to manage dynamic prices in products
* \file htdocs/core/modules/modDynamicPrices.class.php
* \ingroup produit
- * \brief File to describe module to manage dynamic prices in products
+ * \brief Description and activation file for the module to manage dynamic prices in products
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modECM.class.php b/htdocs/core/modules/modECM.class.php
index 222e50c76e0..8b846089a03 100644
--- a/htdocs/core/modules/modECM.class.php
+++ b/htdocs/core/modules/modECM.class.php
@@ -20,7 +20,7 @@
* \brief Module for ECM (Electronic Content Management)
* \file htdocs/core/modules/modECM.class.php
* \ingroup ecm
- * \brief Description and activation file for module ECM
+ * \brief Description and activation file for the module ECM
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index bb76d2f0c1e..53223ecd705 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -21,7 +21,7 @@
*
* \file htdocs/core/modules/modEmailCollector.class.php
* \ingroup emailcollector
- * \brief Description and activation file for module emailcollector
+ * \brief Description and activation file for the module emailcollector
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php
index 4f25993d9a1..386da21d798 100644
--- a/htdocs/core/modules/modEventOrganization.class.php
+++ b/htdocs/core/modules/modEventOrganization.class.php
@@ -21,7 +21,7 @@
*
* \file htdocs/eventorganization/core/modules/modEventOrganization.class.php
* \ingroup eventorganization
- * \brief Description and activation file for module EventOrganization
+ * \brief Description and activation file for the EventOrganization
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index b4bac22fd1a..ba8568ba13e 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -24,7 +24,7 @@
* \brief Module pour gerer les expeditions de produits
* \file htdocs/core/modules/modExpedition.class.php
* \ingroup expedition
- * \brief Fichier de description et activation du module Expedition
+ * \brief Description and activation file for the module Expedition
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php
index dca32b4fad7..f727247a831 100644
--- a/htdocs/core/modules/modExpenseReport.class.php
+++ b/htdocs/core/modules/modExpenseReport.class.php
@@ -21,7 +21,7 @@
* \brief Module to manage expense report. Replace old module Deplacement.
* \file htdocs/core/modules/modExpenseReport.class.php
* \ingroup expensereport
- * \brief Description and activation file for module ExpenseReport
+ * \brief Description and activation file for the module ExpenseReport
*/
include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
diff --git a/htdocs/core/modules/modExport.class.php b/htdocs/core/modules/modExport.class.php
index 037283b1715..6a47b7b74fd 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -21,7 +21,7 @@
* \brief Module generique pour realiser des exports de donnees en base
* \file htdocs/core/modules/modExport.class.php
* \ingroup export
- * \brief Fichier de description et activation du module export
+ * \brief Description and activation file for the module export
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index 241207998aa..6ca023a65a8 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -21,7 +21,7 @@
* \brief Module pour inclure des informations externes RSS
* \file htdocs/core/modules/modExternalRss.class.php
* \ingroup externalrss
- * \brief Fichier de description et activation du module externalrss
+ * \brief Description and activation file for the module externalrss
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modExternalSite.class.php b/htdocs/core/modules/modExternalSite.class.php
index 42c60067aa8..a996a55ddaa 100644
--- a/htdocs/core/modules/modExternalSite.class.php
+++ b/htdocs/core/modules/modExternalSite.class.php
@@ -22,7 +22,7 @@
* \brief Module to include an external web site/tools into Dolibarr menu and into a frame page.
* \file htdocs/core/modules/modExternalSite.class.php
* \ingroup externalsite
- * \brief Description and activation file for module ExternalSite
+ * \brief Description and activation file for the module ExternalSite
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 52944961379..3e2ccd7d049 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -21,7 +21,7 @@
* \brief Module for FTP client module
* \file htdocs/core/modules/modFTP.class.php
* \ingroup ftp
- * \brief Description and activation file for module FTP
+ * \brief Description and activation file for the module FTP
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index eed92413c8a..efa3aeea536 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -20,11 +20,11 @@
*/
/**
- * \defgroup facture Module invoices
- * \brief Module pour gerer les factures clients et/ou fournisseurs
+ * \defgroup facture Module customer invoices
+ * \brief Module to manage customer invoices
* \file htdocs/core/modules/modFacture.class.php
* \ingroup facture
- * \brief Fichier de la classe de description et activation du module Facture
+ * \brief Description and activation file for the module customer invoices
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modFckeditor.class.php b/htdocs/core/modules/modFckeditor.class.php
index f93e08c1872..7742051989e 100644
--- a/htdocs/core/modules/modFckeditor.class.php
+++ b/htdocs/core/modules/modFckeditor.class.php
@@ -22,7 +22,7 @@
* \brief Module pour mettre en page les zones de saisie de texte
* \file htdocs/core/modules/modFckeditor.class.php
* \ingroup fckeditor
- * \brief Fichier de description et activation du module Fckeditor
+ * \brief Description and activation file for the module Fckeditor
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php
index 9364b75d9f7..af99e6f646f 100644
--- a/htdocs/core/modules/modFicheinter.class.php
+++ b/htdocs/core/modules/modFicheinter.class.php
@@ -25,7 +25,7 @@
* \brief Module to manage intervention cards
* \file htdocs/core/modules/modFicheinter.class.php
* \ingroup ficheinter
- * \brief Fichier de description et activation du module Ficheinter
+ * \brief Description and activation file for the module Ficheinter
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 040bcfbd5bd..46d6dd7bead 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -24,7 +24,7 @@
* \defgroup fournisseur Module suppliers
* \file htdocs/core/modules/modFournisseur.class.php
* \ingroup fournisseur
- * \brief Description and activation file for module Supplier
+ * \brief Description and activation file for the module Supplier
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php
index 06438eefab8..41c3d8517d8 100644
--- a/htdocs/core/modules/modGeoIPMaxmind.class.php
+++ b/htdocs/core/modules/modGeoIPMaxmind.class.php
@@ -20,7 +20,7 @@
* \brief Module to make geoip conversions
* \file htdocs/core/modules/modGeoIPMaxmind.class.php
* \ingroup geoip
- * \brief File of geoipmaxmind module descriptor
+ * \brief Description and activation file for the module geoipmaxmind
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php
index a7d8899b0c2..74ad1566e82 100644
--- a/htdocs/core/modules/modGravatar.class.php
+++ b/htdocs/core/modules/modGravatar.class.php
@@ -21,7 +21,7 @@
* \brief Module to use Gravatar to show photo of users
* \file htdocs/core/modules/modGravatar.class.php
* \ingroup gravatar
- * \brief Description and activation file for module Gravatar
+ * \brief Description and activation file for the module Gravatar
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index edaa872a369..25f04726fd6 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -18,7 +18,7 @@
/**
* \file htdocs/core/modules/modHRM.class.php
* \ingroup HRM
- * \brief Description and activation file for module HRM
+ * \brief Description and activation file for the module HRM
*/
include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 3fa92d8a7c5..8f40e698dcb 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -26,7 +26,7 @@
* \brief Module de gestion des congés
* \file htdocs/core/modules/modHoliday.class.php
* \ingroup holiday
- * \brief Description and activation file for module holiday
+ * \brief Description and activation file for the module holiday
*/
include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index d2a636e2ca6..b70806af82a 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -21,7 +21,7 @@
* \brief Module to make generic import of data into dolibarr database
* \file htdocs/core/modules/modImport.class.php
* \ingroup import
- * \brief Fichier de description et activation du module Import
+ * \brief Description and activation file for the module Import
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index c73eab77c7d..a7a260dba6e 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -22,7 +22,7 @@
*
* \file htdocs/core/modules/modIncoterm.class.php
* \ingroup incoterm
- * \brief Description and activation file for module MyModule
+ * \brief Description and activation file for the module MyModule
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modIntracommreport.class.php b/htdocs/core/modules/modIntracommreport.class.php
index 36a4ced8380..077f51ab519 100644
--- a/htdocs/core/modules/modIntracommreport.class.php
+++ b/htdocs/core/modules/modIntracommreport.class.php
@@ -21,7 +21,7 @@
/**
* \file htdocs/core/modules/modIntracommreport.class.php
* \ingroup Intracomm report
- * \brief Module to activate intracomm report module
+ * \brief Description and activation file for the module intracomm report
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modLabel.class.php b/htdocs/core/modules/modLabel.class.php
index 58e735666ab..8c8756c60c7 100644
--- a/htdocs/core/modules/modLabel.class.php
+++ b/htdocs/core/modules/modLabel.class.php
@@ -21,7 +21,7 @@
* \brief Module pour gerer les formats d'impression des etiquettes
* \file htdocs/core/modules/modLabel.class.php
* \ingroup other
- * \brief Fichier de description et activation du module Label
+ * \brief Description and activation file for the module Labels
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modLdap.class.php b/htdocs/core/modules/modLdap.class.php
index 8e3463ff4d4..0774f71a583 100644
--- a/htdocs/core/modules/modLdap.class.php
+++ b/htdocs/core/modules/modLdap.class.php
@@ -22,7 +22,7 @@
* \brief Module to manage LDAP interfaces with contacts or users
* \file htdocs/core/modules/modLdap.class.php
* \ingroup ldap
- * \brief File to describe and activate Ldap module
+ * \brief Description and activation file for the module LDAP
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index d45987e840d..30aa547cb3a 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -21,7 +21,7 @@
* \brief Module to include loans management
* \file htdocs/core/modules/modLoan.class.php
* \ingroup loan
- * \brief File to activate module loan
+ * \brief Description and activation file for the module loan
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index 1db638e782f..9d590631fe4 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -22,7 +22,7 @@
* \brief Module to manage EMailings
* \file htdocs/core/modules/modMailing.class.php
* \ingroup mailing
- * \brief Fichier de description et activation du module Mailing
+ * \brief Description and activation file for the module Mailing
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modMailmanSpip.class.php b/htdocs/core/modules/modMailmanSpip.class.php
index bfd2e25493a..2a8d97484e7 100644
--- a/htdocs/core/modules/modMailmanSpip.class.php
+++ b/htdocs/core/modules/modMailmanSpip.class.php
@@ -21,7 +21,7 @@
* \brief Module to manage mailman and spip
* \file htdocs/core/modules/modMailmanSpip.class.php
* \ingroup mailmanspip
- * \brief Fichier de description et activation du module de click to Dial
+ * \brief Description and activation file for the module mailmanspip
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index 185a86a86aa..cb7b4d5e602 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -20,7 +20,7 @@
* \brief Module to manage margins
* \file htdocs/core/modules/modMargin.class.php
* \ingroup margin
- * \brief Description and activation file for module Margin
+ * \brief Description and activation file for the module Margin
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modModuleBuilder.class.php b/htdocs/core/modules/modModuleBuilder.class.php
index 6060186a746..99c32e48bbd 100644
--- a/htdocs/core/modules/modModuleBuilder.class.php
+++ b/htdocs/core/modules/modModuleBuilder.class.php
@@ -21,7 +21,7 @@
* \brief Add a log into a block chain for some actions.
* \file htdocs/core/modules/modBlockedLog.class.php
* \ingroup blockedlog
- * \brief Description and activation file for module ModuleBuilder
+ * \brief Description and activation file for the module ModuleBuilder
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index c073476efcb..0a4a7592a20 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -24,7 +24,7 @@
*
* \file htdocs/core/modules/modMrp.class.php
* \ingroup mrp
- * \brief Description and activation file for module Mrp
+ * \brief Description and activation file for the module Mrp
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index f281c99dc37..6b05fe068aa 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -23,7 +23,7 @@
* \brief Handle multiple currencies on company/propal/orders ...
* \file htdocs/core/modules/modMultiCurrency.class.php
* \ingroup multicurrency
- * \brief Description and activation file for module MultiCurrency
+ * \brief Description and activation file for the module MultiCurrency
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modNotification.class.php b/htdocs/core/modules/modNotification.class.php
index f9191ce3c8d..e124b8304f3 100644
--- a/htdocs/core/modules/modNotification.class.php
+++ b/htdocs/core/modules/modNotification.class.php
@@ -21,7 +21,7 @@
* \brief Module pour gerer les notifications (par mail ou autre)
* \file htdocs/core/modules/modNotification.class.php
* \ingroup notification
- * \brief Fichier de description et activation du module Notification
+ * \brief Description and activation file for the module Notification
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index 1faf3455129..f66ba404c7e 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -23,7 +23,7 @@
/**
* \file htdocs/core/modules/modOauth.class.php
* \ingroup oauth
- * \brief File of class to describe and activate module Oauth
+ * \brief Description and activation file for the module Oauth
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 2c01672ac42..87a4f453801 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -21,7 +21,7 @@
* \brief Module to OpenSurvey integration.
* \file htdocs/core/modules/modOpenSurvey.class.php
* \ingroup opensurvey
- * \brief Description and activation file for module OpenSurvey
+ * \brief Description and activation file for the module OpenSurvey
*/
include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php
index 1dfe76f471a..3da6ddfb695 100644
--- a/htdocs/core/modules/modPaybox.class.php
+++ b/htdocs/core/modules/modPaybox.class.php
@@ -21,7 +21,7 @@
* \brief Add integration with Paybox online payment system.
* \file htdocs/core/modules/modPaybox.class.php
* \ingroup paybox
- * \brief Description and activation file for module Paybox
+ * \brief Description and activation file for the module Paybox
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modPaymentByBankTransfer.class.php b/htdocs/core/modules/modPaymentByBankTransfer.class.php
index 5704badf854..6b51e25cdc2 100644
--- a/htdocs/core/modules/modPaymentByBankTransfer.class.php
+++ b/htdocs/core/modules/modPaymentByBankTransfer.class.php
@@ -23,7 +23,7 @@
* \brief Module to manage payment by bank transfer
* \file htdocs/core/modules/modPaymentByBankTransfer.class.php
* \ingroup paymentbybanktransfer
- * \brief File to describe and activate the module PaymentByBankTransfer
+ * \brief Description and activation file for the module PaymentByBankTransfer
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index 82490dc0c4b..0ebb577e48b 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -22,7 +22,7 @@
* \brief Add integration with Paypal online payment system.
* \file htdocs/core/modules/modPaypal.class.php
* \ingroup paypal
- * \brief Description and activation file for module Paypal
+ * \brief Description and activation file for the module Paypal
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modPrelevement.class.php b/htdocs/core/modules/modPrelevement.class.php
index 4bee933376f..8d68b372e91 100644
--- a/htdocs/core/modules/modPrelevement.class.php
+++ b/htdocs/core/modules/modPrelevement.class.php
@@ -23,7 +23,7 @@
* \brief Module to manage Direct debit orders
* \file htdocs/core/modules/modPrelevement.class.php
* \ingroup prelevement
- * \brief File to describe and enable the module Prelevement
+ * \brief Description and activation file for the module Prelevement
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modPrinting.class.php b/htdocs/core/modules/modPrinting.class.php
index 373ca131d2b..4c104b30ecf 100644
--- a/htdocs/core/modules/modPrinting.class.php
+++ b/htdocs/core/modules/modPrinting.class.php
@@ -23,7 +23,7 @@
/**
* \file htdocs/core/modules/modPrinting.class.php
* \ingroup printing
- * \brief File of class to describe and activate module Direct Printing
+ * \brief Description and activation file for the module Direct Printing
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 2bd42d64e11..2599f2f19fb 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -28,7 +28,7 @@
* \brief Module to manage catalog of predefined products
* \file htdocs/core/modules/modProduct.class.php
* \ingroup produit
- * \brief File to describe module to manage catalog of predefined products
+ * \brief Description and activation file for the module to manage catalog of predefined products
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index 3da2523ad40..166b8f6e637 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -23,7 +23,7 @@
* \brief Management module for batch number, eat-by and sell-by date for product
* \file htdocs/core/modules/modProductBatch.class.php
* \ingroup productbatch
- * \brief Description and activation file for module productbatch
+ * \brief Description and activation file for the module productbatch
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index ff135a74d1d..25448f239e6 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -26,7 +26,7 @@
* \brief Module to create projects/tasks/gantt diagram. Projects can them be affected to tasks.
* \file htdocs/core/modules/modProjet.class.php
* \ingroup projet
- * \brief Fichier de description et activation du module Projet
+ * \brief Description and activation file for the module project
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index a1f52bbd906..687d8ea3669 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -26,7 +26,7 @@
* \brief Module pour gerer la tenue de propositions commerciales
* \file htdocs/core/modules/modPropale.class.php
* \ingroup propale
- * \brief Fichier de description et activation du module Propale
+ * \brief Description and activation file for the module customer proposal
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index fe95a89d9ce..4fe437700e4 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -23,7 +23,7 @@
/**
* \file htdocs/core/modules/modReceiptPrinter.class.php
* \ingroup printing
- * \brief File of class to describe and activate module Receipt Printer
+ * \brief Description and activation file for the module Receipt Printer
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 17f765d2caf..247a4faeddc 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -20,7 +20,7 @@
* \brief Module pour gerer les réceptions de produits
* \file htdocs/core/modules/modReception.class.php
* \ingroup reception
- * \brief Fichier de description et activation du module Reception
+ * \brief Description and activation file for the module Reception
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modRecruitment.class.php b/htdocs/core/modules/modRecruitment.class.php
index 2a3d36c46bb..f7cd37c16be 100644
--- a/htdocs/core/modules/modRecruitment.class.php
+++ b/htdocs/core/modules/modRecruitment.class.php
@@ -23,7 +23,7 @@
*
* \file htdocs/recruitment/core/modules/modRecruitment.class.php
* \ingroup recruitment
- * \brief Description and activation file for module Recruitment
+ * \brief Description and activation file for the module Recruitment
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index ee3836cde26..6f2d3f8d409 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -23,7 +23,7 @@
* \brief Resource module descriptor.
* \file core/modules/modResource.class.php
* \ingroup resource
- * \brief Description and activation file for module Resource
+ * \brief Description and activation file for the module Resource
*/
include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
diff --git a/htdocs/core/modules/modSalaries.class.php b/htdocs/core/modules/modSalaries.class.php
index 131b0f2945f..759804b409e 100644
--- a/htdocs/core/modules/modSalaries.class.php
+++ b/htdocs/core/modules/modSalaries.class.php
@@ -27,7 +27,7 @@
* \brief Module to include salaries management
* \file htdocs/core/modules/modSalaries.class.php
* \ingroup salaries
- * \brief File to activate module salaries
+ * \brief Description and activation file for the module salaries
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 6009af638fb..13ff4618483 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -25,7 +25,7 @@
* \brief Module pour gerer le suivi de services predefinis
* \file htdocs/core/modules/modService.class.php
* \ingroup service
- * \brief Fichier de description et activation du module Service
+ * \brief Description and activation file for the module Service
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modSocialNetworks.class.php b/htdocs/core/modules/modSocialNetworks.class.php
index 368634083ee..3949de6c691 100644
--- a/htdocs/core/modules/modSocialNetworks.class.php
+++ b/htdocs/core/modules/modSocialNetworks.class.php
@@ -21,7 +21,7 @@
* \brief Add a SocialNetworks button.
* \file htdocs/core/modules/modSocialNetworks.class.php
* \ingroup socialnetworks
- * \brief Description and activation file for module SocialNetworks
+ * \brief Description and activation file for the module SocialNetworks
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 9151673f996..38ca03ffe3b 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -25,7 +25,7 @@
* \brief Module to manage third parties (customers, prospects)
* \file htdocs/core/modules/modSociete.class.php
* \ingroup societe
- * \brief Fichier de description et activation du module Societe
+ * \brief Description and activation file for the module societe (thirdparty)
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index ffa80d9a748..3d46d606265 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -23,7 +23,7 @@
* \brief Module pour gerer la tenue de stocks produits
* \file htdocs/core/modules/modStock.class.php
* \ingroup stock
- * \brief Fichier de description et activation du module Stock
+ * \brief Description and activation file for the module Stock
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 2cf80fc9f60..2677d3e3fa3 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -21,7 +21,7 @@
* \brief Add integration with Stripe online payment system.
* \file htdocs/core/modules/modStripe.class.php
* \ingroup stripe
- * \brief Description and activation file for module Stripe
+ * \brief Description and activation file for the module Stripe
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index d86e06629f3..4a0fc21fa44 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -26,7 +26,7 @@
*
* \file htdocs/core/modules/modSupplierProposal.class.php
* \ingroup supplier_proposal
- * \brief File to describe and activate module SupplierProposal
+ * \brief Description and activation file for the module supplier proposal
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modSyslog.class.php b/htdocs/core/modules/modSyslog.class.php
index d003108726e..1d85dc2115d 100644
--- a/htdocs/core/modules/modSyslog.class.php
+++ b/htdocs/core/modules/modSyslog.class.php
@@ -21,7 +21,7 @@
* \brief Module pour gerer les messages d'erreur dans syslog
* \file htdocs/core/modules/modSyslog.class.php
* \ingroup syslog
- * \brief Fichier de description et activation du module de syslog
+ * \brief Description and activation file for the module syslog
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index b4fbb1f2e97..d34213f062c 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -22,7 +22,7 @@
*
* \file htdocs/core/modules/modTakePos.class.php
* \ingroup takepos
- * \brief Description and activation file for module TakePos
+ * \brief Description and activation file for the module TakePos
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modTax.class.php b/htdocs/core/modules/modTax.class.php
index bf064d743f8..222b1c775c1 100644
--- a/htdocs/core/modules/modTax.class.php
+++ b/htdocs/core/modules/modTax.class.php
@@ -25,7 +25,7 @@
* \brief Module pour inclure des fonctions de saisies des taxes (tva) et charges sociales
* \file htdocs/core/modules/modTax.class.php
* \ingroup tax
- * \brief Fichier de description et activation du module Taxe
+ * \brief Description and activation file for the module taxes
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index e186f5fdc1c..a1318266334 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -22,7 +22,7 @@
* \brief Module for ticket and request management.
* \file core/modules/modTicket.class.php
* \ingroup ticket
- * \brief Description and activation file for module Ticket
+ * \brief Description and activation file for the module Ticket
*/
require_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index 4c1a6bcfded..e84998635ff 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -22,7 +22,7 @@
* \brief Module pour gerer les utilisateurs
* \file htdocs/core/modules/modUser.class.php
* \ingroup user
- * \brief Fichier de description et activation du module Utilisateur
+ * \brief Description and activation file for the module users
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php
index 22953321fbe..a6c88afc03d 100644
--- a/htdocs/core/modules/modVariants.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -24,6 +24,7 @@
* \brief Module to manage product combinations based on product attributes
* \file htdocs/core/modules/modVariants.class.php
* \ingroup produit
+ * \brief Description and activation file for the module product variants
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modWebServices.class.php b/htdocs/core/modules/modWebServices.class.php
index a6362a175cc..a88db3dee26 100644
--- a/htdocs/core/modules/modWebServices.class.php
+++ b/htdocs/core/modules/modWebServices.class.php
@@ -20,7 +20,7 @@
* \brief Module to enable the Dolibarr server of web services
* \file htdocs/core/modules/modWebServices.class.php
* \ingroup webservices
- * \brief File to describe webservices module
+ * \brief Description and activation file for the module webservices
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
index b59e6cb9e13..d44d48ef13a 100644
--- a/htdocs/core/modules/modWebServicesClient.class.php
+++ b/htdocs/core/modules/modWebServicesClient.class.php
@@ -20,7 +20,7 @@
* \brief Module to enable client for supplier WebServices
* \file htdocs/core/modules/modWebServicesClient.class.php
* \ingroup webservices
- * \brief File to describe client for supplier webservices module
+ * \brief Description and activation file for the module supplier webservices module
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index f16a29728be..c4abadcd870 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -20,7 +20,7 @@
* \brief website module descriptor.
* \file htdocs/core/modules/modWebsite.class.php
* \ingroup websites
- * \brief Description and activation file for module Website
+ * \brief Description and activation file for the module Website
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
@@ -109,6 +109,12 @@ class modWebsite extends DolibarrModules
$this->rights[$r][4] = 'delete';
$r++;
+ $this->rights[$r][0] = 10008;
+ $this->rights[$r][1] = 'Export website content';
+ $this->rights[$r][3] = 0;
+ $this->rights[$r][4] = 'export';
+ $r++;
+
// Main menu entries
$r = 0;
$this->menu[$r] = array('fk_menu'=>'0', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
@@ -130,6 +136,7 @@ class modWebsite extends DolibarrModules
$this->export_code[$r] = $this->rights_class.'_'.$r;
$this->export_label[$r] = 'MyWebsitePages'; // Translation key (used only if key ExportDataset_xxx_z not found)
+ $this->export_permission[$r] = array(array("website", "export"));
$this->export_icon[$r] = 'globe';
$keyforclass = 'WebsitePage';
$keyforclassfile = '/website/class/websitepage.class.php';
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index 539fd7a76d2..fbf7927ed1c 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -21,7 +21,7 @@
* \brief Workflow management
* \file htdocs/core/modules/modWorkflow.class.php
* \ingroup workflow
- * \brief File to describe and activate module Workflow
+ * \brief Description and activation file for the module Workflow
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
index ade029b1233..02f5e059297 100755
--- a/htdocs/core/modules/modWorkstation.class.php
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -24,7 +24,7 @@
*
* \file htdocs/workstation/core/modules/modWorkstation.class.php
* \ingroup workstation
- * \brief Description and activation file for module Workstation
+ * \brief Description and activation file for the module Workstation
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
diff --git a/htdocs/core/modules/modZapier.class.php b/htdocs/core/modules/modZapier.class.php
index 697fa489443..5685a30c701 100644
--- a/htdocs/core/modules/modZapier.class.php
+++ b/htdocs/core/modules/modZapier.class.php
@@ -21,7 +21,7 @@
*
* \file htdocs/core/modules/modZapier.class.php
* \ingroup zapier
- * \brief Description and activation file for module Zapier
+ * \brief Description and activation file for the module Zapier
*/
include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
@@ -110,7 +110,7 @@ class modZapier extends DolibarrModules
$this->dirs = array("/zapier/temp");
// Config pages. Put here list of php page, stored into zapier/admin directory, to use to setup module.
$this->config_page_url = array(
- // "setup.php@zapier"
+ "setup.php@zapier"
);
// Dependencies
// A condition to hide module
@@ -269,53 +269,6 @@ class modZapier extends DolibarrModules
// Main menu entries
$this->menu = array(); // List of menus to add
$r = 0;
-
- // Add here entries to declare new menus
- // $this->menu[$r++]=array(
- // 'fk_menu' => '', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- // 'type' => 'top', // This is a Top menu entry
- // 'titre' => 'Zapier',
- // 'mainmenu' => 'zapier',
- // 'leftmenu' => '',
- // 'url' => '/zapier/zapierindex.php',
- // 'langs' => 'zapier@zapier', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- // 'position' => 1000+$r,
- // 'enabled' => '$conf->zapier->enabled', // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled.
- // 'perms' => '1', // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
- // 'target' => '',
- // 'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
- // );
-
- /*
- $this->menu[$r++]=array(
- 'fk_menu'=>'fk_mainmenu=zapier', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'left', // This is a Left menu entry
- 'titre'=>'List MyObject',
- 'mainmenu'=>'zapier',
- 'leftmenu'=>'zapier_myobject_list',
- 'url'=>'/zapier/myobject_list.php',
- 'langs'=>'zapier@zapier', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'position'=>1000+$r,
- 'enabled'=>'$conf->zapier->enabled', // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
- 'perms'=>'1', // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
- 'target'=>'',
- 'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
- );
- $this->menu[$r++]=array(
- 'fk_menu'=>'fk_mainmenu=zapier,fk_leftmenu=zapier', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'left', // This is a Left menu entry
- 'titre'=>'New MyObject',
- 'mainmenu'=>'zapier',
- 'leftmenu'=>'zapier_myobject_new',
- 'url'=>'/zapier/myobject_page.php?action=create',
- 'langs'=>'zapier@zapier', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'position'=>1000+$r,
- 'enabled'=>'$conf->zapier->enabled', // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
- 'perms'=>'1', // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
- 'target'=>'',
- 'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
- );
- */
}
/**
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index b0ab3e5bb76..ddcdfdf9e4b 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -145,7 +145,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php
-trans("LabelOrTranslationKey"); ?> trans("LabelOrTranslationKey"); ?> trans("AttributeCode"); ?> (trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>) textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?> trans("AllEntities"); ?> trans("LabelOrTranslationKey"); ?> trans("LabelOrTranslationKey"); ?> trans("AttributeCode"); ?> textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?> trans("AllEntities"); ?> '.$langs->trans("AlwaysEditable").' ';
print ''.$form->textwithpicto($langs->trans("Visible"), $langs->trans("VisibleDesc")).' ';
print ''.$form->textwithpicto($langs->trans("DisplayOnPdf"), $langs->trans("DisplayOnPdfDesc")).' ';
print ''.$form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")).' ';
-if (empty($conf->multicompany->enabled)) {
- print ''.$langs->trans("Entities").' ';
+if (!empty($conf->multicompany->enabled)) {
+ print ''.$langs->trans("Entity").' ';
}
print ' ';
print "\n";
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index f46891b6847..7e10b5b5f1f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -126,6 +126,12 @@ $permissiondellink = $user->rights->expedition->delivery->creer; // Used by the
$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $object->id, '');
+
/*
* Actions
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index a096b2155ce..174b97b4a7e 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -41,12 +41,6 @@ $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'aZ09');
-// Security check
-if ($user->socid) {
- $socid = $user->socid;
-}
-$result = restrictedArea($user, 'expedition', $id, '');
-
$object = new Expedition($db);
if ($id > 0 || !empty($ref)) {
$object->fetch($id, $ref);
@@ -69,6 +63,12 @@ if ($id > 0 || !empty($ref)) {
}
}
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $object->id, '');
+
/*
* Actions
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 836b469cb77..faff2a8d0a0 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -45,12 +45,6 @@ $confirm = GETPOST('confirm');
$id = GETPOST('id', 'int');
$ref = GETPOST('ref');
-// Security check
-if ($user->socid) {
- $socid = $user->socid;
-}
-$result = restrictedArea($user, 'expedition', $id, '');
-
// Get parameters
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
@@ -71,14 +65,21 @@ if (!$sortfield) {
$object = new Expedition($db);
+if ($object->fetch($id, $ref)) {
+ $object->fetch_thirdparty();
+ $upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
+}
+
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $object->id, '');
+
/*
* Actions
*/
-if ($object->fetch($id)) {
- $object->fetch_thirdparty();
- $upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
-}
include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index c8209910b48..db28e409309 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -39,13 +39,6 @@ $id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); //
$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'aZ09');
-// Security check
-$socid = '';
-if ($user->socid) {
- $socid = $user->socid;
-}
-$result = restrictedArea($user, $origin, $origin_id);
-
$object = new Expedition($db);
if ($id > 0 || !empty($ref)) {
$object->fetch($id, $ref);
@@ -66,10 +59,18 @@ if ($id > 0 || !empty($ref)) {
$objectsrc = new Propal($db);
$objectsrc->fetch($object->$typeobject->id);
}
+
+ $upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
}
$permissionnote = $user->rights->expedition->creer; // Used by the include of actions_setnotes.inc.php
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $object->id, '');
+
/*
* Actions
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 66efd5c4ca7..809b4803ff5 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -73,6 +73,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $object->id, '');
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 151edbdba2b..6bdc495472c 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -39,7 +39,7 @@ if ($user->socid > 0) {
$socid = $user->socid;
}
-$nowyear = strftime("%Y", dol_now());
+$nowyear = dol_print_date(dol_now(), "%Y");
$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
//$startyear=$year-2;
$startyear = $year - 1;
@@ -48,6 +48,12 @@ $endyear = $year;
// Load translation files required by the page
$langs->loadLangs(array('sendings', 'other', 'companies'));
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+restrictedArea($user, 'expedition');
+
/*
* View
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 74455d7dca2..254fd9aad90 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -29,6 +29,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$year = GETPOST('year', 'int');
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+restrictedArea($user, 'expedition');
+
/*
* View
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index dc23a8ab362..b3d0cf49a32 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -154,6 +154,9 @@ $upload_dir = $conf->export->dir_temp.'/'.$user->id;
//$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1);
$usefilters = 1;
+// Security check
+$result = restrictedArea($user, 'export');
+
/*
* Actions
@@ -449,7 +452,7 @@ if ($step == 1 || !$datatoexport) {
if ($objexport->array_export_perms[$key]) {
print ''.img_picto($langs->trans("NewExport"), 'next', 'class="fa-15x"').' ';
} else {
- print $langs->trans("NotEnoughPermissions");
+ print ''.$langs->trans("NotEnoughPermissions").' ';
}
print '';
}
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 22b1729550d..3ba5e0a3591 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -27,11 +27,12 @@ require_once DOL_DOCUMENT_ROOT.'/exports/class/export.class.php';
// Load translation files required by the page
$langs->load("exports");
+$export = new Export($db);
+$export->load_arrays($user);
+
// Security check
$result = restrictedArea($user, 'export');
-$export = new Export($db);
-$export->load_arrays($user);
/*
* View
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index d85a0b0b52e..a7a38316360 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -97,6 +97,17 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (34000, 'AD-008', 'AD700', NULL, NULL, 'Escaldes-Engordany');
+-- Australia States & Territories (id country=28)
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801,'NSW','',1,'','New South Wales');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801,'VIC','',1,'','Victoria');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801,'QLD','',1,'','Queensland');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801,'SA' ,'',1,'','South Australia');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801,'ACT','',1,'','Australia Capital Territory');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801,'TAS','',1,'','Tasmania');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801,'WA' ,'',1,'','Western Australia');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801,'NT' ,'',1,'','Northern Territory');
+
+
-- Austria States / Österreich Bundesländer (id country=41)
INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101,'B','BURGENLAND','Burgenland',1);
INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101,'K','KAERNTEN','Kärnten',1);
@@ -564,15 +575,6 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('111', 5209, '', 0, '', 'Nicolás Suárez', 1);
INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('112', 5209, '', 0, '', 'General Federico Román', 1);
--- Provinces Australia (id country=28)
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NSW','',1,'','New South Wales');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'VIC','',1,'','Victoria');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'QLD','',1,'','Queensland');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'SA' ,'',1,'','South Australia');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'ACT','',1,'','Australia Capital Territory');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'TAS','',1,'','Tasmania');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'WA' ,'',1,'','Western Australia');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (2801,'NT' ,'',1,'','Northern Territory');
-- Provinces Canada (id country=14)
insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (1401,'ON','',1,'','Ontario');
@@ -1666,3 +1668,4 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom
INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-KMN', 'KMN', NULL, '金門縣');
INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-LNN', 'LNN', NULL, '連江縣');
+
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 5812248b129..31d0790b331 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -21,10 +21,12 @@ MembersListToValid=List of draft members (to be validated)
MembersListValid=List of valid members
MembersListUpToDate=List of valid members with up-to-date subscription
MembersListNotUpToDate=List of valid members with out-of-date subscription
+MembersListExcluded=List of excluded members
MembersListResiliated=List of terminated members
MembersListQualified=List of qualified members
MenuMembersToValidate=Draft members
MenuMembersValidated=Validated members
+MenuMembersExcluded=Excluded members
MenuMembersResiliated=Terminated members
MembersWithSubscriptionToReceive=Members with subscription to receive
MembersWithSubscriptionToReceiveShort=Subscription to receive
@@ -47,9 +49,12 @@ MemberStatusActiveLate=Subscription expired
MemberStatusActiveLateShort=Expired
MemberStatusPaid=Subscription up to date
MemberStatusPaidShort=Up to date
+MemberStatusExcluded=Excluded member
+MemberStatusExcludedShort=Excluded
MemberStatusResiliated=Terminated member
MemberStatusResiliatedShort=Terminated
MembersStatusToValid=Draft members
+MembersStatusExcluded=Excluded members
MembersStatusResiliated=Terminated members
MemberStatusNoSubscription=Validated (no subscription needed)
MemberStatusNoSubscriptionShort=Validated
@@ -82,6 +87,8 @@ Physical=Physical
Moral=Moral
MorAndPhy=Moral and Physical
Reenable=Reenable
+ExcludeMember=Exclude a member
+ConfirmExcludeMember=Are you sure you want to exclude this member ?
ResiliateMember=Terminate a member
ConfirmResiliateMember=Are you sure you want to terminate this member?
DeleteMember=Delete a member
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index aabbe1791b3..4585841911b 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -155,7 +155,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
StockMustBeEnoughForOrder=Stock level must be enough to add product/service to order (check is done on current real stock when adding a line into order whatever the rule for automatic stock change)
StockMustBeEnoughForShipment= Stock level must be enough to add product/service to shipment (check is done on current real stock when adding a line into shipment whatever the rule for automatic stock change)
MovementLabel=Label of movement
-TypeMovement=Type of movement
+TypeMovement=Direction of movement
DateMovement=Date of movement
InventoryCode=Movement or inventory code
IsInPackage=Contained into package
diff --git a/htdocs/langs/en_US/zapier.lang b/htdocs/langs/en_US/zapier.lang
index c688a0c307f..ababab4a39b 100644
--- a/htdocs/langs/en_US/zapier.lang
+++ b/htdocs/langs/en_US/zapier.lang
@@ -13,17 +13,9 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see ';
- //print '';
- print ''.$langs->trans('StockIncreaseAfterCorrectTransfer').' ';
- print ''.$langs->trans('StockDecreaseAfterCorrectTransfer').' ';
- print ''.$langs->trans('StockDecrease').' ';
- print ''.$langs->trans('StockIncrease').' ';
- print ' ';
- print ajax_combobox('search_type_mouvement');
- // TODO: add new function $formentrepot->selectTypeOfMovement(...) like
- // print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
- print ' ';
- }
if (!empty($arrayfields['origin']['checked'])) {
// Origin of movement
print '';
@@ -972,6 +956,22 @@ if ($resql) {
print ' ';
print ' ';
}
+ if (!empty($arrayfields['m.type_mouvement']['checked'])) {
+ // Type of movement
+ print '';
+ //print '';
+ print ' ';
+ print ''.$langs->trans('StockIncreaseAfterCorrectTransfer').' ';
+ print ''.$langs->trans('StockDecreaseAfterCorrectTransfer').' ';
+ print ''.$langs->trans('StockDecrease').' ';
+ print ''.$langs->trans('StockIncrease').' ';
+ print ' ';
+ print ajax_combobox('search_type_mouvement');
+ // TODO: add new function $formentrepot->selectTypeOfMovement(...) like
+ // print $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, null, 'maxwidth200');
+ print ' ';
+ }
if (!empty($arrayfields['m.value']['checked'])) {
// Qty
print '';
@@ -1044,15 +1044,15 @@ if ($resql) {
if (!empty($arrayfields['m.label']['checked'])) {
print_liste_field_titre($arrayfields['m.label']['label'], $_SERVER["PHP_SELF"], "m.label", "", $param, "", $sortfield, $sortorder);
}
- if (!empty($arrayfields['m.type_mouvement']['checked'])) {
- print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
- }
if (!empty($arrayfields['origin']['checked'])) {
print_liste_field_titre($arrayfields['origin']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
}
if (!empty($arrayfields['m.fk_projet']['checked'])) {
print_liste_field_titre($arrayfields['m.fk_projet']['label'], $_SERVER["PHP_SELF"], "m.fk_projet", "", $param, '', $sortfield, $sortorder);
}
+ if (!empty($arrayfields['m.type_mouvement']['checked'])) {
+ print_liste_field_titre($arrayfields['m.type_mouvement']['label'], $_SERVER["PHP_SELF"], "m.type_mouvement", "", $param, '', $sortfield, $sortorder, 'center ');
+ }
if (!empty($arrayfields['m.value']['checked'])) {
print_liste_field_titre($arrayfields['m.value']['label'], $_SERVER["PHP_SELF"], "m.value", "", $param, '', $sortfield, $sortorder, 'right ');
}
@@ -1113,6 +1113,8 @@ if ($resql) {
$warehousestatic->fk_parent = $objp->fk_parent;
$warehousestatic->statut = $objp->statut;
+ $movement->type = $objp->type_mouvement;
+
$arrayofuniqueproduct[$objp->rowid] = $objp->produit;
if (!empty($objp->fk_origin)) {
$origin = $movement->get_origin($objp->fk_origin, $objp->origintype);
@@ -1176,23 +1178,6 @@ if ($resql) {
// Label of movement
print ' '.$objp->label.' ';
}
- if (!empty($arrayfields['m.type_mouvement']['checked'])) {
- // Type of movement
- switch ($objp->type_mouvement) {
- case "0":
- print ''.$langs->trans('StockIncreaseAfterCorrectTransfer').' ';
- break;
- case "1":
- print ''.$langs->trans('StockDecreaseAfterCorrectTransfer').' ';
- break;
- case "2":
- print ''.$langs->trans('StockDecrease').' ';
- break;
- case "3":
- print ''.$langs->trans('StockIncrease').' ';
- break;
- }
- }
if (!empty($arrayfields['origin']['checked'])) {
// Origin of movement
print ''.$origin.' ';
@@ -1205,13 +1190,25 @@ if ($resql) {
}
print '';
}
+ if (!empty($arrayfields['m.type_mouvement']['checked'])) {
+ // Type of movement
+ print '';
+ print $movement->getTypeMovement();
+ print ' ';
+ }
if (!empty($arrayfields['m.value']['checked'])) {
// Qty
print '';
- if ($objp->qt > 0) {
+ if ($objp->qty > 0) {
+ print '';
print '+';
+ print $objp->qty;
+ print ' ';
+ } else {
+ print '';
+ print $objp->qty;
+ print ' ';
}
- print $objp->qty;
print ' ';
}
if (!empty($arrayfields['m.price']['checked'])) {
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index cbdaa62014b..5a3b0cb0a9c 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -358,12 +358,12 @@ print ''.$langs->trans('Date').' '.$form->sel
print ' ';
print img_picto('', 'product').' ';
print $langs->trans('Product').' ';
-$form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
+print $form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300', 0, '', null, 1);
print ' ';
print img_picto('', 'stock').' ';
print $langs->trans('Warehouse').' ';
-print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifone'), 'fk_warehouse', '', 1);
+print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifone'), 'fk_warehouse', '', 1, 0, 0, '', 0, 0, null, '', '', 1, false, 'e.ref');
print '';
$parameters = array();
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index be1a574e3fe..d8c25bbebbb 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -642,7 +642,7 @@ if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
print ''.$langs->trans("PasswordAgain").' * '.$langs->trans("DateToBirth").' ';
+print ' '.$langs->trans("DateOfBirth").' ';
print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
print ' ';
print ''.dolGetFirstLastname($langs->trans("Firstname"), $langs->trans("Lastname")).' '.$langs->trans("Company").' ';
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index 3a8eb998fff..3d65fec02d1 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -97,7 +97,7 @@ $h++;
*/
-dol_fiche_head($head, $hselected, $langs->trans("SalaryPayment"), -1, 'payment');
+print dol_get_fiche_head($head, $hselected, $langs->trans("SalaryPayment"), -1, 'payment');
/*
* Deletion confirmation of payment
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 9a9b4e7ed6c..6549a4d38cb 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -768,6 +768,19 @@ i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before {
opacity: 0.4;
padding-: 3px;
}
+.stockmovemententry {
+ color: #080;
+ transform: rotate(0.25turn);
+ font-size: 1.2em;
+}
+.stockmovementexit {
+ color: #968822;
+ transform: rotate(0.3turn);
+ font-size: 1.2em;
+}
+.stockmovement {
+ font-size: 1.4em;
+}
body[class*="colorblind-"] .text-warning{
color :
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index ad47245eec5..3eda0c40ee7 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -366,14 +366,14 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
content: "\f571";
}
.fa-dol-project:before {
- content: "\f0e8";
+ content: "\f542";
}
.fa-dol-commande:before,
.fa-dol-order_supplier:before {
content: "\f570";
}
.fa-dol-contrat:before {
- content: "\f1e6";
+ content: "\f0f2";
}
.fa-dol-ticket:before {
content: "\f3ff";
@@ -382,7 +382,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
content: "\f19c";
}
.fa-dol-member:before {
- content: "\f0c0";
+ content: "\f007";
}
.fa-dol-expensereport:before {
content: "\f555";
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2209c87c22b..411ed3b41ec 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -899,6 +899,19 @@ i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before {
opacity: 0.4;
padding-: 3px;
}
+.stockmovemententry {
+ color: #080;
+ transform: rotate(0.25turn);
+ font-size: 1.2em;
+}
+.stockmovementexit {
+ color: #968822;
+ transform: rotate(0.3turn);
+ font-size: 1.2em;
+}
+.stockmovement {
+ font-size: 1.4em;
+}
.text-warning{
color :
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index b27e12e3f3e..2ac519b0a26 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -604,7 +604,7 @@ class User extends CommonObject
}
/**
- * Load default value in property ->default_values
+ * Load default values from database table into property ->default_values
*
* @return int > 0 if OK, < 0 if KO
*/
@@ -616,7 +616,7 @@ class User extends CommonObject
require_once DOL_DOCUMENT_ROOT.'/core/class/defaultvalues.class.php';
$defaultValues = new DefaultValues($this->db);
- $result = $defaultValues->fetchAll('', '', 0, 0, array('t.user_id'=>array(0, $this->id), 'entity'=>array($this->entity, $conf->entity))); // User 0 (all) + me (if defined)
+ $result = $defaultValues->fetchAll('', '', 0, 0, array('t.user_id'=>array(0, $this->id), 'entity'=>array((isset($this->entity) ? $this->entity : $conf->entity), $conf->entity))); // User 0 (all) + me (if defined)
if (!is_array($result) && $result < 0) {
setEventMessages($defaultValues->error, $defaultValues->errors, 'errors');
diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php
index f5467760a89..ade64ea6a7b 100644
--- a/htdocs/variants/admin/admin.php
+++ b/htdocs/variants/admin/admin.php
@@ -25,7 +25,7 @@ $langs->loadLangs(array("admin", "products"));
$action = GETPOST('action', 'alphanohtml');
// Security check
-if (!$user->admin || (empty($conf->product->enabled) && empty($conf->service->enabled))) {
+if (!$user->admin || empty($conf->variants->enabled)) {
accessforbidden();
}
diff --git a/htdocs/variants/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php
index adb227c2fd6..9c670fa07cc 100644
--- a/htdocs/variants/ajax/getCombinations.php
+++ b/htdocs/variants/ajax/getCombinations.php
@@ -36,7 +36,24 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
-header('Content-Type: application/json');
+$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+
+// Security check
+if (empty($conf->variants->enabled)) {
+ accessforbidden('Module not enabled');
+}
+if ($user->socid > 0) { // Protection if external user
+ accessforbidden();
+}
+//$result = restrictedArea($user, 'variant');
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * View
+ */
+
+top_httphead('application/json');
$id = GETPOST('id', 'int');
diff --git a/htdocs/variants/ajax/get_attribute_values.php b/htdocs/variants/ajax/get_attribute_values.php
index e61676339ee..1d4eab49773 100644
--- a/htdocs/variants/ajax/get_attribute_values.php
+++ b/htdocs/variants/ajax/get_attribute_values.php
@@ -36,7 +36,24 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
-header('Content-Type: application/json');
+$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+
+// Security check
+if (empty($conf->variants->enabled)) {
+ accessforbidden('Module not enabled');
+}
+if ($user->socid > 0) { // Protection if external user
+ accessforbidden();
+}
+//$result = restrictedArea($user, 'variant');
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * View
+ */
+
+top_httphead('application/json');
$id = GETPOST('id', 'int');
diff --git a/htdocs/variants/ajax/orderAttribute.php b/htdocs/variants/ajax/orderAttribute.php
index c787517e5c7..1d9e1b8e892 100644
--- a/htdocs/variants/ajax/orderAttribute.php
+++ b/htdocs/variants/ajax/orderAttribute.php
@@ -37,6 +37,18 @@ if (!defined('NOREQUIRETRAN')) {
require '../../main.inc.php';
+$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+
+// Security check
+if (empty($conf->variants->enabled)) {
+ accessforbidden('Module not enabled');
+}
+if ($user->socid > 0) { // Protection if external user
+ accessforbidden();
+}
+//$result = restrictedArea($user, 'variant');
+if (!$permissiontoread) accessforbidden();
+
/*
* View
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 7a15a4ede97..ed70c6325e3 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -36,6 +36,18 @@ if ($object->fetch($id) < 1) {
exit();
}
+$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+
+// Security check
+if (empty($conf->variants->enabled)) {
+ accessforbidden('Module not enabled');
+}
+if ($user->socid > 0) { // Protection if external user
+ accessforbidden();
+}
+//$result = restrictedArea($user, 'variant');
+if (!$permissiontoread) accessforbidden();
+
/*
* Actions
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 218ee874bd6..979ec261663 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -64,6 +64,18 @@ if ($id > 0 || $ref) {
$selectedvariant = $_SESSION['addvariant_'.$object->id];
+$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+
+// Security check
+if (empty($conf->variants->enabled)) {
+ accessforbidden('Module not enabled');
+}
+if ($user->socid > 0) { // Protection if external user
+ accessforbidden();
+}
+//$result = restrictedArea($user, 'variant');
+if (!$permissiontoread) accessforbidden();
+
/*
* Actions
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
index 8f3a1d28d9f..f87ad3ef504 100644
--- a/htdocs/variants/create.php
+++ b/htdocs/variants/create.php
@@ -24,6 +24,18 @@ $label = GETPOST('label', 'alpha');
$backtopage = GETPOST('backtopage', 'alpha');
$action = GETPOST('action', 'alpha');
+$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+
+// Security check
+if (empty($conf->variants->enabled)) {
+ accessforbidden('Module not enabled');
+}
+if ($user->socid > 0) { // Protection if external user
+ accessforbidden();
+}
+//$result = restrictedArea($user, 'variant');
+if (!$permissiontoread) accessforbidden();
+
/*
* Actions
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index 22dc2a1a110..1ca647960e2 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -36,6 +36,18 @@ if ($object->fetch($id) < 1) {
exit();
}
+$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+
+// Security check
+if (empty($conf->variants->enabled)) {
+ accessforbidden('Module not enabled');
+}
+if ($user->socid > 0) { // Protection if external user
+ accessforbidden();
+}
+//$result = restrictedArea($user, 'variant');
+if (!$permissiontoread) accessforbidden();
+
/*
* Actions
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index dde43397671..bfe4dd0aa72 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -21,6 +21,18 @@ require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
$action = GETPOST('action', 'aZ09');
$object = new ProductAttribute($db);
+$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+
+// Security check
+if (empty($conf->variants->enabled)) {
+ accessforbidden('Module not enabled');
+}
+if ($user->socid > 0) { // Protection if external user
+ accessforbidden();
+}
+//$result = restrictedArea($user, 'variant');
+if (!$permissiontoread) accessforbidden();
+
/*
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 034583d3440..021edc52920 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -477,7 +477,7 @@ if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $us
}
// Replacement of string into pages
-if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha')) {
+if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && $usercanedit) {
$replacestring = GETPOST('replacestring', 'none');
if (empty($user->rights->website->writephp)) {
@@ -567,7 +567,7 @@ if ($action == 'adddir' && $permtouploadfile)
*/
// Add site
-if ($action == 'addsite') {
+if ($action == 'addsite' && $usercanedit) {
$db->begin();
if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha'))) {
@@ -625,7 +625,7 @@ if ($action == 'addsite') {
}
// Add page/container
-if ($action == 'addcontainer') {
+if ($action == 'addcontainer' && $usercanedit) {
dol_mkdir($pathofwebsite);
$db->begin();
@@ -1148,7 +1148,7 @@ if ($action == 'addcontainer') {
}
// Delete site
-if ($action == 'confirm_deletesite' && $confirm == 'yes') {
+if ($action == 'confirm_deletesite' && $confirm == 'yes' && $permissiontodelete) {
$error = 0;
$db->begin();
@@ -1276,7 +1276,7 @@ if (!GETPOSTISSET('pageid')) {
}
// Update css Update site properties
-if ($action == 'updatecss') {
+if ($action == 'updatecss' && $usercanedit) {
// If we tried to reload another site/page, we stay on editcss mode.
if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x')) {
$action = 'editcss';
@@ -1523,7 +1523,7 @@ if ($action == 'updatecss') {
}
// Update page
-if ($action == 'setashome') {
+if ($action == 'setashome' && $usercanedit) {
$db->begin();
$object->fetch(0, $websitekey);
$website = $object;
@@ -1556,7 +1556,7 @@ if ($action == 'setashome') {
}
// Update page properties (meta)
-if ($action == 'updatemeta') {
+if ($action == 'updatemeta' && $usercanedit) {
$db->begin();
$result = $object->fetch(0, $websitekey);
@@ -1778,8 +1778,8 @@ if ($action == 'updatemeta') {
}
// Update page
-if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'confirm_createfromclone' || $action == 'confirm_createpagefromclone')
- || ($action == 'preview' && (GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview')))) {
+if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' || $action == 'confirm_createfromclone' || $action == 'confirm_createpagefromclone')
+ || ($action == 'preview' && (GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview'))))) {
$object->fetch(0, $websitekey);
$website = $object;
@@ -2041,7 +2041,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
}
// Export site
-if ($action == 'exportsite') {
+if ($action == 'exportsite' && !empty($user->rights->website->export)) {
$fileofzip = $object->exportWebSite();
if ($fileofzip) {
@@ -2060,7 +2060,7 @@ if ($action == 'exportsite') {
}
// Regenerate site
-if ($action == 'regeneratesite') {
+if ($action == 'regeneratesite' && $usercanedit) {
// Check symlink to medias and restore it if ko. Recreate also dir of website if not found.
$pathtomedias = DOL_DATA_ROOT.'/medias';
$pathtomediasinwebsite = $pathofwebsite.'/medias';
@@ -2085,7 +2085,7 @@ if ($action == 'regeneratesite') {
}
// Import site
-if ($action == 'importsiteconfirm') {
+if ($action == 'importsiteconfirm' && $usercanedit) {
if (empty($_FILES) && !GETPOSTISSET('templateuserfile')) {
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
$action = 'importsite';
@@ -2162,7 +2162,7 @@ $domainname = '0.0.0.0:8080';
$tempdir = $conf->website->dir_output.'/'.$websitekey.'/';
// Generate web site sitemaps
-if ($action == 'generatesitemaps') {
+if ($action == 'generatesitemaps' && $usercanedit) {
$domtree = new DOMDocument('1.0', 'UTF-8');
$root = $domtree->createElementNS('http://www.sitemaps.org/schemas/sitemap/0.9', 'urlset');
$domtree->formatOutput = true;
@@ -2331,6 +2331,10 @@ if (!GETPOST('hide_websitemenu')) {
if (empty($user->rights->website->write)) {
$disabled = ' disabled="disabled"';
}
+ $disabledexport = '';
+ if (empty($user->rights->website->export)) {
+ $disabledexport = ' disabled="disabled"';
+ }
if ($websitekey) {
$virtualurl = '';
@@ -2446,7 +2450,7 @@ if (!GETPOST('hide_websitemenu')) {
}
//print ''.$langs->trans("BackToModuleList").' ';
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_zapier@zapier');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'object_zapier');
// Configuration header
$head = zapierAdminPrepareHead();
-print dol_get_fiche_head($head, 'about', '', 0, 'zapier@zapier');
+print dol_get_fiche_head($head, 'about', '', 0, 'zapier');
-dol_include_once('/zapier/core/modules/modZapier.class.php');
+dol_include_once('/core/modules/modZapier.class.php');
$tmpmodule = new modZapier($db);
print $tmpmodule->getDescLong();
diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index 606da5509e3..6f9de26f97c 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -27,10 +27,10 @@ require '../../main.inc.php';
// Libraries
require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
-require_once '../lib/zapier.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/zapier/lib/zapier.lib.php';
// Translations
-$langs->loadLangs(array("admin", "zapier@zapier"));
+$langs->loadLangs(array("admin", "zapier"));
// Access control
if (!$user->admin) {
@@ -42,14 +42,18 @@ $action = GETPOST('action', 'aZ09');
$backtopage = GETPOST('backtopage', 'alpha');
$arrayofparameters = array(
- 'ZAPIERFORDOLIBARR_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
- 'ZAPIERFORDOLIBARR_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
+// 'ZAPIERFORDOLIBARR_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
+// 'ZAPIERFORDOLIBARR_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
);
+if (empty($conf->zapier->enabled)) accessforbidden();
+if (empty($user->admin)) accessforbidden();
+
/*
* Actions
*/
+
if ((float) DOL_VERSION >= 6) {
include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
}
@@ -59,20 +63,21 @@ if ((float) DOL_VERSION >= 6) {
* View
*/
-$page_name = "ZapierSetup";
-llxHeader('', $langs->trans($page_name));
+$page_name = "ZapierForDolibarrSetup";
+$help_url = 'EN:Module_Zapier';
+llxHeader('', $langs->trans($page_name), $help_url);
// Subheader
$linkback = ''.$langs->trans("BackToModuleList").' ';
-print load_fiche_titre($langs->trans($page_name), $linkback, 'object_zapier@zapier');
+print load_fiche_titre($langs->trans($page_name), $linkback, 'object_zapier');
// Configuration header
$head = zapierAdminPrepareHead();
-print dol_get_fiche_head($head, 'settings', '', -1, "zapier@zapier");
+print dol_get_fiche_head($head, 'settings', '', -1, "zapier");
// Setup page goes here
-echo $langs->trans("ZapierSetupPage").''.$langs->trans("ZapierSetupPage").' '.$langs->trans("BackToList").' ';
-
- $morehtmlref = '';
- /*
- // Ref customer
- $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
- // Thirdparty
- $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
- // Project
- if (! empty($conf->projet->enabled))
- {
- $langs->load("projects");
- $morehtmlref.='
'.$langs->trans('Project') . ' ';
- if ($user->rights->mymodule->creer)
- {
- if ($action != 'classify')
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
- } else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
- }
- } else {
- if (! empty($object->fk_project)) {
- $proj = new Project($db);
- $proj->fetch($object->fk_project);
- $morehtmlref.='
';
- $morehtmlref.=$proj->ref;
- $morehtmlref.=' ';
- } else {
- $morehtmlref.='';
- }
- }
- }*/
- $morehtmlref .= '
';
- print '
';
-
- $object->info($object->id);
- dol_print_object_info($object, 1);
-
- print '
trans("AddAnAction"),'filenew');
- //$out.=" ";
- }
-
-
- print '';
-
- if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
- $param = '&socid='.$socid;
- if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
- $param .= '&contextpage='.$contextpage;
- }
- if ($limit > 0 && $limit != $conf->liste_limit) {
- $param .= '&limit='.$limit;
- }
-
-
- print load_fiche_titre($langs->trans("ActionsOnMyObject"), '', '');
-
- // List of all actions
- $filters = array();
- $filters['search_agenda_label'] = $search_agenda_label;
-
- // TODO Replace this with same code than into list.php
- //show_actions_done($conf,$langs,$db,$object,null,0,$actioncode, '', $filters, $sortfield, $sortorder);
- }
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php
deleted file mode 100644
index f57f8873aba..00000000000
--- a/htdocs/zapier/hook_card.php
+++ /dev/null
@@ -1,406 +0,0 @@
-
- * Copyright (C) ---Put here your own copyright and developer email---
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see '.$langs->trans("BackToList").' ';
-
- $morehtmlref = '';
- /*
- // Ref bis
- $morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->mymodule->creer, 'string', '', null, null, '', 1);
- // Thirdparty
- $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
- // Project
- if (! empty($conf->projet->enabled))
- {
- $langs->load("projects");
- $morehtmlref.='
'.$langs->trans('Project') . ' ';
- if ($user->rights->mymodule->write)
- {
- if ($action != 'classify')
- $morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
- } else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
- }
- } else {
- if (! empty($object->fk_project)) {
- $proj = new Project($db);
- $proj->fetch($object->fk_project);
- $morehtmlref.=$proj->getNomUrl();
- } else {
- $morehtmlref.='';
- }
- }
- }
- */
- $morehtmlref .= '
';
- print '
';
- print '
';
- print '
'."\n";
-
- // Common attributes
- //$keyforbreak='fieldkeytoswithonsecondcolumn';
- include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
-
- // Other attributes
- include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
- print '
';
- print '
';
- print '
'."\n";
- $parameters = array();
- $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
- if ($reshook < 0) {
- setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
- }
-
- if (empty($reshook)) {
- // Modify
- if ($user->rights->mymodule->write) {
- print '
'.$langs->trans("Modify").' '."\n";
- } else {
- print '
'.$langs->trans('Modify').' '."\n";
- }
-
- // Clone
- if ($user->rights->mymodule->write) {
- print '
';
- }
-
- /*
- if ($user->rights->mymodule->write)
- {
- if ($object->status == 1)
- {
- print '
'.$langs->trans("Disable").' '."\n";
- }
- else
- {
- print '
'.$langs->trans("Enable").' '."\n";
- }
- }
- */
-
- if ($user->rights->mymodule->delete) {
- print '
'.$langs->trans('Delete').' '."\n";
- } else {
- print '
'.$langs->trans('Delete').' '."\n";
- }
- }
- print '
';
- print '
'; // ancre
-
- // Show links to link elements
- $linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject'));
- $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
-
-
- print '
';
-
- $MAXEVENT = 10;
-
- $morehtmlright = '
';
- $morehtmlright .= $langs->trans("SeeAll");
- $morehtmlright .= ' ';
-
- // List of actions on element
- include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
- $formactions = new FormActions($db);
- $somethingshown = $formactions->showactions($object, 'myobject', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
-
- print '
'.$langs->trans("BackToList").' ';
-
- dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
- print '';
-
- print '
';
- print '
';
-
- // Number of files
- print ''.$langs->trans("NbOfAttachedFiles").' '.count($filearray).' '.$langs->trans("TotalSizeOfAttachedFiles").' '.$totalsize.' '.$langs->trans("bytes").'
';
-
- print '
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see '.$langs->trans("BackToList").' ';
-
- $morehtmlref = '';
- /*
- // Ref customer
- $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
- $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
- // Thirdparty
- $morehtmlref.='
'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
- // Project
- if (! empty($conf->projet->enabled))
- {
- $langs->load("projects");
- $morehtmlref.='
'.$langs->trans('Project') . ' ';
- if ($user->rights->mymodule->creer)
- {
- if ($action != 'classify')
- //$morehtmlref.='
' . img_edit($langs->transnoentitiesnoconv('SetProject')) . ' : ';
- $morehtmlref.=' : ';
- if ($action == 'classify') {
- //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
- $morehtmlref.='
';
- } else {
- $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
- }
- } else {
- if (! empty($object->fk_project)) {
- $proj = new Project($db);
- $proj->fetch($object->fk_project);
- $morehtmlref.='
';
- $morehtmlref.=$proj->ref;
- $morehtmlref.=' ';
- } else {
- $morehtmlref.='';
- }
- }
- }*/
- $morehtmlref .= '
';
- print '
';
-
-
- $cssclass = "titlefield";
- include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
-
- print '
- * Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2015 Jean-François Ferry
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see