diff --git a/README-FR.md b/README-FR.md
index 81fdff13047..a67bf204076 100644
--- a/README-FR.md
+++ b/README-FR.md
@@ -8,12 +8,10 @@ Il est simple d'utilisation et modulaire, vous permettant de n'activez que les f
-
## LICENCE
Dolibarr est distribué sous les termes de la licence GNU General Public License v3+ ou supérieure.
-
## INSTALLER DOLIBARR
### Configuration simple
@@ -54,7 +52,6 @@ Vous pouvez aussi utiliser un serveur Web et une base de données prise en charg
- Suivez les instructions de l'installateur
-
## METTRE A JOUR DOLIBARR
Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
@@ -65,14 +62,12 @@ Pour mettre à jour Dolibarr depuis une vieille version vers celle ci:
- Au prochain accès, Dolibarr proposera la page de "mise à jour" des données (si nécessaire).
Si un fichier install.lock existe pour verrouiller le processus de mise à jour, il sera demandé de le supprimer manuellement (vous devriez trouver le fichier install.lock dans le répertoire utilisé pour stocker les documents générés ou transférés sur le serveur. Dans la plupart des cas, c'est le répertoire appelé "documents")
-*Note: Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
-
+Note: *Le processus de migration peut être lancé manuellement et plusieurs fois, sans risque, en appelant la page /install/*
## CE QUI EST NOUVEAU
See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
-
## CE QUE DOLIBARR PEUT FAIRE
### Modules principaux (tous optionnels)
@@ -122,7 +117,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Peux être multi-société par ajout du module externe multi-société.
- Plusieurs thèmes visuels.
- Application simple à utiliser.
-- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur https://wiki.dolibarr.org/index.php/Prérequis).
+- Requiert PHP et MariaDb, Mysql ou Postgresql (Voir versions exactes sur [https://wiki.dolibarr.org/index.php/Prérequis](https://wiki.dolibarr.org/index.php/Prérequis)).
- Compatible avec toutes les offres Cloud du marché respectant les prérequis de base de données et PHP.
- APIs.
- Génération PDF et ODT des éléments (factures, propositions commerciales, commandes, bons expéditions, etc...)
@@ -142,7 +137,6 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
Dolibarr peut aussi être étendu à volonté avec l'ajout de module/applications externes développées par des développeus tiers, disponible sur [DoliStore](https://www.dolistore.com).
-
## CE QUE DOLIBARR NE PEUT PAS (ENCORE) FAIRE
Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
@@ -152,18 +146,15 @@ Voici un liste de fonctionnalités pas encore gérées par Dolibarr:
- Dolibarr n'embarque pas de Webmail intégré nativement.
- Dolibarr ne fait pas le café (pas encore).
-
## DOCUMENTATION
La documentation utilisateur, développeur et traducteur est disponible sous forme de ressources de la communauté via le site [Wiki](https://wiki.dolibarr.org).
-
## CONTRIBUER
Ce projet existe grâce à ses nombreux contributeurs [[Contribuer](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)].
-
-
+[](https://github.com/Dolibarr/dolibarr/graphs/contributors)
## CREDITS
@@ -171,7 +162,6 @@ Dolibarr est le résultat du travail de nombreux contributeurs depuis des année
Voir le fichier [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT)
-
## ACTUALITES ET RESEAUX SOCIAUX
Suivez le projet Dolibarr project sur les réseaux francophones
diff --git a/README.md b/README.md
index 54fdf1e958b..b0f7a2c3761 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ You can use a web server and a supported database (MariaDB, MySQL or PostgreSQL)
On GNU/Linux, first check if your distribution has already packaged Dolibarr.
-#### Generic install steps:
+#### Generic install steps
- Check that your installed PHP version is supported [see PHP support](https://wiki.dolibarr.org/index.php/Releases).
@@ -71,86 +71,87 @@ On GNU/Linux, first check if your distribution has already packaged Dolibarr.
- Follow the installer instructions
-
### Saas/Cloud setup
-If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See https://saas.dolibarr.org). However, this third solution is not free.
-
+If you don't have time to install it yourself, you can try some commercial 'ready to use' Cloud offers (See [https://saas.dolibarr.org](https://saas.dolibarr.org)). However, this third solution is not free.
## UPGRADING
Dolibarr supports upgrading, usually without the need for any (commercial) support (depending on if you use any commercial extensions). It supports upgrading all the way from any version after 2.8 without breakage. This is unique in the ERP ecosystem and a benefit our users highly appreciate!
-
+
- At first make a backup of your Dolibarr files & then [see](https://wiki.dolibarr.org/index.php/Installation_-_Upgrade#Upgrade_Dolibarr)
- Check that your installed PHP version is supported by the new version [see PHP support](./doc/phpmatrix.md).
- Overwrite all old files from 'dolibarr' directory with files provided into the new version's package.
- At first next access, Dolibarr will redirect you to the "install/" page to follow the upgrade process.
If an `install.lock` file exists to lock any other upgrade process, the application will ask you to remove the file manually (you should find the `install.lock` file in the directory used to store generated and uploaded documents, in most cases, it is the directory called "*documents*").
-
## WHAT'S NEW
See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog) file.
-
## FEATURES
### Main application/modules (all optional)
-- Third-Parties Management: Customers, Prospects (Leads) and/or Suppliers + Contacts
-- Members/Membership/Foundation management
+- Third-Parties Management: Customers, Prospects (Leads) and/or Suppliers + Contacts
+- Members/Membership/Foundation management
- Product Management
-- Products and/or Services catalog
-- Stock / Warehouse management + Inventory
-- Barcodes
-- Batches / Lots / Serials
-- Product Variants
+ Product Management
+
+- Products and/or Services catalog
+- Stock / Warehouse management + Inventory
+- Barcodes
+- Batches / Lots / Serials
+- Product Variants
- Bill of Materials (BOM)
-- Manufacturing Orders
+- Manufacturing Orders
- Customer/Sales Management
-- Customers/Prospects + Contacts management
-- Opportunities or Leads management
-- Commercial proposals management
-- Customer Orders management
-- Contracts/Subscription management
-- Interventions management
-- Ticket System
-- Shipping management
-- Customer Invoices/Credit notes and payment management
-- Point of Sale (POS)
+ Customer/Sales Management
- Supplier/Purchase Management
-- Suppliers/Vendors + Contacts
-- Supplier (price) requests
-- Purchase Orders management
-- Delivery/Receiption
-- Supplier Invoices/credit notes and payment management
-- INCOTERMS
+- Customers/Prospects + Contacts management
+- Opportunities or Leads management
+- Commercial proposals management
+- Customer Orders management
+- Contracts/Subscription management
+- Interventions management
+- Ticket System
+- Shipping management
+- Customer Invoices/Credit notes and payment management
+- Point of Sale (POS)
- Finance / Accounting
-- Invoices / Payments
-- Bank accounts management
-- Direct debit orders management (European SEPA)
-- Accounting management
-- Donations management
-- Loan management
-- Margins
-- Reports
+ Supplier/Purchase Management
- Collaboration
-- Shared calendar/agenda (with ical and vcal export for third party tools integration)
-- Projects & Tasks management
-- Ticket System
+- Suppliers/Vendors + Contacts
+- Supplier (price) requests
+- Purchase Orders management
+- Delivery/Receiption
+- Supplier Invoices/credit notes and payment management
+- INCOTERMS
+
+ Finance / Accounting
+
+- Invoices / Payments
+- Bank accounts management
+- Direct debit orders management (European SEPA)
+- Accounting management
+- Donations management
+- Loan management
+- Margins
+- Reports
+
+ Collaboration
+
+- Shared calendar/agenda (with ical and vcal export for third party tools integration)
+- Projects & Tasks management
+- Ticket System
- Surveys
- HR
-- Employee's leave requests management
-- Expense reports
-- Recruitment management
-- Timesheets
+ HR
+- Employee's leave requests management
+- Expense reports
+- Recruitment management
+- Timesheets
### Other application/modules
@@ -171,7 +172,6 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
(around 100 modules available by default, 1000+ on the addon market place)
-
### Other general features
- Localization in most major languages
@@ -190,27 +190,24 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
- Canadian double taxes (federal/province) and other countries using cumulative VAT
- Tunisian tax stamp
- Argentina invoice numbering using A,B,C...
- - Compatible with [European directives] (https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
+ - Compatible with [European directives](https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
- Compatible with European GDPR rules
- ...
- Flexible PDF & ODT generation for invoices, proposals, orders...
- ...
-
### System Environment / Requirements
- PHP
-- MariaDB, MySQL or PostgreSQL
+- MariaDB, MySQL or PostgreSQL
- Compatible with all Cloud solutions that match PHP & MySQL or PostgreSQL prerequisites.
See exact requirements on the [Wiki](https://wiki.dolibarr.org/index.php/Prerequisite)
-
### Extending
Dolibarr can be extended with a lot of other external application or modules from third party developers available at the [DoliStore](https://www.dolistore.com).
-
## WHAT DOLIBARR CAN'T DO YET
These are features that Dolibarr does **not** yet fully support:
@@ -220,21 +217,18 @@ These are features that Dolibarr does **not** yet fully support:
- No native embedded Webmail, but you can send email to contacts in Dolibarr with e.g. offers, invoices, etc.
- Dolibarr can't do coffee (yet)
-
## DOCUMENTATION
Administrator, user, developer and translator's documentations are available along with other community resources in the [Wiki](https://wiki.dolibarr.org).
-
## CONTRIBUTING
-This project exists thanks to all the people who contribute.
+This project exists thanks to all the people who contribute.
Please read the instructions how to contribute (report a bug/error, a feature request, send code ...) [[Contribute](https://github.com/Dolibarr/dolibarr/blob/develop/.github/CONTRIBUTING.md)]
A view on Contributors:
-
-
+[](https://github.com/Dolibarr/dolibarr/graphs/contributors)
## CREDITS
@@ -242,7 +236,6 @@ Dolibarr is the work of many contributors over the years and uses some fine PHP
See [COPYRIGHT](https://github.com/Dolibarr/dolibarr/blob/develop/COPYRIGHT) file.
-
## NEWS AND SOCIAL NETWORKS
Follow Dolibarr project on:
@@ -253,8 +246,6 @@ Follow Dolibarr project on:
- [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
- [GitHub](https://github.com/Dolibarr/dolibarr)
-
### Sponsors
Support this project by becoming a sponsor. Your logo will show up here. 🙏 [[Become a sponsor/backer](https://opencollective.com/dolibarr#backer)]
-
diff --git a/SECURITY.md b/SECURITY.md
index 427b1cc7ae2..9c28e2874b9 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -12,8 +12,7 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
## Reporting a Vulnerability
-To report a vulnerability, please use GitHub security advisory at https://github.com/Dolibarr/dolibarr/security/advisories/new (if you have permissions) or alternatively send an email to security@dolibarr.org (for everybody)
-
+To report a vulnerability, please use GitHub security advisory at [https://github.com/Dolibarr/dolibarr/security/advisories/new](https://github.com/Dolibarr/dolibarr/security/advisories/new) (if you have permissions) or alternatively send an email to security@dolibarr.org (for everybody)
## Hunting vulnerabilities on Dolibarr
@@ -23,7 +22,7 @@ If you believe you've found a security bug in our service, we are happy to work
Any type of denial of service attacks is strictly forbidden, as well as any interference with network equipment and Dolibarr infrastructure.
-We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: https://www.dolibarr.org/download) to get access on every side of application.
+We recommand to install Dolibarr ERP CRM on your own server (as most Open Source software, download and use is free: [https://www.dolibarr.org/download](https://www.dolibarr.org/download)) to get access on every side of application.
### User Agent
@@ -31,8 +30,7 @@ If you try to find bug on Dolibarr, we recommend to append to your user-agent he
### Account access
-You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from https://www.dolibarr.org/download
-
+You can install the web application yourself on your own platform/server so you get full access to application and sources. Download the zip of the files to put into your own web server virtual host from [https://www.dolibarr.org/download](https://www.dolibarr.org/download)
## Eligibility and Responsible Disclosure
@@ -46,7 +44,6 @@ You must avoid tests that could cause degradation or interruption of our service
You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
-
## Scope for qualified vulnerabilities
ONLY vulnerabilities discovered, when the following setup on test platform is used, are "valid":
@@ -64,7 +61,6 @@ ONLY vulnerabilities discovered, when the following setup on test platform is us
Scope is the web application (back office) and the APIs.
-
## Qualifying vulnerabilities for reporting
* Remote code execution (RCE)
@@ -81,7 +77,6 @@ Scope is the web application (back office) and the APIs.
* Software version disclosure (for non admin users only)
* Stack traces or path disclosure (for non admin users only)
-
## Non-qualifying vulnerabilities for reporting
* "Self" XSS
@@ -99,4 +94,3 @@ Scope is the web application (back office) and the APIs.
* Software version or private IP disclosure when logged user is admin
* Stack traces or path disclosure when logged user is admin
* Any vulnerabilities due to a configuration different than the one defined into chapter "Scope for qualified vulnerabilities".
-
diff --git a/dev/initdemo/sftpget_and_loaddump.php b/dev/initdemo/sftpget_and_loaddump.php
index 7d781fe5b0c..63b5ac65054 100755
--- a/dev/initdemo/sftpget_and_loaddump.php
+++ b/dev/initdemo/sftpget_and_loaddump.php
@@ -4,7 +4,7 @@
*
* 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 2 of the License, or
+ * 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,
diff --git a/dev/initdemo/updatedemo.php b/dev/initdemo/updatedemo.php
index 4dd98451823..4ee2032c7cf 100755
--- a/dev/initdemo/updatedemo.php
+++ b/dev/initdemo/updatedemo.php
@@ -4,7 +4,7 @@
*
* 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 2 of the License, or
+ * 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,
diff --git a/dev/resources/iso-normes/14-pourquoi le format PDF A.pdf b/dev/resources/iso-normes/14-pourquoi le format PDF A.pdf
new file mode 100644
index 00000000000..0ceeb5230de
Binary files /dev/null and b/dev/resources/iso-normes/14-pourquoi le format PDF A.pdf differ
diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index 39db0a55764..840f09a0adb 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -6,7 +6,7 @@
*
* 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 2 of the License, or
+ * 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,
diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php
index 3467b648457..f0a0397cd6e 100755
--- a/dev/translation/strip_language_file.php
+++ b/dev/translation/strip_language_file.php
@@ -5,7 +5,7 @@
*
* 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 2 of the License, or
+ * 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,
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 5d78036159a..c99503f95f6 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -52,6 +52,7 @@ $list_account_main = array(
);
$list_account = array();
+
$list_account[] = '---Product---';
$list_account[] = 'ACCOUNTING_PRODUCT_SOLD_ACCOUNT';
if ($mysoc->isInEEC()) {
@@ -63,6 +64,7 @@ if ($mysoc->isInEEC()) {
$list_account[] = 'ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT';
}
$list_account[] = 'ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT';
+
$list_account[] = '---Service---';
$list_account[] = 'ACCOUNTING_SERVICE_SOLD_ACCOUNT';
if ($mysoc->isInEEC()) {
@@ -74,11 +76,11 @@ if ($mysoc->isInEEC()) {
$list_account[] = 'ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT';
}
$list_account[] = 'ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT';
+
$list_account[] = '---Others---';
$list_account[] = 'ACCOUNTING_VAT_BUY_ACCOUNT';
$list_account[] = 'ACCOUNTING_VAT_SOLD_ACCOUNT';
$list_account[] = 'ACCOUNTING_VAT_PAY_ACCOUNT';
-$list_account[] = 'ACCOUNTING_ACCOUNT_SUSPENSE';
if ($conf->banque->enabled) {
$list_account[] = 'ACCOUNTING_ACCOUNT_TRANSFER_CASH';
}
@@ -96,6 +98,7 @@ if ($conf->loan->enabled) {
if ($conf->societe->enabled) {
$list_account[] = 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT';
}
+$list_account[] = 'ACCOUNTING_ACCOUNT_SUSPENSE';
/*
* Actions
@@ -154,6 +157,7 @@ print '';
// Define main accounts for thirdparty
+print '
'; // Do not force class=right, or it align also the content of the select box
+ print '
'; // Do not force class=right, or it align also the content of the select box
print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accountsmain');
print '
';
print '';
}
+print "
\n";
+print "
\n";
+print '
';
+print '
';
+
foreach ($list_account as $key) {
$reg = array();
if (preg_match('/---(.*)---/', $key, $reg)) {
@@ -183,9 +199,32 @@ foreach ($list_account as $key) {
print '
'; // Do not force class=right, or it align also the content of the select box
+ print '
'; // Do not force class=right, or it align also the content of the select box
print $formaccounting->select_account(getDolGlobalString($key), $key, 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
print '
';
// Vat rate
- $code_vat_differ='';
- if ($product_static->tva_tx !== $facture_static_det->tva_tx && ! empty($facture_static_det->tva_tx)) { // Note: having a vat rate of 0 is often the normal case when sells is intra b2b or to export
- $code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
+ $code_vat_differ = '';
+ if ($product_static->tva_tx !== $facture_static_det->tva_tx && price2num($product_static->tva_tx) && price2num($facture_static_det->tva_tx)) { // Note: having a vat rate of 0 is often the normal case when sells is intra b2b or to export
+ $code_vat_differ = 'warning bold';
}
- print '
';
if ($product_static->id > 0) {
print $product_static->getNomUrl(1);
}
- if ($product_static->product_label) {
- print ' '.$product_static->product_label.'';
+ if ($product_static->label) {
+ print ' '.$product_static->label.'';
}
print '
';
@@ -650,11 +654,12 @@ if ($result) {
print '';
// Vat rate
- if ($objp->vat_tx_l != $objp->vat_tx_p && ! empty($objp->vat_tx_l)) { // Note: having a vat rate of 0 is often the normal case when sells is intra b2b or to export
- $code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
+ $code_vat_differ = '';
+ if ($objp->vat_tx_l != $objp->vat_tx_p && price2num($objp->vat_tx_p) && price2num($objp->vat_tx_l)) { // Note: having a vat rate of 0 is often the normal case when sells is intra b2b or to export
+ $code_vat_differ = 'warning bold';
}
- print '
';
+
// Other attributes
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 537e28f19a6..a0d542bd79e 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -14,6 +14,7 @@
* Copyright (C) 2019 Nicolas ZABOURI
* Copyright (C) 2020 Josep Lluís Amador
* Copyright (C) 2021 Waël Almoman
+ * Copyright (C) 2021 Philippe Grand
*
* 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
@@ -1520,7 +1521,7 @@ class Adherent extends CommonObject
{
global $langs;
- require_once DOL_DOCUMENT_ROOT.'/parntership/class/partnership.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
$this->partnerships[] = array();
@@ -2703,7 +2704,7 @@ class Adherent extends CommonObject
$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass; // this->pass = mot de passe non crypte
}
if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) {
- $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 4); // Create OpenLDAP MD5 password (TODO add type of encryption)
+ $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
}
} elseif ($conf->global->LDAP_SERVER_PROTOCOLVERSION !== '3') {
// Set LDAP password if possible
@@ -2714,7 +2715,7 @@ class Adherent extends CommonObject
if ($this->pass_indatabase_crypted && !empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) {
// Create OpenLDAP MD5 password from Dolibarr MD5 password
// Note: This suppose that "pass_indatabase_crypted" is a md5 (guaranted by the previous test if "(empty($conf->global->MAIN_SECURITY_HASH_ALGO))"
- $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = '{md5}'.base64_encode(hex2bin($this->pass_indatabase_crypted));
+ $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dolGetLdapPasswordHash($this->pass_indatabase_crypted, 'md5frommd5');
}
}
} elseif (!empty($this->pass_indatabase)) {
@@ -2723,7 +2724,7 @@ class Adherent extends CommonObject
$info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD] = $this->pass_indatabase; // $this->pass_indatabase = mot de passe non crypte
}
if (!empty($conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED)) {
- $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 4); // md5 for OpenLdap TODO add type of encryption
+ $info[$conf->global->LDAP_MEMBER_FIELD_PASSWORD_CRYPTED] = dol_hash($this->pass_indatabase, 'openldap'); // Create OpenLDAP password (see LDAP_PASSWORD_HASH_TYPE)
}
}
}
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 90b34e604be..cdf021cfa68 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -90,7 +90,7 @@ class AdherentType extends CommonObject
public $subscription;
/**
- * @var float amount for subscription
+ * @var float|string Amount for subscription (null or '' means not defined)
*/
public $amount;
diff --git a/htdocs/adherents/ldap.php b/htdocs/adherents/ldap.php
index 983e6d9aada..db87e514cb5 100644
--- a/htdocs/adherents/ldap.php
+++ b/htdocs/adherents/ldap.php
@@ -1,6 +1,6 @@
- * Copyright (C) 2006-2017 Regis Houssin
+ * Copyright (C) 2006-2021 Regis Houssin
*
* 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
@@ -50,14 +50,14 @@ if ($id > 0 || !empty($ref)) {
$result = $object->fetch($id, $ref);
// Define variables to know what current user can do on users
- $canadduser = ($user->admin || $user->rights->user->user->creer);
+ $canadduser = (!empty($user->admin) || !empty($user->rights->user->user->creer));
// Define variables to know what current user can do on properties of user linked to edited member
if ($object->user_id) {
// $User is the user who edits, $object->user_id is the id of the related user in the edited member
- $caneditfielduser = ((($user->id == $object->user_id) && $user->rights->user->self->creer)
- || (($user->id != $object->user_id) && $user->rights->user->user->creer));
+ $caneditfielduser = ((($user->id == $object->user_id) && !empty($user->rights->user->self->creer))
+ || (($user->id != $object->user_id) && !empty($user->rights->user->user->creer)));
$caneditpassworduser = ((($user->id == $object->user_id) && $user->rights->user->self->password)
- || (($user->id != $object->user_id) && $user->rights->user->user->password));
+ || (($user->id != $object->user_id) && !empty($user->rights->user->user->password)));
}
}
@@ -135,17 +135,17 @@ $adht->fetch($object->typeid);
print '
\n";
print $langs->trans('BarcodeDesc'.$obj->encoding);
//print "L'EAN se compose de 8 caracteres, 7 chiffres plus une cle de controle. ";
@@ -270,6 +337,7 @@ if ($resql) {
}
}
print "
';
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index be3ab2d63c1..dca93b9a506 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -583,6 +583,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
$arrayoftypes = array(
'loadthirdparty'=>$langs->trans('LoadThirdPartyFromName', $langs->transnoentities("ThirdPartyName")),
'loadandcreatethirdparty'=>$langs->trans('LoadThirdPartyFromNameOrCreate', $langs->transnoentities("ThirdPartyName")),
+ 'recordjoinpiece'=>$langs->trans('recordjoinpieceonobject'),
'recordevent'=>'RecordEvent');
if ($conf->projet->enabled) {
$arrayoftypes['project'] = 'CreateLeadAndThirdParty';
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index d32ef64aebc..900754ef4b4 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -5,7 +5,7 @@
*
* 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 2 of the License, or
+ * 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,
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index bddaf58475a..77fb8f24f82 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -6,7 +6,7 @@
*
* 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 2 of the License, or
+ * 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,
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index 8eb2f93c13c..c006688fca1 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -79,10 +79,12 @@ if ($action == 'update') {
if (!empty($max_rank)) {
$static_skill = new Skill($db);
$TAllSkills = $static_skill->fetchAll();
- foreach ($TAllSkills as &$skill) {
- if (empty($skill->lines)) $skill->fetchLines();
- if (count($skill->lines) < $conf->global->HRM_MAXRANK) {
- $skill->createSkills(count($skill->lines) + 1);
+ if (is_array($TAllSkills)) {
+ foreach ($TAllSkills as &$skill) {
+ if (empty($skill->lines)) $skill->fetchLines();
+ if (count($skill->lines) < $conf->global->HRM_MAXRANK) {
+ $skill->createSkills(count($skill->lines) + 1);
+ }
}
}
}
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index 4010d724c1a..e122bdf5930 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville
* Copyright (C) 2004 Sebastien Di Cintio
* Copyright (C) 2004 Benoit Mortier
- * Copyright (C) 2005-2017 Regis Houssin
+ * Copyright (C) 2005-2021 Regis Houssin
* Copyright (C) 2006-2020 Laurent Destailleur
* Copyright (C) 2011-2013 Juanjo Menent
*
@@ -29,10 +29,11 @@
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formldap.class.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/ldap.lib.php';
// Load translation files required by the page
-$langs->load("admin");
+$langs->loadLangs(array("admin", "ldap"));
if (!$user->admin) {
accessforbidden();
@@ -99,6 +100,9 @@ if (empty($reshook)) {
if (!dolibarr_set_const($db, 'LDAP_MEMBER_TYPE_ACTIVE', GETPOST("activememberstypes", 'aZ09'), 'chaine', 0, '', $conf->entity)) {
$error++;
}
+ if (!dolibarr_set_const($db, 'LDAP_PASSWORD_HASH_TYPE', GETPOST("LDAP_PASSWORD_HASH_TYPE", 'aZ09'), 'chaine', 0, '', $conf->entity)) {
+ $error++;
+ }
if (!$error) {
$db->commit();
@@ -129,7 +133,7 @@ if (!function_exists("ldap_connect")) {
$form = new Form($db);
-
+$formldap = new FormLdap($db);
print '
';
@@ -5450,14 +5449,17 @@ if ($action == 'create') {
}
// Classify paid
- if (($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercanissuepayment && (($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0)))
- || ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 0 && $object->total_ttc > 0 && $resteapayer == 0 && $usercanissuepayment && empty($discount->id))
+ if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercanissuepayment && (
+ ($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && ($resteapayer <= 0 || (!empty($conf->global->INVOICE_CAN_ADD_PAYMENT_EVEN_IF_ALREADY_PAID) && $object->total_ttc == $resteapayer))) ||
+ ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0) ||
+ ($object->type == Facture::TYPE_DEPOSIT && $object->total_ttc > 0 && ($resteapayer == 0 || (!empty($conf->global->INVOICE_CAN_ADD_PAYMENT_EVEN_IF_ALREADY_PAID) && $object->total_ttc == $resteapayer)))
+ )
) {
print ''.$langs->trans('ClassifyPaid').'';
}
// Classify 'closed not completely paid' (possible if validated and not yet filed paid)
- if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && $usercanissuepayment) {
+ if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && (empty($conf->global->INVOICE_CAN_ADD_PAYMENT_EVEN_IF_ALREADY_PAID) || $resteapayer != $object->total_ttc) && $usercanissuepayment) {
if ($totalpaye > 0 || $totalcreditnotes > 0) {
// If one payment or one credit note was linked to this invoice
print ''.$langs->trans('ClassifyPaidPartially').'';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 04c1383c4a5..649b7b0c093 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1058,7 +1058,7 @@ class Facture extends CommonInvoice
{
global $conf;
- // Charge facture source
+ // Source invoice load
$facture = new Facture($this->db);
// Retrieve all extrafield
@@ -2405,7 +2405,7 @@ class Facture extends CommonInvoice
/**
* Tag the invoice as paid completely (if close_code is filled) => this->fk_statut=2, this->paye=1
- * or partialy (if close_code filled) + appel trigger BILL_PAYED => this->fk_statut=2, this->paye stay 0
+ * or partially (if close_code filled) + appel trigger BILL_PAYED => this->fk_statut=2, this->paye stay 0
*
* @param User $user Object user that modify
* @param string $close_code Code renseigne si on classe a payee completement alors que paiement incomplet (cas escompte par exemple)
@@ -2421,7 +2421,7 @@ class Facture extends CommonInvoice
$now = dol_now();
- dol_syslog(get_class($this)."::set_paid rowid=".((int) $this->id), LOG_DEBUG);
+ dol_syslog(get_class($this)."::setPaid rowid=".((int) $this->id), LOG_DEBUG);
$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
$sql .= ' fk_statut='.self::STATUS_CLOSED;
@@ -2502,7 +2502,7 @@ class Facture extends CommonInvoice
$sql .= ' fk_user_closing=null';
$sql .= " WHERE rowid = ".((int) $this->id);
- dol_syslog(get_class($this)."::set_unpaid", LOG_DEBUG);
+ dol_syslog(get_class($this)."::setUnpaid", LOG_DEBUG);
$resql = $this->db->query($sql);
if ($resql) {
// Call trigger
@@ -2728,7 +2728,7 @@ class Facture extends CommonInvoice
$error++;
}
- // On verifie si la facture etait une provisoire
+ // We check if the invoice was provisional
if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref))) {
// La verif qu'une remise n'est pas utilisee 2 fois est faite au moment de l'insertion de ligne
}
@@ -2737,7 +2737,7 @@ class Facture extends CommonInvoice
// Define third party as a customer
$result = $this->thirdparty->set_as_client();
- // Si active on decremente le produit principal et ses composants a la validation de facture
+ // If active we decrement the main product and its components at invoice validation
if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse > 0) {
require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
$langs->load("agenda");
@@ -3299,8 +3299,8 @@ class Facture extends CommonInvoice
$this->line->desc = $desc;
$this->line->ref_ext = $ref_ext;
- $this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ?abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
- $this->line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ?-abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
+ $this->line->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs($qty) : $qty); // For credit note, quantity is always positive and unit price negative
+ $this->line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
$this->line->vat_src_code = $vat_src_code;
$this->line->tva_tx = $txtva;
@@ -3309,11 +3309,11 @@ class Facture extends CommonInvoice
$this->line->localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
$this->line->localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
- $this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
- $this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
- $this->line->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_tva) : $total_tva); // For credit note and if qty is negative, total is negative
- $this->line->total_localtax1 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_localtax1) : $total_localtax1); // For credit note and if qty is negative, total is negative
- $this->line->total_localtax2 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ?-abs($total_localtax2) : $total_localtax2); // For credit note and if qty is negative, total is negative
+ $this->line->total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ht) : $total_ht); // For credit note and if qty is negative, total is negative
+ $this->line->total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_ttc) : $total_ttc); // For credit note and if qty is negative, total is negative
+ $this->line->total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_tva) : $total_tva); // For credit note and if qty is negative, total is negative
+ $this->line->total_localtax1 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_localtax1) : $total_localtax1); // For credit note and if qty is negative, total is negative
+ $this->line->total_localtax2 = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($total_localtax2) : $total_localtax2); // For credit note and if qty is negative, total is negative
$this->line->fk_product = $fk_product;
$this->line->product_type = $product_type;
@@ -3340,10 +3340,11 @@ class Facture extends CommonInvoice
// Multicurrency
$this->line->fk_multicurrency = $this->fk_multicurrency;
$this->line->multicurrency_code = $this->multicurrency_code;
- $this->line->multicurrency_subprice = $pu_ht_devise;
- $this->line->multicurrency_total_ht = $multicurrency_total_ht;
- $this->line->multicurrency_total_tva = $multicurrency_total_tva;
- $this->line->multicurrency_total_ttc = $multicurrency_total_ttc;
+ $this->line->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise
+
+ $this->line->multicurrency_total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative
+ $this->line->multicurrency_total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_tva) : $multicurrency_total_tva); // For credit note and if qty is negative, total is negative
+ $this->line->multicurrency_total_ttc = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ttc) : $multicurrency_total_ttc); // For credit note and if qty is negative, total is negative
if (is_array($array_options) && count($array_options) > 0) {
$this->line->array_options = $array_options;
@@ -4782,7 +4783,7 @@ class Facture extends CommonInvoice
// TODO : add a flag on invoices to store this conf : INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION
- // note : we dont need to test INVOICE_USE_RETAINED_WARRANTY because if $this->retained_warranty is not empty it's because it was set when this conf was active
+ // note : we don't need to test INVOICE_USE_RETAINED_WARRANTY because if $this->retained_warranty is not empty it's because it was set when this conf was active
$displayWarranty = false;
if (!empty($this->retained_warranty)) {
@@ -4981,7 +4982,7 @@ class Facture extends CommonInvoice
$this->db->begin();
- //Select all action comm reminder
+ // Select all action comm reminder
$sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."facture as f";
if (!empty($paymentmode) && $paymentmode != 'all') {
$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
@@ -5381,7 +5382,7 @@ class FactureLigne extends CommonInvoiceLine
$this->db->begin();
- // Insertion dans base de la ligne
+ // Update line in database
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facturedet';
$sql .= ' (fk_facture, fk_parent_line, label, description, qty,';
$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
@@ -5449,8 +5450,8 @@ class FactureLigne extends CommonInvoiceLine
}
}
- // Si fk_remise_except defini, on lie la remise a la facture
- // ce qui la flague comme "consommee".
+ // If fk_remise_except is defined, the discount is linked to the invoice
+ // which flags it as "consumed".
if ($this->fk_remise_except) {
$discount = new DiscountAbsolute($this->db);
$result = $discount->fetch($this->fk_remise_except);
@@ -5739,7 +5740,7 @@ class FactureLigne extends CommonInvoiceLine
$this->total_localtax2 = 0;
}
- // Mise a jour ligne en base
+ // Update line in database
$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
$sql .= " total_ht=".price2num($this->total_ht)."";
$sql .= ",total_tva=".price2num($this->total_tva)."";
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 230999f18fe..6354c0bf5fd 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -102,10 +102,8 @@ if ($action == 'addcontact' && $user->rights->facture->creer) {
if (empty($object->id)) {
llxHeader();
- $head = facture_prepare_head($object);
$langs->load('errors');
- echo dol_get_fiche_head($head, 'contact', $langs->trans("InvoiceCustomer"), -1, 'bill'),
- '
';
} else {
- dol_print_error($db);
-}
+ // Menu with list of bookmarks
+ $sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
+ $sql .= " WHERE (fk_user = ".((int) $user->id)." OR fk_user is NULL OR fk_user = 0)";
+ $sql .= " AND entity IN (".getEntity('bookmarks').")";
+ $sql .= " ORDER BY position";
+ if ($resql = $db->query($sql)) {
+ $bookmarkList = '
';
}
}
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 99ee1b6af9b..ebe28237cc4 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -542,7 +542,6 @@ class FormOther
$resql_usr = $this->db->query($sql_usr);
if ($resql_usr) {
$userstatic = new User($this->db);
- $showstatus = 1;
while ($obj_usr = $this->db->fetch_object($resql_usr)) {
$userstatic->id = $obj_usr->rowid;
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 34ea7b0a2e8..022bf55f243 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -514,7 +514,17 @@ class FormProjets
}
$linkedtothirdparty = false;
- if (!in_array($table_element, array('don', 'expensereport_det', 'expensereport', 'loan', 'stock_mouvement', 'payment_salary', 'payment_various', 'chargesociales', 'entrepot'))) {
+ if (!in_array($table_element, array(
+ 'don',
+ 'expensereport_det',
+ 'expensereport', 'loan',
+ 'stock_mouvement',
+ 'payment_salary',
+ 'payment_various',
+ 'salary',
+ 'chargesociales',
+ 'entrepot')
+ )) {
$linkedtothirdparty = true;
}
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index b78ff5cfa8e..2773ece2569 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -104,6 +104,7 @@ class FormPropal
print '';
}
+ $i = 0;
foreach ($listofstatus as $key => $obj) {
if ($excludedraft) {
if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT') {
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
new file mode 100644
index 00000000000..6f2ec2acfb6
--- /dev/null
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -0,0 +1,926 @@
+
+ *
+ * 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 .
+ */
+
+
+/**
+ * This class help you create setup render
+ */
+class FormSetup
+{
+
+ /**
+ * @var DoliDB Database handler.
+ */
+ public $db;
+
+ /** @var FormSetupItem[] */
+ public $items = array();
+
+ /**
+ * @var int
+ */
+ public $setupNotEmpty = 0;
+
+ /** @var Translate */
+ public $langs;
+
+ /** @var Form */
+ public $form;
+
+ /** @var int */
+ protected $maxItemRank;
+
+ /**
+ * Constructor
+ *
+ * @param DoliDB $db Database handler
+ * @param Translate $outputLangs if needed can use another lang
+ */
+ public function __construct($db, $outputLangs = false)
+ {
+ global $langs;
+ $this->db = $db;
+ $this->form = new Form($this->db);
+
+ if ($outputLangs) {
+ $this->langs = $outputLangs;
+ } else {
+ $this->langs = $langs;
+ }
+ }
+
+ /**
+ * @param bool $editMode true will display output on edit mod
+ * @return string
+ */
+ public function generateOutput($editMode = false)
+ {
+ global $hookmanager, $action;
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+
+ $parameters = array(
+ 'editMode' => $editMode
+ );
+ $reshook = $hookmanager->executeHooks('formSetupBeforeGenerateOutput', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook < 0) {
+ setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+ }
+
+ if ($reshook > 0) {
+ return $hookmanager->resPrint;
+ } else {
+ $out = '';
+ if ($editMode) {
+ $out .= '';
+ }
+
+ $out .= '
';
+
+ if ($editMode) {
+ $out.= $item->generateInputField();
+ } else {
+ $out.= $item->generateOutputField();
+ }
+
+ if (!empty($item->errors)) {
+ // TODO : move set event message in a methode to be called by cards not by this class
+ setEventMessages(null, $item->errors, 'errors');
+ }
+
+ $out.= '
';
+ $out.= '
';
+ }
+
+ return $out;
+ }
+
+
+ /**
+ * @param array $params an array of arrays of params from old modulBuilder params
+ * @deprecated was used to test module builder convertion to this form usage
+ * @return null
+ */
+ public function addItemsFromParamsArray($params)
+ {
+ if (!array($params)) { return false; }
+ foreach ($params as $confKey => $param) {
+ $this->addItemFromParams($confKey, $param); // todo manage error
+ }
+ }
+
+
+ /**
+ * From old
+ * @param string $confKey the conf name to store
+ * @param array $params an array of params from old modulBuilder params
+ * @deprecated was used to test module builder convertion to this form usage
+ * @return bool
+ */
+ public function addItemFromParams($confKey, $params)
+ {
+ if (empty($confKey) || empty($params['type'])) { return false; }
+
+ /*
+ * Exemple from old module builder setup page
+ * // 'MYMODULE_MYPARAM1'=>array('type'=>'string', 'css'=>'minwidth500' ,'enabled'=>1),
+ // 'MYMODULE_MYPARAM2'=>array('type'=>'textarea','enabled'=>1),
+ //'MYMODULE_MYPARAM3'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
+ //'MYMODULE_MYPARAM4'=>array('type'=>'emailtemplate:thirdparty', 'enabled'=>1),
+ //'MYMODULE_MYPARAM5'=>array('type'=>'yesno', 'enabled'=>1),
+ //'MYMODULE_MYPARAM5'=>array('type'=>'thirdparty_type', 'enabled'=>1),
+ //'MYMODULE_MYPARAM6'=>array('type'=>'securekey', 'enabled'=>1),
+ //'MYMODULE_MYPARAM7'=>array('type'=>'product', 'enabled'=>1),
+ */
+
+ $item = new FormSetupItem($confKey);
+ $item->setTypeFromTypeString($params['type']);
+
+ if (!empty($params['enabled'])) {
+ $item->enabled = $params['enabled'];
+ }
+
+ if (!empty($params['css'])) {
+ $item->cssClass = $params['css'];
+ }
+
+ $this->items[$item->confKey] = $item;
+
+ return true;
+ }
+
+ /**
+ * used to export param array for /core/actions_setmoduleoptions.inc.php template
+ * @return array $arrayofparameters for /core/actions_setmoduleoptions.inc.php
+ * @deprecated yes this method came deprecated because it exists only for manage setup convertion
+ */
+ public function exportItemsAsParamsArray()
+ {
+ $arrayofparameters = array();
+ foreach ($this->items as $key => $item) {
+ $arrayofparameters[$item->confKey] = array(
+ 'type' => $item->getType(),
+ 'enabled' => $item->enabled
+ );
+ }
+
+ return $arrayofparameters;
+ }
+
+ /**
+ * Reload for each item default conf
+ * note: this will override custom configuration
+ * @return bool
+ */
+ public function reloadConfs()
+ {
+
+ if (!array($this->items)) { return false; }
+ foreach ($this->items as $item) {
+ $item->reloadValueFromConf();
+ }
+
+ return true;
+ }
+
+
+ /**
+ * Create a new item
+ * the tagret is useful with hooks : that allow externals modules to add setup items on good place
+ * @param $confKey the conf key used in database
+ * @param string $targetItemKey target item used to place the new item beside
+ * @param bool $insertAfterTarget insert before or after target item ?
+ * @return FormSetupItem the new setup item created
+ */
+ public function newItem($confKey, $targetItemKey = false, $insertAfterTarget = false)
+ {
+ $item = new FormSetupItem($confKey);
+
+ // set item rank if not defined as last item
+ if (empty($item->rank)) {
+ $item->rank = $this->getCurentItemMaxRank() + 1;
+ $this->setItemMaxRank($item->rank); // set new max rank if needed
+ }
+
+ // try to get rank from target column, this will override item->rank
+ if (!empty($targetItemKey)) {
+ if (isset($this->items[$targetItemKey])) {
+ $targetItem = $this->items[$targetItemKey];
+ $item->rank = $targetItem->rank; // $targetItem->rank will be increase after
+ if ($targetItem->rank >= 0 && $insertAfterTarget) {
+ $item->rank++;
+ }
+ }
+
+ // calc new rank for each item to make place for new item
+ foreach ($this->items as $fItem) {
+ if ($item->rank <= $fItem->rank) {
+ $fItem->rank = $fItem->rank + 1;
+ $this->setItemMaxRank($fItem->rank); // set new max rank if needed
+ }
+ }
+ }
+
+ $this->items[$item->confKey] = $item;
+ return $this->items[$item->confKey];
+ }
+
+ /**
+ * Sort items according to rank
+ * @return bool
+ */
+ public function sortingItems()
+ {
+ // Sorting
+ return uasort($this->items, array($this, 'itemSort'));
+ }
+
+ /**
+ * @param bool $cache To use cache or not
+ * @return int
+ */
+ public function getCurentItemMaxRank($cache = true)
+ {
+ if (empty($this->items)) {
+ return 0;
+ }
+
+ if ($cache && $this->maxItemRank > 0) {
+ return $this->maxItemRank;
+ }
+
+ $this->maxItemRank = 0;
+ foreach ($this->items as $item) {
+ $this->maxItemRank = max($this->maxItemRank, $item->rank);
+ }
+
+ return $this->maxItemRank;
+ }
+
+
+ /**
+ * set new max rank if needed
+ * @param int $rank the item rank
+ * @return int|void
+ */
+ public function setItemMaxRank($rank)
+ {
+ $this->maxItemRank = max($this->maxItemRank, $rank);
+ }
+
+
+ /**
+ * get item position rank from item key
+ *
+ * @param string $itemKey the item key
+ * @return int rank on success and -1 on error
+ */
+ public function getLineRank($itemKey)
+ {
+ if (!isset($this->items[$itemKey]->rank)) {
+ return -1;
+ }
+ return $this->items[$itemKey]->rank;
+ }
+
+
+ /**
+ * uasort callback function to Sort params items
+ *
+ * @param FormSetupItem $a formSetup item
+ * @param FormSetupItem $b formSetup item
+ * @return int Return compare result
+ */
+ public function itemSort(FormSetupItem $a, FormSetupItem $b)
+ {
+ if (empty($a->rank)) {
+ $a->rank = 0;
+ }
+ if (empty($b->rank)) {
+ $b->rank = 0;
+ }
+ if ($a->rank == $b->rank) {
+ return 0;
+ }
+ return ($a->rank < $b->rank) ? -1 : 1;
+ }
+}
+
+/**
+ * This class help to create item for class formSetup
+ */
+class FormSetupItem
+{
+ /**
+ * @var DoliDB Database handler.
+ */
+ public $db;
+
+ /** @var Translate */
+ public $langs;
+
+ /** @var int */
+ public $entity;
+
+ /** @var Form */
+ public $form;
+
+ /** @var string $confKey the conf key used in database */
+ public $confKey;
+
+ /** @var string|false $nameText */
+ public $nameText = false;
+
+ /** @var string $helpText */
+ public $helpText = '';
+
+ /** @var string $value */
+ public $fieldValue;
+
+ /** @var bool|string set this var to override field output will override $fieldInputOverride and $fieldOutputOverride too */
+ public $fieldOverride = false;
+
+ /** @var bool|string set this var to override field output */
+ public $fieldInputOverride = false;
+
+ /** @var bool|string set this var to override field output */
+ public $fieldOutputOverride = false;
+
+ /** @var int $rank */
+ public $rank = 0;
+
+ /**
+ * @var string $errors
+ */
+ public $errors = array();
+
+ /**
+ * TODO each type must have setAs{type} method to help configuration
+ * And set var as protected when its done configuration must be done by method
+ * @var string $type 'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type'
+ */
+ protected $type = 'string';
+
+ public $enabled = 1;
+
+ public $cssClass = '';
+
+ /**
+ * Constructor
+ *
+ * @param $confKey the conf key used in database
+ */
+ public function __construct($confKey)
+ {
+ global $langs, $db, $conf;
+ $this->db = $db;
+ $this->form = new Form($this->db);
+ $this->langs = $langs;
+ $this->entity = $conf->entity;
+
+ $this->confKey = $confKey;
+ $this->fieldValue = $conf->global->{$this->confKey};
+ }
+
+ /**
+ * reload conf value from databases
+ * @return null
+ */
+ public function reloadValueFromConf()
+ {
+ global $conf;
+ $this->fieldValue = $conf->global->{$this->confKey};
+ }
+
+
+ /**
+ * Save const value based on htdocs/core/actions_setmoduleoptions.inc.php
+ * @return int -1 if KO, 1 if OK
+ */
+ public function saveConfValue()
+ {
+ // Modify constant only if key was posted (avoid resetting key to the null value)
+ if ($this->type != 'title') {
+ $result = dolibarr_set_const($this->db, $this->confKey, $this->fieldValue, 'chaine', 0, '', $this->entity);
+ if ($result < 0) {
+ return -1;
+ } else {
+ return 1;
+ }
+ }
+ }
+
+
+ /**
+ * Save const value based on htdocs/core/actions_setmoduleoptions.inc.php
+ * @return int -1 if KO, 0 nothing to do , 1 if OK
+ */
+ public function setValueFromPost()
+ {
+ // Modify constant only if key was posted (avoid resetting key to the null value)
+ if ($this->type != 'title') {
+ if (preg_match('/category:/', $this->type)) {
+ if (GETPOST($this->confKey, 'int') == '-1') {
+ $val_const = '';
+ } else {
+ $val_const = GETPOST($this->confKey, 'int');
+ }
+ } else {
+ $val_const = GETPOST($this->confKey, 'alpha');
+ }
+
+ // TODO add value check with class validate
+ $this->fieldValue = $val_const;
+
+ return 1;
+ }
+
+ return 0;
+ }
+
+ /**
+ * Get help text or generate it
+ * @return int|string
+ */
+ public function getHelpText()
+ {
+ if (!empty($this->helpText)) { return $this->helpText; }
+ return (($this->langs->trans($this->confKey . 'Tooltip') != $this->confKey . 'Tooltip') ? $this->langs->trans($this->confKey . 'Tooltip') : '');
+ }
+
+ /**
+ * Get field name text or generate it
+ * @return false|int|string
+ */
+ public function getNameText()
+ {
+ if (!empty($this->nameText)) { return $this->nameText; }
+ return (($this->langs->trans($this->confKey) != $this->confKey) ? $this->langs->trans($this->confKey) : $this->langs->trans('MissingTranslationForConfKey', $this->confKey));
+ }
+
+ /**
+ * generate input field
+ * @return bool|string
+ */
+ public function generateInputField()
+ {
+ global $conf, $user;
+
+ if (!empty($this->fieldOverride)) {
+ return $this->fieldOverride;
+ }
+
+ if (!empty($this->fieldInputOverride)) {
+ return $this->fieldInputOverride;
+ }
+
+ $out = '';
+
+ if ($this->type == 'title') {
+ $out.= $this->generateOutputField(); // title have no input
+ } elseif ($this->type == 'textarea') {
+ $out.= $this->generateInputFieldTextarea();
+ } elseif ($this->type== 'html') {
+ $out.= $this->generateInputFieldHtml();
+ } elseif ($this->type == 'yesno') {
+ $out.= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
+ } elseif (preg_match('/emailtemplate:/', $this->type)) {
+ $out.= $this->generateInputFieldEmailTemplate();
+ } elseif (preg_match('/category:/', $this->type)) {
+ $out.=$this->generateInputFieldCategories();
+ } elseif (preg_match('/thirdparty_type/', $this->type)) {
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+ $formcompany = new FormCompany($this->db);
+ $out.= $formcompany->selectProspectCustomerType($this->fieldValue, $this->confKey);
+ } elseif ($this->type == 'securekey') {
+ $out.= $this->generateInputFieldSecureKey();
+ } elseif ($this->type == 'product') {
+ if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+ $selected = (empty($this->fieldValue) ? '' : $this->fieldValue);
+ $out.= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
+ }
+ } else {
+ $out.= '';
+ }
+
+ return $out;
+ }
+
+ /**
+ * generate input field for textarea
+ * @return string
+ */
+ public function generateInputFieldTextarea()
+ {
+ $out = '\n";
+ return $out;
+ }
+
+ /**
+ * generate input field for html
+ * @return string
+ */
+ public function generateInputFieldHtml()
+ {
+ global $conf;
+ require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+ $doleditor = new DolEditor($this->confKey, $this->fieldValue, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+ return $doleditor->Create(1);
+ }
+
+ /**
+ * generate input field for categories
+ * @return string
+ */
+ public function generateInputFieldCategories()
+ {
+ global $conf;
+ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+ $formother = new FormOther($this->db);
+
+ $tmp = explode(':', $this->type);
+ $out= img_picto('', 'category', 'class="pictofixedwidth"');
+ $out.= $formother->select_categories($tmp[1], $this->fieldValue, $this->confKey, 0, $this->langs->trans('CustomersProspectsCategoriesShort'));
+ return $out;
+ }
+
+ /**
+ * generate input field for email template selector
+ * @return string
+ */
+ public function generateInputFieldEmailTemplate()
+ {
+ global $conf, $user;
+ $out = '';
+ if (preg_match('/emailtemplate:/', $this->type)) {
+ include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+ $formmail = new FormMail($this->db);
+
+ $tmp = explode(':', $this->type);
+ $nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, 1); // We set lang=null to get in priority record with no lang
+ $arrayOfMessageName = array();
+ if (is_array($formmail->lines_model)) {
+ foreach ($formmail->lines_model as $modelMail) {
+ $moreonlabel = '';
+ if (!empty($arrayOfMessageName[$modelMail->label])) {
+ $moreonlabel = ' (' . $this->langs->trans("SeveralLangugeVariatFound") . ')';
+ }
+ // The 'label' is the key that is unique if we exclude the language
+ $arrayOfMessageName[$modelMail->id] = $this->langs->trans(preg_replace('/\(|\)/', '', $modelMail->label)) . $moreonlabel;
+ }
+ }
+ $out .= $this->form->selectarray($this->confKey, $arrayOfMessageName, $this->fieldValue, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+ }
+
+ return $out;
+ }
+
+
+ /**
+ * generate input field for secure key
+ * @return string
+ */
+ public function generateInputFieldSecureKey()
+ {
+ global $conf;
+ $out = '';
+ if (!empty($conf->use_javascript_ajax)) {
+ $out.= ' '.img_picto($this->langs->trans('Generate'), 'refresh', 'id="generate_token'.$this->confKey.'" class="linkobject"');
+ }
+ if (!empty($conf->use_javascript_ajax)) {
+ $out .= "\n" . '';
+ }
+ return $out;
+ }
+
+ /**
+ * get the type : used for old module builder setup conf style conversion and tests
+ * because this two class will quickly evolve it's important to not set or get directly $this->type (will be protected) so this method exist
+ * to be sure we can manage evolution easily
+ *
+ * @return string
+ */
+ public function getType()
+ {
+ return $this->type;
+ }
+
+ /**
+ * set the type from string : used for old module builder setup conf style conversion and tests
+ * because this two class will quickly evolve it's important to not set directly $this->type (will be protected) so this method exist
+ * to be sure we can manage evolution easily
+ * @param string $type possible values based on old module builder setup : 'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type'
+ * @deprecated yes this setTypeFromTypeString came deprecated because it exists only for manage setup convertion
+ * @return bool
+ */
+ public function setTypeFromTypeString($type)
+ {
+ $this->type = $type;
+ return true;
+ }
+
+ /**
+ * Add error
+ * @param array|string $errors the error text
+ * @return null
+ */
+ public function setErrors($errors)
+ {
+ if (is_array($errors)) {
+ if (!empty($errors)) {
+ foreach ($errors as $error) {
+ $this->setErrors($error);
+ }
+ }
+ } elseif (!empty($errors)) {
+ $this->errors[] = $errors;
+ }
+ }
+
+ /**
+ * @return bool|string Generate the output html for this item
+ */
+ public function generateOutputField()
+ {
+ global $conf, $user;
+
+ if (!empty($this->fieldOverride)) {
+ return $this->fieldOverride;
+ }
+
+ if (!empty($this->fieldOutputOverride)) {
+ return $this->fieldOutputOverride;
+ }
+
+ $out = '';
+
+ if ($this->type == 'title') {
+ // nothing to do
+ } elseif ($this->type == 'textarea') {
+ $out.= dol_nl2br($this->fieldValue);
+ } elseif ($this->type== 'html') {
+ $out.= $this->fieldValue;
+ } elseif ($this->type == 'yesno') {
+ $out.= ajax_constantonoff($this->confKey);
+ } elseif (preg_match('/emailtemplate:/', $this->type)) {
+ include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+ $formmail = new FormMail($this->db);
+
+ $tmp = explode(':', $this->type);
+
+ $template = $formmail->getEMailTemplate($this->db, $tmp[1], $user, $this->langs, $this->fieldValue);
+ if ($template<0) {
+ $this->setErrors($formmail->errors);
+ }
+ $out.= $this->langs->trans($template->label);
+ } elseif (preg_match('/category:/', $this->type)) {
+ $c = new Categorie($this->db);
+ $result = $c->fetch($this->fieldValue);
+ if ($result < 0) {
+ $this->setErrors($c->errors);
+ }
+ $ways = $c->print_all_ways(' >> ', 'none', 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
+ $toprint = array();
+ foreach ($ways as $way) {
+ $toprint[] = '
color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '
';
+ }
+ $out.='
' . implode(' ', $toprint) . '
';
+ } elseif (preg_match('/thirdparty_type/', $this->type)) {
+ if ($this->fieldValue==2) {
+ $out.= $this->langs->trans("Prospect");
+ } elseif ($this->fieldValue==3) {
+ $out.= $this->langs->trans("ProspectCustomer");
+ } elseif ($this->fieldValue==1) {
+ $out.= $this->langs->trans("Customer");
+ } elseif ($this->fieldValue==0) {
+ $out.= $this->langs->trans("NorProspectNorCustomer");
+ }
+ } elseif ($this->type == 'product') {
+ $product = new Product($this->db);
+ $resprod = $product->fetch($this->fieldValue);
+ if ($resprod > 0) {
+ $out.= $product->ref;
+ } elseif ($resprod < 0) {
+ $this->setErrors($product->errors);
+ }
+ } else {
+ $out.= $this->fieldValue;
+ }
+
+ return $out;
+ }
+
+
+ /*
+ * METHODS FOR SETTING DISPLAY TYPE
+ */
+
+ /**
+ * Set type of input as string
+ * @return self
+ */
+ public function setAsString()
+ {
+ $this->type = 'string';
+ return $this;
+ }
+
+ /**
+ * Set type of input as textarea
+ * @return self
+ */
+ public function setAsTextarea()
+ {
+ $this->type = 'textarea';
+ return $this;
+ }
+
+ /**
+ * Set type of input as html editor
+ * @return self
+ */
+ public function setAsHtml()
+ {
+ $this->type = 'html';
+ return $this;
+ }
+
+ /**
+ * Set type of input as emailtemplate selector
+ * @param string $templateType email template type
+ * @return self
+ */
+ public function setAsEmailTemplate($templateType)
+ {
+ $this->type = 'emailtemplate:'.$templateType;
+ return $this;
+ }
+
+ /**
+ * Set type of input as thirdparty_type selector
+ * @return self
+ */
+ public function setAsThirdpartyType()
+ {
+ $this->type = 'thirdparty_type';
+ return $this;
+ }
+
+ /**
+ * Set type of input as Yes
+ * @return self
+ */
+ public function setAsYesNo()
+ {
+ $this->type = 'yesno';
+ return $this;
+ }
+
+ /**
+ * Set type of input as secure key
+ * @return self
+ */
+ public function setAsSecureKey()
+ {
+ $this->type = 'securekey';
+ return $this;
+ }
+
+ /**
+ * Set type of input as product
+ * @return self
+ */
+ public function setAsProduct()
+ {
+ $this->type = 'product';
+ return $this;
+ }
+
+ /**
+ * Set type of input as a category selector
+ * TODO add default value
+ * @param int $catType Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
+ * @return self
+ */
+ public function setAsCategory($catType)
+ {
+ $this->type = 'category:'.$catType;
+ return $this;
+ }
+
+ /**
+ * Set type of input as a simple title
+ * no data to store
+ * @return self
+ */
+ public function setAsTitle()
+ {
+ $this->type = 'title';
+ return $this;
+ }
+}
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index b9f320b7db8..7e2154ee309 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1,17 +1,18 @@
- * Copyright (C) 2016 Christophe Battarel
- * Copyright (C) 2019 Frédéric France
- * Copyright (C) 2021 Juanjo Menent
+/* Copyright (C) 2013-2015 Jean-François FERRY
+ * Copyright (C) 2016 Christophe Battarel
+ * Copyright (C) 2019 Frédéric France
+ * Copyright (C) 2021 Juanjo Menent
+ * Copyright (C) 2021 Alexandre Spangaro
*
* 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 2 of the License, or
+ * 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
+ * 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
@@ -508,11 +509,13 @@ class FormTicket
print '';
}
- if (!empty($conf->projet->enabled) && !$this->ispublic) {
- $formproject = new FormProjets($this->db);
- print '
