From eef5b9514d3f1ca219ef807e23aa633bd6547225 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 9 Apr 2021 16:55:54 +0200
Subject: [PATCH 001/135] wip

---
 .../eventorganization/attendee_subscription.php     | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 885058d34bb..2e49ad131d9 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -263,6 +263,19 @@ if (empty($reshook) && $action == 'add') {
 
 	if (!$error) {
 		$db->commit();
+		
+		$project = new Project($db);
+		$resultproject = $project->fetch($object->fk_project);
+		if ($resultproject < 0){
+		    $error++;
+		    $errmsg .= $project->error;
+		} else {
+		    if (!empty($project->price_registration)){
+		        // @todo traiter invoice et payment page
+		    }
+		}
+		
+		// invoice
 		//Header("Location: ".$urlback);
 		//exit;
 	} else {

From ebd5f292318c538e88709fffc2681f7f87e2c0c0 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 12 Apr 2021 15:44:25 +0200
Subject: [PATCH 002/135] invoice OK except price, wip on the payment page

---
 .../attendee_subscription.php                 | 47 +++++++++++++------
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index b044ad2e914..172e6cee798 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -66,6 +66,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 // Init vars
@@ -78,6 +80,12 @@ $action = GETPOST('action', 'aZ09');
 $key = 'DV3PH';
 $id = dol_decode(GETPOST('id'), $key);
 
+$conference = new ConferenceOrBooth($db);
+$resultconf = $conference->fetch($id);
+if ($resultconf < 0) {
+    setEventMessages(null, $object->errors, "errors");
+}
+
 // Securekey check
 $securekey = GETPOST('securekey', 'alpha');
 if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY) {
@@ -258,22 +266,39 @@ if (empty($reshook) && $action == 'add') {
 			}
 		}
 	}
-
 	if (!$error) {
 		$db->commit();
-		
 		$project = new Project($db);
-		$resultproject = $project->fetch($object->fk_project);
-		if ($resultproject < 0){
+		$resultproject = $project->fetch($conference->fk_project);
+		if ($resultproject < 0){	    
 		    $error++;
 		    $errmsg .= $project->error;
 		} else {
-		    if (!empty($project->price_registration)){
-		        // @todo traiter invoice et payment page
+		    var_dump($project->price_registration);
+		    if (!empty(floatval($project->price_registration))){
+		        $facture = new Facture($db);
+		        //$facture->rowid = ;
+		        //$facture->ref = ;
+		        //$facture->entity = ;
+		        $facture->type = 0;
+		        $facture->socid = $thirdparty->id;
+		        $facture->paye = 0;
+		        //$facture->fk_user_modif = ;
+		        //$facture->fk_cond_reglement = ;
+		        //$facture->tms = ;
+		        //$facture->fk_statut = ;
+		        $facture->date = dol_now();
+		        $resultfacture = $facture->create($user);	
+		    } else {
+		        // No price has been set
+		        // Validating the subscription
+		        $confattendee->setStatut(1);
+		        global $dolibarr_main_url_root;
+		        $redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
+		        Header("Location: ".$redirection);
+		        exit;
 		    }
 		}
-		
-		// invoice
 		//Header("Location: ".$urlback);
 		//exit;
 	} else {
@@ -289,12 +314,6 @@ if (empty($reshook) && $action == 'add') {
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 
-$conference = new ConferenceOrBooth($db);
-$resultconf = $conference->fetch($id);
-if ($resultconf < 0) {
-	setEventMessages(null, $object->errors, "errors");
-}
-
 llxHeaderVierge($langs->trans("NewSubscription"));
 
 

From 15d103e957f94e63d1b9b50fd80bd7fcff69ad4f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 12 Apr 2021 15:52:49 +0200
Subject: [PATCH 003/135] subs validation for free conferences added

---
 htdocs/langs/en_US/eventorganization.lang | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 03fb460d6b9..302790f91f0 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -98,3 +98,7 @@ MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
 EvntOrgStartDuration = This conference starts on 
 EvntOrgEndDuration =  and ends on
+#
+# SubscriptionOk page
+#
+SubscriptionOk = Your subscription to this conference has been validated

From e1fb368d3a40662623f02199f528540a073055b7 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 12 Apr 2021 16:50:56 +0200
Subject: [PATCH 004/135] wip

---
 .../public/eventorganization/attendee_subscription.php   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 172e6cee798..0adf783ee05 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -274,7 +274,7 @@ if (empty($reshook) && $action == 'add') {
 		    $error++;
 		    $errmsg .= $project->error;
 		} else {
-		    var_dump($project->price_registration);
+		    global $dolibarr_main_url_root;
 		    if (!empty(floatval($project->price_registration))){
 		        $facture = new Facture($db);
 		        //$facture->rowid = ;
@@ -288,12 +288,15 @@ if (empty($reshook) && $action == 'add') {
 		        //$facture->tms = ;
 		        //$facture->fk_statut = ;
 		        $facture->date = dol_now();
-		        $resultfacture = $facture->create($user);	
+		        $resultfacture = $facture->create($user);
+		        //@todo rediriger page paiement
+		        $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
+		        Header("Location: ".$redirection);
+		        exit;
 		    } else {
 		        // No price has been set
 		        // Validating the subscription
 		        $confattendee->setStatut(1);
-		        global $dolibarr_main_url_root;
 		        $redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
 		        Header("Location: ".$redirection);
 		        exit;

From db8dfb219cbea1814ba6f7f951e91fe9dcff06e9 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 13 Apr 2021 14:10:20 +0200
Subject: [PATCH 005/135] addition of the subscriptionok page when the
 subscription price is not set or 0

---
 .../eventorganization/subscriptionok.php      | 156 ++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 htdocs/public/eventorganization/subscriptionok.php

diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
new file mode 100644
index 00000000000..c12c1053e97
--- /dev/null
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -0,0 +1,156 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2013	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2021		Waël Almoman			<info@almoman.com>
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/public/payment/paymentok.php
+ *		\ingroup    core
+ *		\brief      File to show page after a successful payment
+ *                  This page is called by payment system with url provided to it completed with parameter TOKEN=xxx
+ *                  This token can be used to get more informations.
+ */
+
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
+$entity = (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1));
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+
+if (!empty($conf->paypal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
+}
+
+$langs->loadLangs(array("main", "companies", "install", "other", "eventorganization"));
+
+$object = new stdClass(); // For triggers
+
+$error = 0;
+
+
+/*
+ * Actions
+ */
+
+
+
+/*
+ * View
+ */
+
+$now = dol_now();
+
+dol_syslog("Callback url when a payment was done. query_string=".(dol_escape_htmltag($_SERVER["QUERY_STRING"]) ?dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '')." script_uri=".(dol_escape_htmltag($_SERVER["SCRIPT_URI"]) ?dol_escape_htmltag($_SERVER["SCRIPT_URI"]) : ''), LOG_DEBUG, 0, '_payment');
+
+$tracepost = "";
+foreach ($_POST as $k => $v) {
+	$tracepost .= "{$k} - {$v}\n";
+}
+dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_payment');
+
+$head = '';
+if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
+
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
+
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+
+
+// Show message
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div id="dolpaymentdiv" class="center">'."\n";
+
+
+// Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) {
+	$logosmall = $conf->global->$paramlogo;
+} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
+	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+}
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+}
+
+// Output html code for logo
+if ($urllogo) {
+	print '<div class="backgreypublicpayment">';
+	print '<div class="logopublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+	print '>';
+	print '</div>';
+	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+	}
+	print '</div>';
+}
+
+
+print '<br><br><br>';
+
+print $langs->trans("SubscriptionOk");
+
+print "\n</div>\n";
+
+
+htmlPrintOnlinePaymentFooter($mysoc, $langs, 0, $suffix);
+
+
+// Clean session variables to avoid duplicate actions if post is resent
+unset($_SESSION["FinalPaymentAmt"]);
+unset($_SESSION["TRANSACTIONID"]);
+
+
+llxFooter('', 'public');
+
+$db->close();
\ No newline at end of file

From 633a3d39c6bbfecf3df67edf3e13fbeebf9234b4 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 13 Apr 2021 14:32:17 +0200
Subject: [PATCH 006/135] wip on adding taxes and price to invoice

---
 .../attendee_subscription.php                 | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index ba52057b796..1887754bf23 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -284,7 +284,7 @@ if (empty($reshook) && $action == 'add') {
 	}
 
 	if (!$error) {
-		$db->commit();
+		$db->commit();	
 		$project = new Project($db);
 		$resultproject = $project->fetch($conference->fk_project);
 		if ($resultproject < 0){	    
@@ -294,22 +294,22 @@ if (empty($reshook) && $action == 'add') {
 		    global $dolibarr_main_url_root;
 		    if (!empty(floatval($project->price_registration))){
 		        $facture = new Facture($db);
-		        //$facture->rowid = ;
-		        //$facture->ref = ;
-		        //$facture->entity = ;
 		        $facture->type = 0;
 		        $facture->socid = $thirdparty->id;
 		        $facture->paye = 0;
-		        //$facture->fk_user_modif = ;
-		        //$facture->fk_cond_reglement = ;
-		        //$facture->tms = ;
-		        //$facture->fk_statut = ;
+		        //@todo price and taxes to add
+		        $tva = get_default_tva($mysoc, $thirdparty);
+		        
 		        $facture->date = dol_now();
 		        $resultfacture = $facture->create($user);
-		        //@todo rediriger page paiement
-		        $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
-		        Header("Location: ".$redirection);
-		        exit;
+		        if ($resultfacture < 0){
+		            $error++;
+		            $errmsg .= $facture->error;
+		        } else {
+		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
+		            Header("Location: ".$redirection);
+		            exit;
+		        }
 		    } else {
 		        // No price has been set
 		        // Validating the subscription

From a3e75c587c425a908b81b898061e570873b887af Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 13 Apr 2021 15:07:15 +0200
Subject: [PATCH 007/135] adding amount and source to redirection url to
 newpayment

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 1887754bf23..f5efd274edf 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -306,7 +306,7 @@ if (empty($reshook) && $action == 'add') {
 		            $error++;
 		            $errmsg .= $facture->error;
 		        } else {
-		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
+		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?amount='.$project->price_registration.'&source=conferenceattendeesubscription';
 		            Header("Location: ".$redirection);
 		            exit;
 		        }

From 339596f13410f7358ffce6b7bd74c92aae404e13 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 13 Apr 2021 15:30:28 +0200
Subject: [PATCH 008/135] ref add in redirection url to payment page

---
 htdocs/public/eventorganization/attendee_subscription.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index f5efd274edf..a47a93557d3 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -306,7 +306,8 @@ if (empty($reshook) && $action == 'add') {
 		            $error++;
 		            $errmsg .= $facture->error;
 		        } else {
-		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?amount='.$project->price_registration.'&source=conferenceattendeesubscription';
+		            $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
+		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?amount='.$project->price_registration.'&source=conferenceattendeesubscription&ref='.$thirdparty->ref;
 		            Header("Location: ".$redirection);
 		            exit;
 		        }

From 55afc59db25c55839a8df10dcdd267d9a763ed60 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 14 Apr 2021 14:33:11 +0200
Subject: [PATCH 009/135] removed useless fetch, moved link to the fetch method
 of the conferenceorbooth class, wip on service to use on the invoice

---
 htdocs/admin/eventorganization.php            | 19 +++++++++++++++++++
 .../class/conferenceorbooth.class.php         | 12 ++++++++++++
 .../conferenceorbooth_card.php                | 12 +-----------
 htdocs/langs/en_US/eventorganization.lang     |  2 ++
 .../attendee_subscription.php                 |  4 ++--
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index b6a964d8617..c76d9a5c188 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -61,6 +61,8 @@ $arrayofparameters = array(
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
 	'EVENTORGANIZATION_SECUREKEY'=>array('type'=>'securekey', 'enabled'=>1),
+    'SERVICE_BOOTH_LOCATION'=>array('type'=>'product', 'enabled'=>1),
+    'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'=>array('type'=>'product', 'enabled'=>1),
 );
 
 $error = 0;
@@ -276,6 +278,23 @@ if ($action == 'edit') {
                     });';
     			    print '</script>';
     			}
+			} elseif ($var['type'] == 'product') {
+			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+			        print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+			        print '<td>';
+			        $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+			        $form->select_produits($selected, $constname, '', 0);
+			        print '</td>';
+			        print "</tr>\n";
+			    }
+			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+			            print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+			            print '<td>';
+			            $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+			            $form->select_produits($selected, $constname, '', 0);
+			            print '</td>';
+			    }
+			    print "</tr>\n";
 			} else {
 				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
 			}
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 41fe4ebd94d..b859c10a98d 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -237,7 +237,19 @@ class ConferenceOrBooth extends ActionComm
 	 */
 	public function fetch($id, $ref = null, $ref_ext = '', $email_msgid = '')
 	{
+	    global $dolibarr_main_url_root, $dolibarr_main_instance_unique_id, $conf, $langs;
+	    
 		$result = parent::fetch($id, $ref, $ref_ext, $email_msgid);
+		
+		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
+		
+		$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
+		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
+		
+		$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
+		$this->pubregister = $link_subscription;
+		
 		$this->getActionCommFields();
 		return $result;
 	}
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 15b52eda038..fc232406ce9 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -493,18 +493,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
-	global $dolibarr_main_url_root;
-
-	$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
-	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
-
-	$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
-	$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
-
-	$object->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
-	$object->pubregister = $link_subscription;
 	$keyforbreak='pubregister';
-
+	
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 	//var_dump($object);
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index fbee3de4e3d..3fc655b92e9 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -82,6 +82,8 @@ EventOrganizationICSLink=Link ICS for events
 ConferenceOrBoothInformation=Conference Or Booth informations
 Attendees = Attendees
 EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+SERVICE_BOOTH_LOCATION = Service used for the invoice row about a booth location
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to a conference
 #
 # Status
 #
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index a47a93557d3..9aa1ca7d2e0 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -299,14 +299,14 @@ if (empty($reshook) && $action == 'add') {
 		        $facture->paye = 0;
 		        //@todo price and taxes to add
 		        $tva = get_default_tva($mysoc, $thirdparty);
-		        
 		        $facture->date = dol_now();
+		        
 		        $resultfacture = $facture->create($user);
 		        if ($resultfacture < 0){
 		            $error++;
 		            $errmsg .= $facture->error;
 		        } else {
-		            $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
+		            // @todo corriger la réf qui est surement celle de la facture au lieu du client
 		            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?amount='.$project->price_registration.'&source=conferenceattendeesubscription&ref='.$thirdparty->ref;
 		            Header("Location: ".$redirection);
 		            exit;

From caf74fe1cb3452c93146ac8a00a89786afaededd Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 14 Apr 2021 16:20:05 +0200
Subject: [PATCH 010/135] pull problem corrected

---
 .../attendee_subscription.php                 | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index faff3d40712..cdb848ed28c 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -293,6 +293,33 @@ if (empty($reshook) && $action == 'add') {
 
 	if (!$error) {
 		$db->commit();
+	    global $dolibarr_main_url_root;
+	    if (!empty(floatval($project->price_registration))){
+	        $facture = new Facture($db);
+	        $facture->type = 0;
+	        $facture->socid = $thirdparty->id;
+	        $facture->paye = 0;
+	        //@todo price and taxes to add
+	        $tva = get_default_tva($mysoc, $thirdparty);
+	        $facture->date = dol_now();
+	        $resultfacture = $facture->create($user); 
+	        if ($resultfacture < 0){
+                $error++;
+	            $errmsg .= $facture->error;
+	        } else {
+	            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
+	            Header("Location: ".$redirection);
+	            exit;
+	        }
+
+	    } else {
+	        // No price has been set
+	        // Validating the subscription
+	        $confattendee->setStatut(1);
+	        $redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
+	        Header("Location: ".$redirection);
+	        exit;
+		}
 		//Header("Location: ".$urlback);
 		//exit;
 	} else {

From dd7c09582fdc7b19bdaac710e765f9e1f4cf39e2 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 10:45:44 +0200
Subject: [PATCH 011/135] payment page structure ok, still need to confirm the
 attendee after the payment

---
 htdocs/admin/eventorganization.php            |  57 ++++----
 htdocs/langs/en_US/eventorganization.lang     |   4 +
 .../attendee_subscription.php                 |  64 ++++-----
 htdocs/public/payment/newpayment.php          | 133 ++++++++++++++++++
 4 files changed, 193 insertions(+), 65 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index c76d9a5c188..58f09786e23 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -61,8 +61,8 @@ $arrayofparameters = array(
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
 	'EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES'=>array('type'=>'emailtemplate:eventorganization_send', 'enabled'=>1),
 	'EVENTORGANIZATION_SECUREKEY'=>array('type'=>'securekey', 'enabled'=>1),
-    'SERVICE_BOOTH_LOCATION'=>array('type'=>'product', 'enabled'=>1),
-    'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'=>array('type'=>'product', 'enabled'=>1),
+	'SERVICE_BOOTH_LOCATION'=>array('type'=>'product', 'enabled'=>1),
+	'SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION'=>array('type'=>'product', 'enabled'=>1),
 );
 
 $error = 0;
@@ -209,12 +209,12 @@ if ($action == 'edit') {
 	print '<tr class="liste_titre"><td class="titlefieldcreate">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $constname => $val) {
-	    if ($val['enabled']==1) {
-	        $setupnotempty++;
-	        print '<tr class="oddeven"><td>';
-	        $tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
-	        print '<span id="helplink'.$constname.'" class="spanforparamtooltip">'.$form->textwithpicto($langs->trans($constname), $tooltiphelp, 1, 'info', '', 0, 3, 'tootips'.$constname).'</span>';
-	        print '</td><td>';
+		if ($val['enabled']==1) {
+			$setupnotempty++;
+			print '<tr class="oddeven"><td>';
+			$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
+			print '<span id="helplink'.$constname.'" class="spanforparamtooltip">'.$form->textwithpicto($langs->trans($constname), $tooltiphelp, 1, 'info', '', 0, 3, 'tootips'.$constname).'</span>';
+			print '</td><td>';
 
 			if ($val['type'] == 'textarea') {
 				print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
@@ -259,13 +259,13 @@ if ($action == 'edit') {
 				$formcompany = new FormCompany($db);
 				print $formcompany->selectProspectCustomerType($conf->global->{$constname}, $constname);
 			} elseif ($val['type'] == 'securekey') {
-    			print '<input required="required" type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ?GETPOST($constname, 'alpha') : $conf->global->{$constname}).'" size="40">';
-    			if (!empty($conf->use_javascript_ajax)) {
-    			    print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token'.$constname.'" class="linkobject"');
-    			}
-    			if (!empty($conf->use_javascript_ajax)) {
-    			    print "\n".'<script type="text/javascript">';
-    			    print '$(document).ready(function () {
+				print '<input required="required" type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ?GETPOST($constname, 'alpha') : $conf->global->{$constname}).'" size="40">';
+				if (!empty($conf->use_javascript_ajax)) {
+					print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token'.$constname.'" class="linkobject"');
+				}
+				if (!empty($conf->use_javascript_ajax)) {
+					print "\n".'<script type="text/javascript">';
+					print '$(document).ready(function () {
                         $("#generate_token'.$constname.'").click(function() {
                 	        $.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
                 		      action: \'getrandompassword\',
@@ -276,25 +276,16 @@ if ($action == 'edit') {
             				});
                          });
                     });';
-    			    print '</script>';
-    			}
+					print '</script>';
+				}
 			} elseif ($var['type'] == 'product') {
-			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-			        print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
-			        print '<td>';
-			        $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
-			        $form->select_produits($selected, $constname, '', 0);
-			        print '</td>';
-			        print "</tr>\n";
-			    }
-			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-			            print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
-			            print '<td>';
-			            $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
-			            $form->select_produits($selected, $constname, '', 0);
-			            print '</td>';
-			    }
-			    print "</tr>\n";
+				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+					print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
+					print '<td>';
+					$selected = (empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) ? '' : $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
+					$form->select_produits($selected, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
+					print '</td>';
+				}
 			} else {
 				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
 			}
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 3fc655b92e9..6cb7613bf06 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -105,3 +105,7 @@ EvntOrgEndDuration =  and ends on
 # SubscriptionOk page
 #
 SubscriptionOk = Your subscription to this conference has been validated
+#
+# Payment page
+#
+PaymentConferenceAttendee = Paiement de participation à une conférence
\ No newline at end of file
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index cdb848ed28c..3af50ecd8a2 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -86,15 +86,16 @@ $id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 $conference = new ConferenceOrBooth($db);
 $resultconf = $conference->fetch($id);
 if ($resultconf < 0) {
-    setEventMessages(null, $object->errors, "errors");
+	setEventMessages(null, $object->errors, "errors");
 }
 
 $project = new Project($db);
 $resultproject = $project->fetch($conference->fk_project);
-if ($resultproject < 0){
-    $error++;
-    $errmsg .= $project->error;
+if ($resultproject < 0) {
+	$error++;
+	$errmsg .= $project->error;
 }
+var_dump($conference->fk_project);
 
 // Getting 'securekey'.'id' from Post and decoding it
 $encodedsecurekeyandid = GETPOST('securekey', 'alpha');
@@ -293,32 +294,31 @@ if (empty($reshook) && $action == 'add') {
 
 	if (!$error) {
 		$db->commit();
-	    global $dolibarr_main_url_root;
-	    if (!empty(floatval($project->price_registration))){
-	        $facture = new Facture($db);
-	        $facture->type = 0;
-	        $facture->socid = $thirdparty->id;
-	        $facture->paye = 0;
-	        //@todo price and taxes to add
-	        $tva = get_default_tva($mysoc, $thirdparty);
-	        $facture->date = dol_now();
-	        $resultfacture = $facture->create($user); 
-	        if ($resultfacture < 0){
-                $error++;
-	            $errmsg .= $facture->error;
-	        } else {
-	            $redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php';
-	            Header("Location: ".$redirection);
-	            exit;
-	        }
-
-	    } else {
-	        // No price has been set
-	        // Validating the subscription
-	        $confattendee->setStatut(1);
-	        $redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
-	        Header("Location: ".$redirection);
-	        exit;
+		global $dolibarr_main_url_root;
+		if (!empty(floatval($project->price_registration))) {
+			$facture = new Facture($db);
+			$facture->type = 0;
+			$facture->socid = $thirdparty->id;
+			$facture->paye = 0;
+			//@todo price and taxes to add
+			$tva = get_default_tva($mysoc, $thirdparty);
+			$facture->date = dol_now();
+			$resultfacture = $facture->create($user);
+			if ($resultfacture < 0) {
+				$error++;
+				$errmsg .= $facture->error;
+			} else {
+				$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.$confattendee->id;
+				Header("Location: ".$redirection);
+				exit;
+			}
+		} else {
+			// No price has been set
+			// Validating the subscription
+			$confattendee->setStatut(1);
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
+			Header("Location: ".$redirection);
+			exit;
 		}
 		//Header("Location: ".$urlback);
 		//exit;
@@ -394,8 +394,8 @@ print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."
 print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
-if(!empty(floatval($project->price_registration))){
-    print '<FONT COLOR="red">*</FONT>';
+if (!empty(floatval($project->price_registration))) {
+	print '<FONT COLOR="red">*</FONT>';
 }
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 8931ce1ceed..53b75b0b3a1 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -61,6 +61,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Hook to be used by external payment modules (ie Payzen, ...)
 include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager = new HookManager($db);
@@ -1724,6 +1727,136 @@ if ($source == 'donation') {
 	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
 }
 
+if ($source == 'conferencesubscription') {
+	// @todo cas paiement de conferenceattendee
+	$found = true;
+	$langs->load("members");
+
+	// Finding the Attendee
+	$attendee = new ConferenceOrBoothAttendee($db);
+	$result = $attendee->fetch('', $ref);
+	if ($result <= 0) {
+		$mesg = $attendee->error;
+		$error++;
+	}
+	$object = $attendee;
+
+	// Finding the thirdparty associated to the Attendee
+	$thirdparty = new Societe($db);
+	$resultthirdparty = $thirdparty->fetch($attendee->fk_soc);
+	if ($resultthirdparty <= 0) {
+		$mesg = $thirdparty->error;
+		$error++;
+	}
+
+	// Finding the conference
+	$conference = new ConferenceOrBooth($db);
+	$resultconf = $conference->fetch($attendee->fk_actioncomm);
+	if ($resultconf <= 0) {
+		$mesg = $conference->error;
+		$error++;
+	}
+
+	// Finding the project
+	$project = new Project($db);
+	$resultproj = $project->fetch($conference->fk_project);
+	if ($resultproj <= 0) {
+		$mesg = $project->error;
+		$error++;
+	}
+
+	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
+		$amount = $project->price_registration;
+		if (GETPOST("amount", 'alpha')) {
+			$amount = GETPOST("amount", 'alpha');
+		}
+		$amount = price2num($amount, 'MT');
+	}
+
+	if (GETPOST('fulltag', 'alpha')) {
+		$fulltag = GETPOST('fulltag', 'alpha');
+	} else {
+		$fulltag = 'MEM='.$member->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		if (!empty($TAG)) {
+			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+		}
+	}
+	$fulltag = dol_string_unaccent($fulltag);
+
+	// Creditor
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Creditor");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>'.$creditor.'</b>';
+	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
+
+	// Debitor
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Member");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>';
+	print $thirdparty->name;
+	print '</b>';
+	print '</td></tr>'."\n";
+
+	// Object
+	$text = '<b>'.$langs->trans("PaymentConferenceAttendee").'</b>';
+	if (GETPOST('desc', 'alpha')) {
+		$text = '<b>'.$langs->trans(GETPOST('desc', 'alpha')).'</b>';
+	}
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
+	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($member->ref).'">';
+	print '</td></tr>'."\n";
+
+	// Amount
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
+	$valtoshow = $project->price_registration;
+	print '<b>'.price($valtoshow).'</b>';
+	print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
+	print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+
+	// Currency
+	print ' <b>'.$langs->trans("Currency".$currency).'</b>';
+	print '<input type="hidden" name="currency" value="'.$currency.'">';
+	print '</td></tr>'."\n";
+
+	// Tag
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("PaymentCode");
+	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b style="word-break: break-all;">'.$fulltag.'</b>';
+	print '<input type="hidden" name="tag" value="'.$tag.'">';
+	print '<input type="hidden" name="fulltag" value="'.$fulltag.'">';
+	print '</td></tr>'."\n";
+
+	// Shipping address
+	$shipToName = $thirdparty->getFullName($langs);
+	$shipToStreet = $thirdparty->address;
+	$shipToCity = $thirdparty->town;
+	$shipToState = $thirdparty->state_code;
+	$shipToCountryCode = $thirdparty->country_code;
+	$shipToZip = $thirdparty->zip;
+	$shipToStreet2 = '';
+	$phoneNum = $thirdparty->phone;
+	if ($shipToName && $shipToStreet && $shipToCity && $shipToCountryCode && $shipToZip) {
+		print '<!-- Shipping address information -->';
+		print '<input type="hidden" name="shipToName" value="'.$shipToName.'">'."\n";
+		print '<input type="hidden" name="shipToStreet" value="'.$shipToStreet.'">'."\n";
+		print '<input type="hidden" name="shipToCity" value="'.$shipToCity.'">'."\n";
+		print '<input type="hidden" name="shipToState" value="'.$shipToState.'">'."\n";
+		print '<input type="hidden" name="shipToCountryCode" value="'.$shipToCountryCode.'">'."\n";
+		print '<input type="hidden" name="shipToZip" value="'.$shipToZip.'">'."\n";
+		print '<input type="hidden" name="shipToStreet2" value="'.$shipToStreet2.'">'."\n";
+		print '<input type="hidden" name="phoneNum" value="'.$phoneNum.'">'."\n";
+	} else {
+		print '<!-- Shipping address not complete, so we don t use it -->'."\n";
+	}
+	print '<input type="hidden" name="thirdparty_id" value="'.$thirdparty->id.'">'."\n";
+	print '<input type="hidden" name="email" value="'.$thirdparty->email.'">'."\n";
+	$labeldesc = $langs->trans("PaymentSubscription");
+	if (GETPOST('desc', 'alpha')) {
+		$labeldesc = GETPOST('desc', 'alpha');
+	}
+	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
+}
 
 if (!$found && !$mesg) {
 	$mesg = $langs->trans("ErrorBadParameters");

From 880d763abe6ae151868a34045065ea4a6b51f65e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 11:55:28 +0200
Subject: [PATCH 012/135] wip on payment page

---
 .../attendee_subscription.php                 |  1 -
 htdocs/public/payment/newpayment.php          | 72 ++++++++++---------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 3af50ecd8a2..a40c836f0b3 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -95,7 +95,6 @@ if ($resultproject < 0) {
 	$error++;
 	$errmsg .= $project->error;
 }
-var_dump($conference->fk_project);
 
 // Getting 'securekey'.'id' from Post and decoding it
 $encodedsecurekeyandid = GETPOST('securekey', 'alpha');
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 53b75b0b3a1..9fba38962b4 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -109,6 +109,41 @@ if (!$action) {
 	}
 }
 
+if ($source == 'conferencesubscription') {
+	// Finding the Attendee
+	$attendee = new ConferenceOrBoothAttendee($db);
+	$result = $attendee->fetch('', $ref);
+	if ($result <= 0) {
+		$mesg = $attendee->error;
+		$error++;
+	}
+	$object = $attendee;
+
+	// Finding the thirdparty associated to the Attendee
+	$thirdparty = new Societe($db);
+	$resultthirdparty = $thirdparty->fetch($attendee->fk_soc);
+	if ($resultthirdparty <= 0) {
+		$mesg = $thirdparty->error;
+		$error++;
+	}
+
+	// Finding the conference
+	$conference = new ConferenceOrBooth($db);
+	$resultconf = $conference->fetch($attendee->fk_actioncomm);
+	if ($resultconf <= 0) {
+		$mesg = $conference->error;
+		$error++;
+	}
+
+	// Finding the project
+	$project = new Project($db);
+	$resultproj = $project->fetch($conference->fk_project);
+	if ($resultproj <= 0) {
+		$mesg = $project->error;
+		$error++;
+	}
+}
+
 
 $paymentmethod = GETPOST('paymentmethod', 'alphanohtml') ?GETPOST('paymentmethod', 'alphanohtml') : ''; // Empty in most cases. Defined when a payment mode is forced
 $validpaymentmethod = array();
@@ -712,6 +747,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		header("Location: ".$urlko);
 		exit;
 	} else {
+		$attendee->setStatut(1);
 		header("Location: ".$urlok);
 		exit;
 	}
@@ -1728,43 +1764,9 @@ if ($source == 'donation') {
 }
 
 if ($source == 'conferencesubscription') {
-	// @todo cas paiement de conferenceattendee
 	$found = true;
 	$langs->load("members");
 
-	// Finding the Attendee
-	$attendee = new ConferenceOrBoothAttendee($db);
-	$result = $attendee->fetch('', $ref);
-	if ($result <= 0) {
-		$mesg = $attendee->error;
-		$error++;
-	}
-	$object = $attendee;
-
-	// Finding the thirdparty associated to the Attendee
-	$thirdparty = new Societe($db);
-	$resultthirdparty = $thirdparty->fetch($attendee->fk_soc);
-	if ($resultthirdparty <= 0) {
-		$mesg = $thirdparty->error;
-		$error++;
-	}
-
-	// Finding the conference
-	$conference = new ConferenceOrBooth($db);
-	$resultconf = $conference->fetch($attendee->fk_actioncomm);
-	if ($resultconf <= 0) {
-		$mesg = $conference->error;
-		$error++;
-	}
-
-	// Finding the project
-	$project = new Project($db);
-	$resultproj = $project->fetch($conference->fk_project);
-	if ($resultproj <= 0) {
-		$mesg = $project->error;
-		$error++;
-	}
-
 	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
 		$amount = $project->price_registration;
 		if (GETPOST("amount", 'alpha')) {
@@ -1804,7 +1806,7 @@ if ($source == 'conferencesubscription') {
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
-	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($member->ref).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($attendee->ref).'">';
 	print '</td></tr>'."\n";
 
 	// Amount

From 98c622446eabdf468b76d482a8f4eb5dca1d3c57 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 12:14:34 +0200
Subject: [PATCH 013/135] dynamic selector of service/product used for the
 invoice added

---
 htdocs/admin/eventorganization.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 58f09786e23..4e8d19d4590 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -278,16 +278,13 @@ if ($action == 'edit') {
                     });';
 					print '</script>';
 				}
-			} elseif ($var['type'] == 'product') {
+			} elseif ($val['type'] == 'product') {
 				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-					print '<tr class="oddeven"><td>'.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS").'</td>';
-					print '<td>';
-					$selected = (empty($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS) ? '' : $conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS);
-					$form->select_produits($selected, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', '', 0);
-					print '</td>';
+					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+					$form->select_produits($selected, $constname, '', 0);
 				}
 			} else {
-				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
+				print '<input name="'.ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS}.'">';
 			}
 			print '</td></tr>';
 		}

From 764d984ebfec35d21e636b03b39fd4eed8ac0cfd Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 12:28:53 +0200
Subject: [PATCH 014/135] fix on dynamic selector

---
 htdocs/admin/eventorganization.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 4e8d19d4590..c1c0f8234ac 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -283,8 +283,6 @@ if ($action == 'edit') {
 					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
 					$form->select_produits($selected, $constname, '', 0);
 				}
-			} else {
-				print '<input name="'.ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS}.'">';
 			}
 			print '</td></tr>';
 		}

From 12a796fd8e67456016ba4be0433dacf760100574 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 12:57:19 +0200
Subject: [PATCH 015/135] dynamic selector print improved, now using ref
 instead of id

---
 htdocs/admin/eventorganization.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index c1c0f8234ac..b4b6604b118 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -351,6 +351,14 @@ if ($action == 'edit') {
 					} elseif ($conf->global->{$constname}==0) {
 						print $langs->trans("NorProspectNorCustomer");
 					}
+				} elseif ($val['type'] == 'product') {
+					$product = new Product($db);
+					$resprod = $product->fetch($conf->global->{$constname});
+					if ($resprod > 0) {
+						print $product->ref;
+					} elseif ($resprod < 0) {
+						setEventMessages(null, $object->errors, "errors");
+					}
 				} else {
 					print  $conf->global->{$constname};
 				}

From 208478906c6aca9909383830b4bbf407db0167dc Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 16:10:01 +0200
Subject: [PATCH 016/135] add type product in modulebuilder

---
 htdocs/modulebuilder/template/admin/setup.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 97d04336ee6..96f4d831261 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -82,6 +82,7 @@ $arrayofparameters = array(
 	//'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),
 );
 
 $error = 0;
@@ -297,6 +298,11 @@ if ($action == 'edit') {
                     });';
 			        print '</script>';
 			    }
+			} elseif ($val['type'] == 'product') {
+			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+			        $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+			        $form->select_produits($selected, $constname, '', 0);
+			    }
 			} else {
 				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
 			}
@@ -363,8 +369,16 @@ if ($action == 'edit') {
 					} elseif ($conf->global->{$constname}==0) {
 						print $langs->trans("NorProspectNorCustomer");
 					}
+				} elseif ($val['type'] == 'product') {
+				    $product = new Product($db);
+				    $resprod = $product->fetch($conf->global->{$constname});
+				    if ($resprod > 0) {
+				        print $product->ref;
+				    } elseif ($resprod < 0) {
+				        setEventMessages(null, $object->errors, "errors");
+				    }
 				} else {
-					print  $conf->global->{$constname};
+					print $conf->global->{$constname};
 				}
 				print '</td></tr>';
 			}

From ae69cc93be21bb6d106c628af58bb9fc5bde351f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 16:16:45 +0200
Subject: [PATCH 017/135] wip on payment page

---
 .../attendee_subscription.php                 | 38 ++++++++++++-------
 htdocs/public/payment/newpayment.php          | 14 ++++++-
 htdocs/public/payment/paymentok.php           | 17 +++++++++
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index a40c836f0b3..a7f68a7ddab 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -86,7 +86,7 @@ $id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
 $conference = new ConferenceOrBooth($db);
 $resultconf = $conference->fetch($id);
 if ($resultconf < 0) {
-	setEventMessages(null, $object->errors, "errors");
+	setEventMessages(null, $conference->errors, "errors");
 }
 
 $project = new Project($db);
@@ -295,21 +295,31 @@ if (empty($reshook) && $action == 'add') {
 		$db->commit();
 		global $dolibarr_main_url_root;
 		if (!empty(floatval($project->price_registration))) {
-			$facture = new Facture($db);
-			$facture->type = 0;
-			$facture->socid = $thirdparty->id;
-			$facture->paye = 0;
-			//@todo price and taxes to add
-			$tva = get_default_tva($mysoc, $thirdparty);
-			$facture->date = dol_now();
-			$resultfacture = $facture->create($user);
-			if ($resultfacture < 0) {
+			$productforinvoicerow = new Product($db);
+			$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION);
+			if ($resultprod < 0) {
 				$error++;
-				$errmsg .= $facture->error;
+				$errmsg .= $productforinvoicerow->error;
 			} else {
-				$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.$confattendee->id;
-				Header("Location: ".$redirection);
-				exit;
+				$facture = new Facture($db);
+				$facture->type = 0;
+				$facture->socid = $thirdparty->id;
+				$facture->paye = 0;
+				// @todo complete
+				//$baseprice = $productforinvoicerow->
+				$facture->total_ht = 10;
+				$facture->total_vat = $productforinvoicerow->tva_tx*10;
+				$facture->total_ttc =  $facture->total_ht + $facture->total_ttc;
+				$facture->date = dol_now();
+				$resultfacture = $facture->create($user);
+				if ($resultfacture < 0) {
+					$error++;
+					$errmsg .= $facture->error;
+				} else {
+					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.$confattendee->id;
+					Header("Location: ".$redirection);
+					exit;
+				}
 			}
 		} else {
 			// No price has been set
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 9fba38962b4..d4bf295db10 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -69,6 +69,9 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('newpayment'));
 
+// For encryption
+global $dolibarr_main_instance_unique_id;
+
 // Load translation files
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
 
@@ -375,6 +378,9 @@ if ($action == 'dopayment') {
 			dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"]) ? '' : $_SERVER["SCRIPT_URI"]), LOG_DEBUG); // If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
 
 			// A redirect is added if API call successfull
+			if ($source == 'conferencesubscription') {
+				$PAYPAL_API_OK .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
 			// If we are here, it means the Paypal redirect was not done, so we show error message
@@ -393,6 +399,10 @@ if ($action == 'dopayment') {
 		$urlok = preg_replace('/securekey=[^&]+/', '', $urlok);
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
+		if ($source == 'conferencesubscription') {
+			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+		}
+
 		$mesg = '';
 		if (empty($PRICE) || !is_numeric($PRICE)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
@@ -747,7 +757,9 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		header("Location: ".$urlko);
 		exit;
 	} else {
-		$attendee->setStatut(1);
+		if ($source == 'conferencesubscription') {
+			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+		}
 		header("Location: ".$urlok);
 		exit;
 	}
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 1942635001f..7e11944c243 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -56,6 +56,8 @@ if (!empty($conf->paypal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 }
 
+global $dolibarr_main_instance_unique_id;
+
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal"));
 
 // Clean parameters
@@ -105,6 +107,21 @@ $ref = GETPOST('ref');
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');
 
+$conferencesubscription = GETPOST('conferencesubscription');
+$uncryptedconferencesubscription = dol_decode($conferencesubscription, $dolibarr_main_instance_unique_id);
+$subscription = substr($uncryptedconferencesubscription, 0, strlen($uncryptedconferencesubscription)-strlen($ref));
+$reffrompayment = substr($uncryptedconferencesubscription, -strlen($ref), strlen($ref));
+
+// Validation of an attendee after his payment
+if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
+	$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+	$resultattendee = $attendeetovalidate->fetch($ref);
+	if ($resultattendee < 0) {
+		setEventMessages(null, $attendeetovalidate->errors, "errors");
+	} else {
+		$attendeetovalidate->setStatut(1);
+	}
+}
 
 // Detect $paymentmethod
 $paymentmethod = '';

From 2cbe5b188ec29937f1e5a7b45a89129378a90ccb Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 16:57:41 +0200
Subject: [PATCH 018/135] wip invoice

---
 htdocs/langs/en_US/eventorganization.lang     |  1 +
 .../attendee_subscription.php                 | 46 ++++++++++++++++---
 htdocs/public/payment/newpayment.php          |  2 +-
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 6cb7613bf06..f486a64dac1 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -108,4 +108,5 @@ SubscriptionOk = Your subscription to this conference has been validated
 #
 # Payment page
 #
+Attendee = Participant
 PaymentConferenceAttendee = Paiement de participation à une conférence
\ No newline at end of file
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index a7f68a7ddab..ade545c23c7 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -68,6 +68,7 @@ require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 // Init vars
@@ -189,6 +190,7 @@ function llxFooterVierge()
 /*
  * Actions
  */
+global $mysoc;
 $parameters = array();
 // Note that $action and $object may have been modified by some hooks
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
@@ -302,16 +304,48 @@ if (empty($reshook) && $action == 'add') {
 				$errmsg .= $productforinvoicerow->error;
 			} else {
 				$facture = new Facture($db);
-				$facture->type = 0;
+				$facture->type = Facture::TYPE_STANDARD;
 				$facture->socid = $thirdparty->id;
 				$facture->paye = 0;
-				// @todo complete
-				//$baseprice = $productforinvoicerow->
-				$facture->total_ht = 10;
-				$facture->total_vat = $productforinvoicerow->tva_tx*10;
-				$facture->total_ttc =  $facture->total_ht + $facture->total_ttc;
 				$facture->date = dol_now();
+				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
+				if (empty($facture->cond_reglement_id)) {
+					$paymenttermstatic = new PaymentTerm($confattendee->db);
+					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
+					if (empty($facture->cond_reglement_id)) {
+						$error++;
+						$confattendee->error = 'ErrorNoPaymentTermRECEPFound';
+						$confattendee->errors[] = $confattendee->error;
+					}
+				}
+
 				$resultfacture = $facture->create($user);
+				if ($resultfacture <= 0) {
+					$confattendee->error = $facture->error;
+					$confattendee->errors = $facture->errors;
+					$error++;
+				}
+			}
+
+			if (!$error) {
+				// Add line to draft invoice
+				$idprodsubscription = 0;
+				if (!empty($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
+					$idprodsubscription = $conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION;
+				}
+
+				$vattouse = get_default_tva($mysoc, $thirdparty, $idprodsubscription);
+
+				$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $idprodsubscription, 0, $datesubscription, '', 0, 0, '', 'TTC', $amount, 1);
+				if ($result <= 0) {
+					$confattendee->error = $confattendee->error;
+					$confattendee->errors = $confattendee->errors;
+					$error++;
+				}
+				var_dump('a');
+				$resultfacture = $facture->create($user);
+				var_dump('b');
+				var_dump($resultfacture);
 				if ($resultfacture < 0) {
 					$error++;
 					$errmsg .= $facture->error;
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index d4bf295db10..546a7ee0e11 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1804,7 +1804,7 @@ if ($source == 'conferencesubscription') {
 	print '</td></tr>'."\n";
 
 	// Debitor
-	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Member");
+	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Attendee");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'"><b>';
 	print $thirdparty->name;
 	print '</b>';

From db6ca73882866d7d590089e0959aa0ced321e956 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 17:00:53 +0200
Subject: [PATCH 019/135] deletion of vardumps and correction in the invoice
 creation

---
 htdocs/public/eventorganization/attendee_subscription.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index ade545c23c7..1572f667697 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -338,14 +338,11 @@ if (empty($reshook) && $action == 'add') {
 
 				$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $idprodsubscription, 0, $datesubscription, '', 0, 0, '', 'TTC', $amount, 1);
 				if ($result <= 0) {
-					$confattendee->error = $confattendee->error;
-					$confattendee->errors = $confattendee->errors;
+					$confattendee->error = $facture->error;
+					$confattendee->errors = $facture->errors;
 					$error++;
 				}
-				var_dump('a');
 				$resultfacture = $facture->create($user);
-				var_dump('b');
-				var_dump($resultfacture);
 				if ($resultfacture < 0) {
 					$error++;
 					$errmsg .= $facture->error;

From ed857481a23859e98fce1267bed48a8e5d0c819b Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 17:09:26 +0200
Subject: [PATCH 020/135] typo

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 1572f667697..159fdfd0daf 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -435,7 +435,7 @@ print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><in
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
 if (!empty(floatval($project->price_registration))) {
-	print '<FONT COLOR="red">*</FONT>';
+	print '<FONT COLOR="red"> *</FONT>';
 }
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address

From 71befd15f9fc1c49c112ade32a53b12183c33a05 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 15 Apr 2021 17:10:11 +0200
Subject: [PATCH 021/135] typo v2

---
 htdocs/public/eventorganization/attendee_subscription.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 159fdfd0daf..2f7d3e59478 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -431,11 +431,11 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Email
-print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Email").'<FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company");
 if (!empty(floatval($project->price_registration))) {
-	print '<FONT COLOR="red"> *</FONT>';
+	print '<FONT COLOR="red">*</FONT>';
 }
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address

From 5a445d92de4841d7365294527da0fb7d4b0d1377 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 16 Apr 2021 12:10:02 +0200
Subject: [PATCH 022/135] vat ok

---
 .../attendee_subscription.php                 | 35 +++++++------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 2f7d3e59478..9ce8c0470bd 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -241,15 +241,14 @@ if (empty($reshook) && $action == 'add') {
 			} else {
 				$thirdparty->name        = $email;
 			}
-
-			$thirdparty->address     = GETPOST("address");
-			$thirdparty->zip         = GETPOST("zipcode");
-			$thirdparty->town        = GETPOST("town");
-			$thirdparty->client      = 2;
-			$thirdparty->fournisseur = 0;
-			$thirdparty->country_id  = GETPOST("country_id", 'int');
-			$thirdparty->state_id    = GETPOST("state_id", 'int');
-			$thirdparty->email       = $email;
+			$thirdparty->address      = GETPOST("address");
+			$thirdparty->zip          = GETPOST("zipcode");
+			$thirdparty->town         = GETPOST("town");
+			$thirdparty->client       = 2;
+			$thirdparty->fournisseur  = 0;
+			$thirdparty->country_id   = GETPOST("country_id", 'int');
+			$thirdparty->state_id     = GETPOST("state_id", 'int');
+			$thirdparty->email        = $email;
 
 			// Load object modCodeTiers
 			$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
@@ -270,6 +269,8 @@ if (empty($reshook) && $action == 'add') {
 			}
 			$thirdparty->code_client = $tmpcode;
 			$readythirdparty = $thirdparty->create($user);
+			$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
+			$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
 		} else {
 			// We have an existing thirdparty ready to use
 			$readythirdparty = 1;
@@ -329,24 +330,14 @@ if (empty($reshook) && $action == 'add') {
 
 			if (!$error) {
 				// Add line to draft invoice
-				$idprodsubscription = 0;
-				if (!empty($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION) && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
-					$idprodsubscription = $conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION;
-				}
-
-				$vattouse = get_default_tva($mysoc, $thirdparty, $idprodsubscription);
-
-				$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $idprodsubscription, 0, $datesubscription, '', 0, 0, '', 'TTC', $amount, 1);
+				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
+				$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'TTC', floatval($project->price_registration), 1);
 				if ($result <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;
 					$error++;
 				}
-				$resultfacture = $facture->create($user);
-				if ($resultfacture < 0) {
-					$error++;
-					$errmsg .= $facture->error;
-				} else {
+				if (!$error) {
 					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.$confattendee->id;
 					Header("Location: ".$redirection);
 					exit;

From 2d7913322848e65a835f911bea9699a31bcef9f9 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 16 Apr 2021 12:15:23 +0200
Subject: [PATCH 023/135] now using ht instead or ttc

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 9ce8c0470bd..28c3375a62f 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -331,7 +331,7 @@ if (empty($reshook) && $action == 'add') {
 			if (!$error) {
 				// Add line to draft invoice
 				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-				$result = $facture->addline($label, 0, 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'TTC', floatval($project->price_registration), 1);
+				$result = $facture->addline($label, floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
 				if ($result <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;

From e52531114242a754b3437c1f76217849cf5c5e3a Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 16 Apr 2021 14:54:07 +0200
Subject: [PATCH 024/135] now using the invoice id as ref in url passed to
 newpayment page, for conference subscriptions

---
 .../attendee_subscription.php                 |  2 +-
 htdocs/public/payment/newpayment.php          | 48 +++++++------------
 2 files changed, 17 insertions(+), 33 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 28c3375a62f..1121248e048 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -338,7 +338,7 @@ if (empty($reshook) && $action == 'add') {
 					$error++;
 				}
 				if (!$error) {
-					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.$confattendee->id;
+					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.dol_encode($facture->id, $dolibarr_main_instance_unique_id);
 					Header("Location: ".$redirection);
 					exit;
 				}
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 546a7ee0e11..d03f004f317 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -61,8 +61,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
-require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Hook to be used by external payment modules (ie Payzen, ...)
 include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
@@ -114,36 +113,21 @@ if (!$action) {
 
 if ($source == 'conferencesubscription') {
 	// Finding the Attendee
-	$attendee = new ConferenceOrBoothAttendee($db);
-	$result = $attendee->fetch('', $ref);
-	if ($result <= 0) {
-		$mesg = $attendee->error;
-		$error++;
-	}
-	$object = $attendee;
-
-	// Finding the thirdparty associated to the Attendee
-	$thirdparty = new Societe($db);
-	$resultthirdparty = $thirdparty->fetch($attendee->fk_soc);
-	if ($resultthirdparty <= 0) {
-		$mesg = $thirdparty->error;
-		$error++;
-	}
-
-	// Finding the conference
-	$conference = new ConferenceOrBooth($db);
-	$resultconf = $conference->fetch($attendee->fk_actioncomm);
-	if ($resultconf <= 0) {
-		$mesg = $conference->error;
-		$error++;
-	}
-
-	// Finding the project
-	$project = new Project($db);
-	$resultproj = $project->fetch($conference->fk_project);
-	if ($resultproj <= 0) {
-		$mesg = $project->error;
+	$decodedinvoiceid = dol_decode(GETPOST('ref'), $dolibarr_main_instance_unique_id);
+	$invoice = new Facture($db);
+	$resultinvoice = $invoice->fetch($decodedinvoiceid);
+	if ($resultinvoice <= 0) {
+		$mesg = $invoice->error;
 		$error++;
+	} else {
+		// Finding the thirdparty associated to the Attendee
+		$thirdparty = new Societe($db);
+		$resultthirdparty = $thirdparty->fetch($invoice->socid);
+		if ($resultthirdparty <= 0) {
+			$mesg = $thirdparty->error;
+			$error++;
+		}
+		$object = $thirdparty;
 	}
 }
 
@@ -1824,7 +1808,7 @@ if ($source == 'conferencesubscription') {
 	// Amount
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
-	$valtoshow = $project->price_registration;
+	$valtoshow = $invoice->total_ttc;
 	print '<b>'.price($valtoshow).'</b>';
 	print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 	print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';

From 712e1c4e7c27643b6584526b0705ba776fb8c728 Mon Sep 17 00:00:00 2001
From: "jove@bisquerra.com" <jove@bisquerra.com>
Date: Sat, 17 Apr 2021 01:06:30 +0200
Subject: [PATCH 025/135] NEW Edit sales lines rights in TakePOS

---
 htdocs/core/modules/modTakePos.class.php | 14 ++++++++++++++
 htdocs/langs/en_US/admin.lang            |  2 ++
 htdocs/takepos/invoice.php               |  9 ++++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index d34213f062c..7a1384a2de5 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -202,6 +202,20 @@ class modTakePos extends DolibarrModules
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'run';
+		
+		$r++;
+		$this->rights[$r][0] = 50152;
+		$this->rights[$r][1] = 'Edit sales lines';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'editlines';
+		
+		$r++;
+		$this->rights[$r][0] = 50153;
+		$this->rights[$r][1] = 'Edit ordered sales lines';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'editorderedlines';
 
 
 		// Main menu entries
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b103d0082ba..d81b2fc6e9d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -964,6 +964,8 @@ Permission23003=Delete Scheduled job
 Permission23004=Execute Scheduled job
 Permission50101=Use Point of Sale (SimplePOS)
 Permission50151=Use Point of Sale (TakePOS)
+Permission50152=Edit sales lines
+Permission50153=Edit ordered sales lines
 Permission50201=Read transactions
 Permission50202=Import transactions
 Permission50330=Read objects of Zapier
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index c7a01e5d8bc..273d8ec5a6b 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -631,7 +631,8 @@ if ($action == "delete") {
 if ($action == "updateqty") {
 	foreach ($invoice->lines as $line) {
 		if ($line->id == $idline) {
-			$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+			if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+			else $result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 		}
 	}
 
@@ -653,7 +654,8 @@ if ($action == "updateprice") {
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($line->remise_percent) / 100) < price2num($price_min)))) {
 				echo $langs->trans("CantBeLessThanMinPrice");
 			} else {
-				$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+				if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+				else $result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 			}
 		}
 	}
@@ -675,7 +677,8 @@ if ($action == "updatereduction") {
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->multicurrency_subprice) * (1 - price2num($number) / 100) < price2num($price_min)))) {
 				echo $langs->trans("CantBeLessThanMinPrice");
 			} else {
-				$result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+				if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+				else $result = $invoice->updateline($line->id, $line->desc, $line->multicurrency_subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 			}
 		}
 	}

From 83da58b85f4d5c33d82c259d5ebbd18c98eb3e33 Mon Sep 17 00:00:00 2001
From: andreubisquerra <jove@bisquerra.com>
Date: Sat, 17 Apr 2021 01:17:48 +0200
Subject: [PATCH 026/135] Fix travis

---
 htdocs/core/modules/modTakePos.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 7a1384a2de5..84810e80a53 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -202,14 +202,14 @@ class modTakePos extends DolibarrModules
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'run';
-		
+
 		$r++;
 		$this->rights[$r][0] = 50152;
 		$this->rights[$r][1] = 'Edit sales lines';
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'editlines';
-		
+
 		$r++;
 		$this->rights[$r][0] = 50153;
 		$this->rights[$r][1] = 'Edit ordered sales lines';

From 701b53773b4e619d82d72a3224459241f4e7f29e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 09:54:29 +0200
Subject: [PATCH 027/135] added description of the line in the invoice, problem
 with dates that are int

---
 htdocs/langs/en_US/eventorganization.lang                 | 1 +
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index f486a64dac1..037a74076fe 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -101,6 +101,7 @@ MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
 EvntOrgStartDuration = This conference starts on 
 EvntOrgEndDuration =  and ends on
+ConferenceAttendeeFee = Conference attendee fee
 #
 # SubscriptionOk page
 #
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 1121248e048..b477d644dc7 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -331,7 +331,7 @@ if (empty($reshook) && $action == 'add') {
 			if (!$error) {
 				// Add line to draft invoice
 				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-				$result = $facture->addline($label, floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+				$result = $facture->addline($langs->trans("ConferenceAttendeeFee").' for the event : \''.$conference->label.'\' occuring from '.$conference->datep.' to '.$conference->datep2, floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
 				if ($result <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;

From 0325f023680258309230b08f39833d54247da5ed Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 10:09:19 +0200
Subject: [PATCH 028/135] timestamp converted to get date of start and end on
 the invoice

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index b477d644dc7..9f3115e56f4 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -331,7 +331,7 @@ if (empty($reshook) && $action == 'add') {
 			if (!$error) {
 				// Add line to draft invoice
 				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-				$result = $facture->addline($langs->trans("ConferenceAttendeeFee").' for the event : \''.$conference->label.'\' occuring from '.$conference->datep.' to '.$conference->datep2, floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+				$result = $facture->addline($langs->trans("ConferenceAttendeeFee").' for the event : \''.$conference->label.'\' occuring from '.dol_print_date($conference->datep, '%d/%m/%y %H:%M:%S').' to '.dol_print_date($conference->datep2, '%d/%m/%y %H:%M:%S'), floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
 				if ($result <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;

From 8a43dac46d51c691b9208c4580aa05fbd1937ef7 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 15:21:16 +0200
Subject: [PATCH 029/135] now giving the invoice id to the payment validation
 page so it can validate the payment

---
 htdocs/public/payment/newpayment.php |  6 ++---
 htdocs/public/payment/paymentok.php  | 33 +++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index d03f004f317..75d72b4bbea 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -363,7 +363,7 @@ if ($action == 'dopayment') {
 
 			// A redirect is added if API call successfull
 			if ($source == 'conferencesubscription') {
-				$PAYPAL_API_OK .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+				$PAYPAL_API_OK .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
@@ -384,7 +384,7 @@ if ($action == 'dopayment') {
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 
 		$mesg = '';
@@ -742,7 +742,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		exit;
 	} else {
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id);
+			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 		header("Location: ".$urlok);
 		exit;
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 7e11944c243..d9cfdc28b69 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -103,6 +103,7 @@ if (empty($FULLTAG)) {
 }
 $source = GETPOST('s', 'alpha') ? GETPOST('s', 'alpha') : GETPOST('source', 'alpha');
 $ref = GETPOST('ref');
+$invoiceref = GETPOST('invoice');
 
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');
@@ -112,15 +113,35 @@ $uncryptedconferencesubscription = dol_decode($conferencesubscription, $dolibarr
 $subscription = substr($uncryptedconferencesubscription, 0, strlen($uncryptedconferencesubscription)-strlen($ref));
 $reffrompayment = substr($uncryptedconferencesubscription, -strlen($ref), strlen($ref));
 
-// Validation of an attendee after his payment
+// After a conference attendee payment
 if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
-	$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-	$resultattendee = $attendeetovalidate->fetch($ref);
-	if ($resultattendee < 0) {
-		setEventMessages(null, $attendeetovalidate->errors, "errors");
+	// Looking for the invoice to which add a payment
+	$paidinvoice = new Facture($db);
+	$resultinvoice = $paidinvoice->fetch($invoiceref);
+	if ($resultinvoice < 0) {
+		setEventMessages(null, $paidinvoice->errors, "errors");
 	} else {
-		$attendeetovalidate->setStatut(1);
+		// Creation of payment line
+		$paiement = new Paiement($db);
+		$paiement->datepaye     = dol_now();
+		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
+		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
+		$paiement->note_private = GETPOST('comment', 'alpha');
+
+		// Validating the attendee
+		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+		$resultattendee = $attendeetovalidate->fetch($ref);
+		if ($resultattendee < 0) {
+			setEventMessages(null, $attendeetovalidate->errors, "errors");
+		} else {
+			$attendeetovalidate->setStatut(1);
+		}
 	}
+
+
+
 }
 
 // Detect $paymentmethod

From 9a325269385005ec73aff5f15c759d159723ba4a Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 15:49:51 +0200
Subject: [PATCH 030/135] added space for the link to the conference/booth
 registration page

---
 htdocs/eventorganization/conferenceorbooth_list.php | 11 +++++++++++
 htdocs/langs/en_US/eventorganization.lang           |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 814a61ae894..feb202de663 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -39,6 +39,8 @@ if ($conf->categorie->enabled) {
 // Load translation files required by the page
 $langs->loadLangs(array("eventorganization", "other"));
 
+global $dolibarr_main_url_root, $dolibarr_main_instance_unique_id;
+
 $action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
@@ -360,6 +362,15 @@ if ($projectid > 0) {
 	}
 	print '</td></tr>';
 
+	// Link to the vote/register page
+	print '<tr><td>'.$langs->trans("RegisterPage").'</td><td>';
+	$encodedid = dol_encode($project->id, $dolibarr_main_instance_unique_id);
+	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$encodedid;
+	$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
+	$linkregister .= '&securekey='.urlencode($encodedsecurekey);
+	print '<a href="'.$linkregister.'">'.$linkregister.'</a>';
+	print '</td></tr>';
+
 	// Other attributes
 	$cols = 2;
 	$objectconf=$object;
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 037a74076fe..157fc1c8a99 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -96,6 +96,7 @@ EvntOrgCancelled = Cancelled
 #
 # Public page
 #
+RegisterPage = Page for conferences or booth
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
@@ -110,4 +111,4 @@ SubscriptionOk = Your subscription to this conference has been validated
 # Payment page
 #
 Attendee = Participant
-PaymentConferenceAttendee = Paiement de participation à une conférence
\ No newline at end of file
+PaymentConferenceAttendee = Paiement de participation à une conférence

From 1b947a6e9a0e525e7d440b97b4b1bf1cb7463356 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 16:17:11 +0200
Subject: [PATCH 031/135] added index page for the booth/conference
 registration

---
 htdocs/public/project/index.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 htdocs/public/project/index.php

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
new file mode 100644
index 00000000000..e69de29bb2d

From 18d16d95092f04a81f743377f46a857e6416dfde Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 16:26:45 +0200
Subject: [PATCH 032/135] moved attendee validation after the payment method
 search

---
 htdocs/public/payment/paymentok.php | 57 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index d9cfdc28b69..a52ddb5fbcc 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -113,36 +113,6 @@ $uncryptedconferencesubscription = dol_decode($conferencesubscription, $dolibarr
 $subscription = substr($uncryptedconferencesubscription, 0, strlen($uncryptedconferencesubscription)-strlen($ref));
 $reffrompayment = substr($uncryptedconferencesubscription, -strlen($ref), strlen($ref));
 
-// After a conference attendee payment
-if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
-	// Looking for the invoice to which add a payment
-	$paidinvoice = new Facture($db);
-	$resultinvoice = $paidinvoice->fetch($invoiceref);
-	if ($resultinvoice < 0) {
-		setEventMessages(null, $paidinvoice->errors, "errors");
-	} else {
-		// Creation of payment line
-		$paiement = new Paiement($db);
-		$paiement->datepaye     = dol_now();
-		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
-		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
-		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
-		$paiement->note_private = GETPOST('comment', 'alpha');
-
-		// Validating the attendee
-		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-		$resultattendee = $attendeetovalidate->fetch($ref);
-		if ($resultattendee < 0) {
-			setEventMessages(null, $attendeetovalidate->errors, "errors");
-		} else {
-			$attendeetovalidate->setStatut(1);
-		}
-	}
-
-
-
-}
 
 // Detect $paymentmethod
 $paymentmethod = '';
@@ -186,6 +156,33 @@ $object = new stdClass(); // For triggers
 
 $error = 0;
 
+// After a conference attendee payment
+if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
+	// Looking for the invoice to which add a payment
+	$paidinvoice = new Facture($db);
+	$resultinvoice = $paidinvoice->fetch($invoiceref);
+	if ($resultinvoice < 0) {
+		setEventMessages(null, $paidinvoice->errors, "errors");
+	} else {
+		// Creation of payment line
+		$paiement = new Paiement($db);
+		$paiement->datepaye     = dol_now();
+		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
+		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
+		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
+		$paiement->note_private = GETPOST('comment', 'alpha');
+
+		// Validating the attendee
+		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+		$resultattendee = $attendeetovalidate->fetch($ref);
+		if ($resultattendee < 0) {
+			setEventMessages(null, $attendeetovalidate->errors, "errors");
+		} else {
+			$attendeetovalidate->setStatut(1);
+		}
+	}
+}
 
 /*
  * Actions

From ac8ddd88315db36f1e1058c1a54678559fa8a01e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 16:52:08 +0200
Subject: [PATCH 033/135] removed redundant fetch

---
 htdocs/public/eventorganization/attendee_subscription.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 9f3115e56f4..b5ae6b0ba01 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -366,12 +366,6 @@ if (empty($reshook) && $action == 'add') {
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 
-$conference = new ConferenceOrBooth($db);
-$resultconf = $conference->fetch($id);
-if ($resultconf < 0) {
-	setEventMessages(null, $object->errors, "errors");
-}
-
 llxHeaderVierge($langs->trans("NewSubscription"));
 
 

From 128dcb2e2bd2b68fdf1eba7f05234e45aeef2600 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Mon, 19 Apr 2021 17:26:01 +0200
Subject: [PATCH 034/135] public registration page for booths and conferences
 created, wip

---
 htdocs/langs/en_US/eventorganization.lang |   5 +
 htdocs/public/project/index.php           | 829 ++++++++++++++++++++++
 2 files changed, 834 insertions(+)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 157fc1c8a99..9e2df362467 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -97,6 +97,11 @@ EvntOrgCancelled = Cancelled
 # Public page
 #
 RegisterPage = Page for conferences or booth
+EvntOrgRegistrationWelcomeMessage = Welcome on the conference or booth suggestion page.
+EvntOrgRegistrationHelpMessage = Here, you can suggest a new conference or a new booth for the project
+SuggestConference = Suggest a new conference
+SuggestBooth = Suggest a booth
+ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index e69de29bb2d..9b04890084e 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -0,0 +1,829 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2018-2019	Thibault FOUCART	    <support@ptibogxiv.net>
+ * Copyright (C) 2021		Waël Almoman	    	<info@almoman.com>
+ *
+ * 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 <https://www.gnu.org/licenses/>.
+ *
+ * For Paypal test: https://developer.paypal.com/
+ * For Paybox test: ???
+ * For Stripe test: Use credit card 4242424242424242 .More example on https://stripe.com/docs/testing
+ *
+ * Variants:
+ * - When option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION is on, we use the new PaymentIntent API
+ * - When option STRIPE_USE_NEW_CHECKOUT is on, we use the new checkout API
+ * - If no option set, we use old APIS (charge)
+ */
+
+/**
+ *     	\file       htdocs/public/payment/newpayment.php
+ *		\ingroup    core
+ *		\brief      File to offer a way to make a payment for a particular Dolibarr object
+ */
+
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and get of entity must be done before including main.inc.php
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : (!empty($_GET['e']) ? (int) $_GET['e'] : (!empty($_POST['e']) ? (int) $_POST['e'] : 1))));
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+// Hook to be used by external payment modules (ie Payzen, ...)
+include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks(array('newpayment'));
+
+// For encryption
+global $dolibarr_main_instance_unique_id;
+
+// Load translation files
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
+
+// Security check
+// No check on module enabled. Done later according to $validpaymentmethod
+
+$action = GETPOST('action', 'aZ09');
+$id = dol_decode(GETPOST('id'), $dolibarr_main_instance_unique_id);
+
+// Define $urlwithroot
+//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
+//$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+$urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
+
+
+/*
+ * Actions
+ */
+
+
+/*
+ * View
+ */
+
+$head = '';
+if (!empty($conf->global->ONLINE_PAYMENT_CSS_URL)) {
+	$head = '<link rel="stylesheet" type="text/css" href="'.$conf->global->ONLINE_PAYMENT_CSS_URL.'?lang='.$langs->defaultlang.'">'."\n";
+}
+
+$conf->dol_hide_topmenu = 1;
+$conf->dol_hide_leftmenu = 1;
+
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("PaymentForm"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+
+
+// Show sandbox warning
+if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled) && (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'int'))) {		// We can force sand box with param 'forcesandbox'
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Paypal'), '', 'warning');
+}
+if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'int'))) {
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
+}
+
+
+print '<span id="dolpaymentspan"></span>'."\n";
+print '<div class="center">'."\n";
+print '<form id="dolpaymentform" class="center" name="paymentform" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+print '<input type="hidden" name="action" value="dopayment">'."\n";
+print '<input type="hidden" name="tag" value="'.GETPOST("tag", 'alpha').'">'."\n";
+print '<input type="hidden" name="suffix" value="'.dol_escape_htmltag($suffix).'">'."\n";
+print '<input type="hidden" name="securekey" value="'.dol_escape_htmltag($SECUREKEY).'">'."\n";
+print '<input type="hidden" name="e" value="'.$entity.'" />';
+print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
+print "\n";
+
+
+// Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
+// Define logo and logosmall
+$logosmall = $mysoc->logo_small;
+$logo = $mysoc->logo;
+$paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
+if (!empty($conf->global->$paramlogo)) {
+	$logosmall = $conf->global->$paramlogo;
+} elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) {
+	$logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
+}
+//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
+// Define urllogo
+$urllogo = '';
+$urllogofull = '';
+if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$logosmall)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/thumbs/'.$logosmall);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/thumbs/'.$logosmall);
+} elseif (!empty($logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$logo)) {
+	$urllogo = DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;entity='.$conf->entity.'&amp;file='.urlencode('logos/'.$logo);
+	$urllogofull = $dolibarr_main_url_root.'/viewimage.php?modulepart=mycompany&entity='.$conf->entity.'&file='.urlencode('logos/'.$logo);
+}
+
+// Output html code for logo
+if ($urllogo) {
+	print '<div class="backgreypublicpayment">';
+	print '<div class="logopublicpayment">';
+	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+	print '>';
+	print '</div>';
+	if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+		print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+	}
+	print '</div>';
+}
+
+print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+
+// Output introduction text
+$text = '';
+if (!empty($conf->global->PAYMENT_NEWFORM_TEXT)) {
+	$langs->load("members");
+	if (preg_match('/^\((.*)\)$/', $conf->global->PAYMENT_NEWFORM_TEXT, $reg)) {
+		$text .= $langs->trans($reg[1])."<br>\n";
+	} else {
+		$text .= $conf->global->PAYMENT_NEWFORM_TEXT."<br>\n";
+	}
+	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+}
+if (empty($text)) {
+	$text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+}
+print $text;
+
+// Output payment summary form
+print '<tr><td align="center">';
+
+$found = false;
+$error = 0;
+$var = false;
+
+$object = null;
+
+
+// Free payment
+if (!$source) {
+	$found = true;
+	$tag = GETPOST("tag", 'alpha');
+	if (GETPOST('fulltag', 'alpha')) {
+		$fulltag = GETPOST('fulltag', 'alpha');
+	} else {
+		$fulltag = "TAG=".$tag;
+	}
+
+}
+
+
+// Payment on customer order
+if ($source == 'order') {
+	$found = true;
+	$langs->load("orders");
+
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+
+	$order = new Commande($db);
+	$result = $order->fetch('', $ref);
+	if ($result <= 0) {
+		$mesg = $order->error;
+		$error++;
+	} else {
+		$result = $order->fetch_thirdparty($order->socid);
+	}
+	$object = $order;
+
+	if (GETPOST('fulltag', 'alpha')) {
+		$fulltag = GETPOST('fulltag', 'alpha');
+	} else {
+		$fulltag = 'ORD='.$order->id.'.CUS='.$order->thirdparty->id;
+		if (!empty($TAG)) {
+			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+		}
+	}
+	$fulltag = dol_string_unaccent($fulltag);
+}
+
+
+// Payment on customer invoice
+if ($source == 'invoice') {
+	$found = true;
+	$langs->load("bills");
+
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+	$invoice = new Facture($db);
+	$result = $invoice->fetch('', $ref);
+	if ($result <= 0) {
+		$mesg = $invoice->error;
+		$error++;
+	} else {
+		$result = $invoice->fetch_thirdparty($invoice->socid);
+	}
+	$object = $invoice;
+
+	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
+		$amount = price2num($invoice->total_ttc - ($invoice->getSommePaiement() + $invoice->getSumCreditNotesUsed() + $invoice->getSumDepositsUsed()));
+		if (GETPOST("amount", 'alpha')) {
+			$amount = GETPOST("amount", 'alpha');
+		}
+		$amount = price2num($amount);
+	}
+
+	if (GETPOST('fulltag', 'alpha')) {
+		$fulltag = GETPOST('fulltag', 'alpha');
+	} else {
+		$fulltag = 'INV='.$invoice->id.'.CUS='.$invoice->thirdparty->id;
+		if (!empty($TAG)) {
+			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
+		}
+	}
+	$fulltag = dol_string_unaccent($fulltag);
+
+	$labeldesc = $langs->trans("Invoice").' '.$invoice->ref;
+	if (GETPOST('desc', 'alpha')) {
+		$labeldesc = GETPOST('desc', 'alpha');
+	}
+	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
+}
+
+if (!$found && !$mesg) {
+	$mesg = $langs->trans("ErrorBadParameters");
+}
+
+if ($mesg) {
+	print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
+}
+
+print "\n";
+
+
+// Show all payment mode buttons (Stripe, Paypal, ...)
+print '<br>';
+print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
+print '<br><br>';
+print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
+print '<br><br>';
+print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
+
+
+print '</td></tr>'."\n";
+
+print '</table>'."\n";
+
+print '</form>'."\n";
+print '</div>'."\n";
+print '<br>';
+
+
+
+// Add more content on page for some services
+if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payment mode
+	// Stripe
+	if (GETPOST('dopayment_stripe', 'alpha')) {
+		// Personalized checkout
+		print '<style>
+	    /**
+	     * The CSS shown here will not be introduced in the Quickstart guide, but shows
+	     * how you can use CSS to style your Element s container.
+	     */
+	    .StripeElement {
+	        background-color: white;
+	        padding: 8px 12px;
+	        border-radius: 4px;
+	        border: 1px solid transparent;
+	        box-shadow: 0 1px 3px 0 #e6ebf1;
+	        -webkit-transition: box-shadow 150ms ease;
+	        transition: box-shadow 150ms ease;
+	    }
+
+	    .StripeElement--focus {
+	        box-shadow: 0 1px 3px 0 #cfd7df;
+	    }
+
+	    .StripeElement--invalid {
+	        border-color: #fa755a;
+	    }
+
+	    .StripeElement--webkit-autofill {
+	        background-color: #fefde5 !important;
+	    }
+	    </style>';
+
+		print '<br>';
+
+		print '<!-- Form payment-form STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = '.$conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION.' STRIPE_USE_NEW_CHECKOUT = '.$conf->global->STRIPE_USE_NEW_CHECKOUT.' -->'."\n";
+		print '<form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">'."\n";
+
+		print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
+		print '<input type="hidden" name="dopayment_stripe" value="1">'."\n";
+		print '<input type="hidden" name="action" value="charge">'."\n";
+		print '<input type="hidden" name="tag" value="'.$TAG.'">'."\n";
+		print '<input type="hidden" name="s" value="'.$source.'">'."\n";
+		print '<input type="hidden" name="ref" value="'.$REF.'">'."\n";
+		print '<input type="hidden" name="fulltag" value="'.$FULLTAG.'">'."\n";
+		print '<input type="hidden" name="suffix" value="'.$suffix.'">'."\n";
+		print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
+		print '<input type="hidden" name="e" value="'.$entity.'" />';
+		print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
+		print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
+		print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
+		print '<input type="hidden" name="email" value="'.GETPOST('email', 'alpha').'" />';
+		print '<input type="hidden" name="thirdparty_id" value="'.GETPOST('thirdparty_id', 'int').'" />';
+
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || !empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {	// Use a SCA ready method
+			require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+
+			$service = 'StripeLive';
+			$servicestatus = 1;
+			if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')) {
+				$service = 'StripeTest';
+				$servicestatus = 0;
+			}
+
+			$stripe = new Stripe($db);
+			$stripeacc = $stripe->getStripeAccount($service);
+			$stripecu = null;
+			if (is_object($object) && is_object($object->thirdparty)) {
+				$stripecu = $stripe->customerStripe($object->thirdparty, $stripeacc, $servicestatus, 1);
+			}
+
+			if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+				$noidempotency_key = (GETPOSTISSET('noidempotency') ? GETPOST('noidempotency', 'int') : 0); // By default noidempotency is unset, so we must use a different tag/ref for each payment. If set, we can pay several times the same tag/ref.
+				$paymentintent = $stripe->getPaymentIntent($amount, $currency, $tag, 'Stripe payment: '.$fulltag.(is_object($object) ? ' ref='.$object->ref : ''), $object, $stripecu, $stripeacc, $servicestatus, 0, 'automatic', false, null, 0, $noidempotency_key);
+				// The paymentintnent has status 'requires_payment_method' (even if paymentintent was already paid)
+				//var_dump($paymentintent);
+				if ($stripe->error) {
+					setEventMessages($stripe->error, null, 'errors');
+				}
+			}
+		}
+
+		//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
+		//{
+		print '
+        <table id="dolpaymenttable" summary="Payment form" class="center">
+        <tbody><tr><td class="textpublicpayment">';
+
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+			print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
+		}
+
+		print '<div class="form-row left">';
+		print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
+
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+			print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>';
+		}
+
+		print '<div id="card-element">
+        <!-- a Stripe Element will be inserted here. -->
+        </div>';
+
+		print '<!-- Used to display form errors -->
+        <div id="card-errors" role="alert"></div>
+        </div>';
+
+		print '<br>';
+		print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
+		print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif">';
+
+		print '</td></tr></tbody>';
+		print '</table>';
+		//}
+
+		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+			if (empty($paymentintent)) {
+				print '<center>'.$langs->trans("Error").'</center>';
+			} else {
+				print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
+				//$_SESSION["paymentintent_id"] = $paymentintent->id;
+			}
+		}
+
+		print '</form>'."\n";
+
+
+		// JS Code for Stripe
+		if (empty($stripearrayofkeys['publishable_key'])) {
+			$langs->load("errors");
+			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
+		} else {
+			print '<!-- JS Code for Stripe components -->';
+			print '<script src="https://js.stripe.com/v3/"></script>'."\n";
+			print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
+
+			// Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
+			print '<script type="text/javascript" language="javascript">'."\n";
+
+			if (!empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {
+				$amountstripe = $amount;
+
+				// Correct the amount according to unit of currency
+				// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
+				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+				if (!in_array($currency, $arrayzerounitcurrency)) {
+					$amountstripe = $amountstripe * 100;
+				}
+
+				$ipaddress = getUserRemoteIP();
+				$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
+				if (is_object($object)) {
+					$metadata['dol_type'] = $object->element;
+					$metadata['dol_id'] = $object->id;
+
+					$ref = $object->ref;
+				}
+
+				try {
+					$arrayforpaymentintent = array(
+						'description'=>'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
+						"metadata" => $metadata
+					);
+					if ($TAG) {
+						$arrayforpaymentintent["statement_descriptor"] = dol_trunc($TAG, 10, 'right', 'UTF-8', 1); // 22 chars that appears on bank receipt (company + description)
+					}
+
+					$arrayforcheckout = array(
+						'payment_method_types' => array('card'),
+						'line_items' => array(array(
+							'name' => $langs->transnoentitiesnoconv("Payment").' '.$TAG, // Label of product line
+							'description' => 'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
+							'amount' => $amountstripe,
+							'currency' => $currency,
+							//'images' => array($urllogofull),
+							'quantity' => 1,
+						)),
+						'client_reference_id' => $FULLTAG,
+						'success_url' => $urlok,
+						'cancel_url' => $urlko,
+						'payment_intent_data' => $arrayforpaymentintent
+					);
+					if ($stripecu) {
+						$arrayforcheckout['customer'] = $stripecu;
+					} elseif (GETPOST('email', 'alpha') && isValidEmail(GETPOST('email', 'alpha'))) {
+						$arrayforcheckout['customer_email'] = GETPOST('email', 'alpha');
+					}
+					$sessionstripe = \Stripe\Checkout\Session::create($arrayforcheckout);
+
+					$remoteip = getUserRemoteIP();
+
+					// Save some data for the paymentok
+					$_SESSION["currencyCodeType"] = $currency;
+					$_SESSION["paymentType"] = '';
+					$_SESSION["FinalPaymentAmt"] = $amount;
+					$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
+					$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
+					$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
+				} catch (Exception $e) {
+					print $e->getMessage();
+				}
+				?>
+				// Code for payment with option STRIPE_USE_NEW_CHECKOUT set
+
+				// Create a Stripe client.
+				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+
+				// Create an instance of Elements
+				var elements = stripe.elements();
+
+				// Custom styling can be passed to options when creating an Element.
+				// (Note that this demo uses a wider set of styles than the guide below.)
+				var style = {
+				base: {
+				color: '#32325d',
+				lineHeight: '24px',
+				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+				fontSmoothing: 'antialiased',
+				fontSize: '16px',
+				'::placeholder': {
+				color: '#aab7c4'
+				}
+				},
+				invalid: {
+				color: '#fa755a',
+				iconColor: '#fa755a'
+				}
+				};
+
+				var cardElement = elements.create('card', {style: style});
+
+				// Comment this to avoid the redirect
+				stripe.redirectToCheckout({
+				// Make the id field from the Checkout Session creation API response
+				// available to this file, so you can provide it as parameter here
+				// instead of the {{CHECKOUT_SESSION_ID}} placeholder.
+				sessionId: '<?php print $sessionstripe->id; ?>'
+				}).then(function (result) {
+				// If `redirectToCheckout` fails due to a browser or network
+				// error, display the localized error message to your customer
+				// using `result.error.message`.
+				});
+
+
+				<?php
+			} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+				?>
+				// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
+
+				// Create a Stripe client.
+				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+
+				// Create an instance of Elements
+				var elements = stripe.elements();
+
+				// Custom styling can be passed to options when creating an Element.
+				// (Note that this demo uses a wider set of styles than the guide below.)
+				var style = {
+				base: {
+				color: '#32325d',
+				lineHeight: '24px',
+				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+				fontSmoothing: 'antialiased',
+				fontSize: '16px',
+				'::placeholder': {
+				color: '#aab7c4'
+				}
+				},
+				invalid: {
+				color: '#fa755a',
+				iconColor: '#fa755a'
+				}
+				};
+
+				var cardElement = elements.create('card', {style: style});
+
+				// Add an instance of the card Element into the `card-element` <div>
+				cardElement.mount('#card-element');
+
+				// Handle real-time validation errors from the card Element.
+				cardElement.addEventListener('change', function(event) {
+				var displayError = document.getElementById('card-errors');
+				if (event.error) {
+				console.log("Show event error (like 'Incorrect card number', ...)");
+				displayError.textContent = event.error.message;
+				} else {
+				console.log("Reset error message");
+				displayError.textContent = '';
+				}
+				});
+
+				// Handle form submission
+				var cardholderName = document.getElementById('cardholder-name');
+				var cardButton = document.getElementById('buttontopay');
+				var clientSecret = cardButton.dataset.secret;
+
+				cardButton.addEventListener('click', function(event) {
+				console.log("We click on buttontopay");
+				event.preventDefault();
+
+				if (cardholderName.value == '')
+				{
+				console.log("Field Card holder is empty");
+				var displayError = document.getElementById('card-errors');
+				displayError.textContent = '<?php print dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardOwner"))); ?>';
+				}
+				else
+				{
+				/* Disable button to pay and show hourglass cursor */
+				jQuery('#hourglasstopay').show();
+				jQuery('#buttontopay').hide();
+
+				stripe.handleCardPayment(
+				clientSecret, cardElement, {
+				payment_method_data: {
+				billing_details: {
+				name: cardholderName.value
+				<?php if (GETPOST('email', 'alpha') || (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->email))) {
+					?>, email: '<?php echo dol_escape_js(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $object->thirdparty->email); ?>'<?php
+				} ?>
+				<?php if (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->phone)) {
+					?>, phone: '<?php echo dol_escape_js($object->thirdparty->phone); ?>'<?php
+				} ?>
+				<?php if (is_object($object) && is_object($object->thirdparty)) {
+					?>, address: {
+					city: '<?php echo dol_escape_js($object->thirdparty->town); ?>',
+					<?php if ($object->thirdparty->country_code) {
+						?>country: '<?php echo dol_escape_js($object->thirdparty->country_code); ?>',<?php
+					} ?>
+					line1: '<?php echo dol_escape_js(preg_replace('/\s\s+/', ' ', $object->thirdparty->address)); ?>',
+					postal_code: '<?php echo dol_escape_js($object->thirdparty->zip); ?>'
+					}
+				<?php } ?>
+				}
+				},
+				save_payment_method:<?php if ($stripecu) {
+					print 'true';
+				} else {
+					print 'false';
+				} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
+				}
+				).then(function(result) {
+				console.log(result);
+				if (result.error) {
+				console.log("Error on result of handleCardPayment");
+				jQuery('#buttontopay').show();
+				jQuery('#hourglasstopay').hide();
+				// Inform the user if there was an error
+				var errorElement = document.getElementById('card-errors');
+				errorElement.textContent = result.error.message;
+				} else {
+				// The payment has succeeded. Display a success message.
+				console.log("No error on result of handleCardPayment, so we submit the form");
+				// Submit the form
+				jQuery('#buttontopay').hide();
+				jQuery('#hourglasstopay').show();
+				// Send form (action=charge that will do nothing)
+				jQuery('#payment-form').submit();
+				}
+				});
+				}
+				});
+
+				<?php
+			} else {
+				// Old method (not SCA ready)
+				?>
+				// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
+
+				// Create a Stripe client.
+				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
+
+				// Create an instance of Elements
+				var elements = stripe.elements();
+
+				// Custom styling can be passed to options when creating an Element.
+				// (Note that this demo uses a wider set of styles than the guide below.)
+				var style = {
+				base: {
+				color: '#32325d',
+				lineHeight: '24px',
+				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
+				fontSmoothing: 'antialiased',
+				fontSize: '16px',
+				'::placeholder': {
+				color: '#aab7c4'
+				}
+				},
+				invalid: {
+				color: '#fa755a',
+				iconColor: '#fa755a'
+				}
+				};
+
+				// Create an instance of the card Element
+				var card = elements.create('card', {style: style});
+
+				// Add an instance of the card Element into the `card-element` <div>
+				card.mount('#card-element');
+
+				// Handle real-time validation errors from the card Element.
+				card.addEventListener('change', function(event) {
+				var displayError = document.getElementById('card-errors');
+				if (event.error) {
+				displayError.textContent = event.error.message;
+				} else {
+				displayError.textContent = '';
+				}
+				});
+
+				// Handle form submission
+				var form = document.getElementById('payment-form');
+				console.log(form);
+				form.addEventListener('submit', function(event) {
+				event.preventDefault();
+				<?php
+				if (empty($conf->global->STRIPE_USE_3DSECURE)) {	// Ask credit card directly, no 3DS test
+					?>
+					/* Use token */
+					stripe.createToken(card).then(function(result) {
+					if (result.error) {
+					// Inform the user if there was an error
+					var errorElement = document.getElementById('card-errors');
+					errorElement.textContent = result.error.message;
+					} else {
+					// Send the token to your server
+					stripeTokenHandler(result.token);
+					}
+					});
+					<?php
+				} else // Ask credit card with 3DS test
+				{
+					?>
+					/* Use 3DS source */
+					stripe.createSource(card).then(function(result) {
+					if (result.error) {
+					// Inform the user if there was an error
+					var errorElement = document.getElementById('card-errors');
+					errorElement.textContent = result.error.message;
+					} else {
+					// Send the source to your server
+					stripeSourceHandler(result.source);
+					}
+					});
+					<?php
+				}
+				?>
+				});
+
+
+				/* Insert the Token into the form so it gets submitted to the server */
+				function stripeTokenHandler(token) {
+				// Insert the token ID into the form so it gets submitted to the server
+				var form = document.getElementById('payment-form');
+
+				var hiddenInput = document.createElement('input');
+				hiddenInput.setAttribute('type', 'hidden');
+				hiddenInput.setAttribute('name', 'stripeToken');
+				hiddenInput.setAttribute('value', token.id);
+				form.appendChild(hiddenInput);
+
+				var hiddenInput2 = document.createElement('input');
+				hiddenInput2.setAttribute('type', 'hidden');
+				hiddenInput2.setAttribute('name', 'token');
+				hiddenInput2.setAttribute('value', '<?php echo newToken(); ?>');
+				form.appendChild(hiddenInput2);
+
+				// Submit the form
+				jQuery('#buttontopay').hide();
+				jQuery('#hourglasstopay').show();
+				console.log("submit token");
+				form.submit();
+				}
+
+				/* Insert the Source into the form so it gets submitted to the server */
+				function stripeSourceHandler(source) {
+				// Insert the source ID into the form so it gets submitted to the server
+				var form = document.getElementById('payment-form');
+
+				var hiddenInput = document.createElement('input');
+				hiddenInput.setAttribute('type', 'hidden');
+				hiddenInput.setAttribute('name', 'stripeSource');
+				hiddenInput.setAttribute('value', source.id);
+				form.appendChild(hiddenInput);
+
+				var hiddenInput2 = document.createElement('input');
+				hiddenInput2.setAttribute('type', 'hidden');
+				hiddenInput2.setAttribute('name', 'token');
+				hiddenInput2.setAttribute('value', '<?php echo newToken(); ?>');
+				form.appendChild(hiddenInput2);
+
+				// Submit the form
+				jQuery('#buttontopay').hide();
+				jQuery('#hourglasstopay').show();
+				console.log("submit source");
+				form.submit();
+				}
+
+				<?php
+			}
+
+			print '</script>';
+		}
+	}
+	// This hook is used to show the embedded form to make payments with external payment modules (ie Payzen, ...)
+	$parameters = [
+		'paymentmethod' => $paymentmethod,
+		'amount' => price2num(GETPOST("newamount"), 'MT'),
+		'tag' => GETPOST("tag", 'alpha'),
+		'dopayment' => GETPOST('dopayment', 'alpha')
+	];
+	$reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
+}
+
+
+htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
+
+llxFooter('', 'public');
+
+$db->close();

From f82d1d246d303904abed30b1c1067f9f1bce85e7 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 09:45:32 +0200
Subject: [PATCH 035/135] cleanup on the index registration page

---
 htdocs/public/project/index.php | 618 +-------------------------------
 1 file changed, 8 insertions(+), 610 deletions(-)

diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 9b04890084e..7ff74c31cb9 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -85,6 +85,12 @@ $id = dol_decode(GETPOST('id'), $dolibarr_main_instance_unique_id);
 //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
 $urlwithroot = DOL_MAIN_URL_ROOT; // This is to use same domain name than current. For Paypal payment, we can use internal URL like localhost.
 
+$project = new Project($db);
+$resultproject = $project->fetch($id);
+if ($resultproject < 0) {
+	$error++;
+	$errmsg .= $project->error;
+}
 
 /*
  * Actions
@@ -180,6 +186,7 @@ if (!empty($conf->global->PAYMENT_NEWFORM_TEXT)) {
 if (empty($text)) {
 	$text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
 	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
 }
 print $text;
 
@@ -192,103 +199,10 @@ $var = false;
 
 $object = null;
 
-
-// Free payment
-if (!$source) {
-	$found = true;
-	$tag = GETPOST("tag", 'alpha');
-	if (GETPOST('fulltag', 'alpha')) {
-		$fulltag = GETPOST('fulltag', 'alpha');
-	} else {
-		$fulltag = "TAG=".$tag;
-	}
-
-}
-
-
-// Payment on customer order
-if ($source == 'order') {
-	$found = true;
-	$langs->load("orders");
-
-	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-
-	$order = new Commande($db);
-	$result = $order->fetch('', $ref);
-	if ($result <= 0) {
-		$mesg = $order->error;
-		$error++;
-	} else {
-		$result = $order->fetch_thirdparty($order->socid);
-	}
-	$object = $order;
-
-	if (GETPOST('fulltag', 'alpha')) {
-		$fulltag = GETPOST('fulltag', 'alpha');
-	} else {
-		$fulltag = 'ORD='.$order->id.'.CUS='.$order->thirdparty->id;
-		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
-		}
-	}
-	$fulltag = dol_string_unaccent($fulltag);
-}
-
-
-// Payment on customer invoice
-if ($source == 'invoice') {
-	$found = true;
-	$langs->load("bills");
-
-	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-
-	$invoice = new Facture($db);
-	$result = $invoice->fetch('', $ref);
-	if ($result <= 0) {
-		$mesg = $invoice->error;
-		$error++;
-	} else {
-		$result = $invoice->fetch_thirdparty($invoice->socid);
-	}
-	$object = $invoice;
-
-	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
-		$amount = price2num($invoice->total_ttc - ($invoice->getSommePaiement() + $invoice->getSumCreditNotesUsed() + $invoice->getSumDepositsUsed()));
-		if (GETPOST("amount", 'alpha')) {
-			$amount = GETPOST("amount", 'alpha');
-		}
-		$amount = price2num($amount);
-	}
-
-	if (GETPOST('fulltag', 'alpha')) {
-		$fulltag = GETPOST('fulltag', 'alpha');
-	} else {
-		$fulltag = 'INV='.$invoice->id.'.CUS='.$invoice->thirdparty->id;
-		if (!empty($TAG)) {
-			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
-		}
-	}
-	$fulltag = dol_string_unaccent($fulltag);
-
-	$labeldesc = $langs->trans("Invoice").' '.$invoice->ref;
-	if (GETPOST('desc', 'alpha')) {
-		$labeldesc = GETPOST('desc', 'alpha');
-	}
-	print '<input type="hidden" name="desc" value="'.dol_escape_htmltag($labeldesc).'">'."\n";
-}
-
-if (!$found && !$mesg) {
-	$mesg = $langs->trans("ErrorBadParameters");
-}
-
-if ($mesg) {
-	print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
-}
-
 print "\n";
 
 
-// Show all payment mode buttons (Stripe, Paypal, ...)
+// Show all action buttons
 print '<br>';
 print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
 print '<br><br>';
@@ -306,522 +220,6 @@ print '</div>'."\n";
 print '<br>';
 
 
-
-// Add more content on page for some services
-if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payment mode
-	// Stripe
-	if (GETPOST('dopayment_stripe', 'alpha')) {
-		// Personalized checkout
-		print '<style>
-	    /**
-	     * The CSS shown here will not be introduced in the Quickstart guide, but shows
-	     * how you can use CSS to style your Element s container.
-	     */
-	    .StripeElement {
-	        background-color: white;
-	        padding: 8px 12px;
-	        border-radius: 4px;
-	        border: 1px solid transparent;
-	        box-shadow: 0 1px 3px 0 #e6ebf1;
-	        -webkit-transition: box-shadow 150ms ease;
-	        transition: box-shadow 150ms ease;
-	    }
-
-	    .StripeElement--focus {
-	        box-shadow: 0 1px 3px 0 #cfd7df;
-	    }
-
-	    .StripeElement--invalid {
-	        border-color: #fa755a;
-	    }
-
-	    .StripeElement--webkit-autofill {
-	        background-color: #fefde5 !important;
-	    }
-	    </style>';
-
-		print '<br>';
-
-		print '<!-- Form payment-form STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = '.$conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION.' STRIPE_USE_NEW_CHECKOUT = '.$conf->global->STRIPE_USE_NEW_CHECKOUT.' -->'."\n";
-		print '<form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">'."\n";
-
-		print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
-		print '<input type="hidden" name="dopayment_stripe" value="1">'."\n";
-		print '<input type="hidden" name="action" value="charge">'."\n";
-		print '<input type="hidden" name="tag" value="'.$TAG.'">'."\n";
-		print '<input type="hidden" name="s" value="'.$source.'">'."\n";
-		print '<input type="hidden" name="ref" value="'.$REF.'">'."\n";
-		print '<input type="hidden" name="fulltag" value="'.$FULLTAG.'">'."\n";
-		print '<input type="hidden" name="suffix" value="'.$suffix.'">'."\n";
-		print '<input type="hidden" name="securekey" value="'.$SECUREKEY.'">'."\n";
-		print '<input type="hidden" name="e" value="'.$entity.'" />';
-		print '<input type="hidden" name="amount" value="'.$amount.'">'."\n";
-		print '<input type="hidden" name="currency" value="'.$currency.'">'."\n";
-		print '<input type="hidden" name="forcesandbox" value="'.GETPOST('forcesandbox', 'int').'" />';
-		print '<input type="hidden" name="email" value="'.GETPOST('email', 'alpha').'" />';
-		print '<input type="hidden" name="thirdparty_id" value="'.GETPOST('thirdparty_id', 'int').'" />';
-
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || !empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {	// Use a SCA ready method
-			require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
-
-			$service = 'StripeLive';
-			$servicestatus = 1;
-			if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha')) {
-				$service = 'StripeTest';
-				$servicestatus = 0;
-			}
-
-			$stripe = new Stripe($db);
-			$stripeacc = $stripe->getStripeAccount($service);
-			$stripecu = null;
-			if (is_object($object) && is_object($object->thirdparty)) {
-				$stripecu = $stripe->customerStripe($object->thirdparty, $stripeacc, $servicestatus, 1);
-			}
-
-			if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-				$noidempotency_key = (GETPOSTISSET('noidempotency') ? GETPOST('noidempotency', 'int') : 0); // By default noidempotency is unset, so we must use a different tag/ref for each payment. If set, we can pay several times the same tag/ref.
-				$paymentintent = $stripe->getPaymentIntent($amount, $currency, $tag, 'Stripe payment: '.$fulltag.(is_object($object) ? ' ref='.$object->ref : ''), $object, $stripecu, $stripeacc, $servicestatus, 0, 'automatic', false, null, 0, $noidempotency_key);
-				// The paymentintnent has status 'requires_payment_method' (even if paymentintent was already paid)
-				//var_dump($paymentintent);
-				if ($stripe->error) {
-					setEventMessages($stripe->error, null, 'errors');
-				}
-			}
-		}
-
-		//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
-		//{
-		print '
-        <table id="dolpaymenttable" summary="Payment form" class="center">
-        <tbody><tr><td class="textpublicpayment">';
-
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-			print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
-		}
-
-		print '<div class="form-row left">';
-		print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
-
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-			print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>';
-		}
-
-		print '<div id="card-element">
-        <!-- a Stripe Element will be inserted here. -->
-        </div>';
-
-		print '<!-- Used to display form errors -->
-        <div id="card-errors" role="alert"></div>
-        </div>';
-
-		print '<br>';
-		print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
-		print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif">';
-
-		print '</td></tr></tbody>';
-		print '</table>';
-		//}
-
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-			if (empty($paymentintent)) {
-				print '<center>'.$langs->trans("Error").'</center>';
-			} else {
-				print '<input type="hidden" name="paymentintent_id" value="'.$paymentintent->id.'">';
-				//$_SESSION["paymentintent_id"] = $paymentintent->id;
-			}
-		}
-
-		print '</form>'."\n";
-
-
-		// JS Code for Stripe
-		if (empty($stripearrayofkeys['publishable_key'])) {
-			$langs->load("errors");
-			print info_admin($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Stripe")), 0, 0, 'error');
-		} else {
-			print '<!-- JS Code for Stripe components -->';
-			print '<script src="https://js.stripe.com/v3/"></script>'."\n";
-			print '<!-- urllogofull = '.$urllogofull.' -->'."\n";
-
-			// Code to ask the credit card. This use the default "API version". No way to force API version when using JS code.
-			print '<script type="text/javascript" language="javascript">'."\n";
-
-			if (!empty($conf->global->STRIPE_USE_NEW_CHECKOUT)) {
-				$amountstripe = $amount;
-
-				// Correct the amount according to unit of currency
-				// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
-				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-				if (!in_array($currency, $arrayzerounitcurrency)) {
-					$amountstripe = $amountstripe * 100;
-				}
-
-				$ipaddress = getUserRemoteIP();
-				$metadata = array('dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>$ipaddress);
-				if (is_object($object)) {
-					$metadata['dol_type'] = $object->element;
-					$metadata['dol_id'] = $object->id;
-
-					$ref = $object->ref;
-				}
-
-				try {
-					$arrayforpaymentintent = array(
-						'description'=>'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
-						"metadata" => $metadata
-					);
-					if ($TAG) {
-						$arrayforpaymentintent["statement_descriptor"] = dol_trunc($TAG, 10, 'right', 'UTF-8', 1); // 22 chars that appears on bank receipt (company + description)
-					}
-
-					$arrayforcheckout = array(
-						'payment_method_types' => array('card'),
-						'line_items' => array(array(
-							'name' => $langs->transnoentitiesnoconv("Payment").' '.$TAG, // Label of product line
-							'description' => 'Stripe payment: '.$FULLTAG.($ref ? ' ref='.$ref : ''),
-							'amount' => $amountstripe,
-							'currency' => $currency,
-							//'images' => array($urllogofull),
-							'quantity' => 1,
-						)),
-						'client_reference_id' => $FULLTAG,
-						'success_url' => $urlok,
-						'cancel_url' => $urlko,
-						'payment_intent_data' => $arrayforpaymentintent
-					);
-					if ($stripecu) {
-						$arrayforcheckout['customer'] = $stripecu;
-					} elseif (GETPOST('email', 'alpha') && isValidEmail(GETPOST('email', 'alpha'))) {
-						$arrayforcheckout['customer_email'] = GETPOST('email', 'alpha');
-					}
-					$sessionstripe = \Stripe\Checkout\Session::create($arrayforcheckout);
-
-					$remoteip = getUserRemoteIP();
-
-					// Save some data for the paymentok
-					$_SESSION["currencyCodeType"] = $currency;
-					$_SESSION["paymentType"] = '';
-					$_SESSION["FinalPaymentAmt"] = $amount;
-					$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
-					$_SESSION['payerID'] = is_object($stripecu) ? $stripecu->id : '';
-					$_SESSION['TRANSACTIONID'] = $sessionstripe->id;
-				} catch (Exception $e) {
-					print $e->getMessage();
-				}
-				?>
-				// Code for payment with option STRIPE_USE_NEW_CHECKOUT set
-
-				// Create a Stripe client.
-				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-
-				// Create an instance of Elements
-				var elements = stripe.elements();
-
-				// Custom styling can be passed to options when creating an Element.
-				// (Note that this demo uses a wider set of styles than the guide below.)
-				var style = {
-				base: {
-				color: '#32325d',
-				lineHeight: '24px',
-				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-				fontSmoothing: 'antialiased',
-				fontSize: '16px',
-				'::placeholder': {
-				color: '#aab7c4'
-				}
-				},
-				invalid: {
-				color: '#fa755a',
-				iconColor: '#fa755a'
-				}
-				};
-
-				var cardElement = elements.create('card', {style: style});
-
-				// Comment this to avoid the redirect
-				stripe.redirectToCheckout({
-				// Make the id field from the Checkout Session creation API response
-				// available to this file, so you can provide it as parameter here
-				// instead of the {{CHECKOUT_SESSION_ID}} placeholder.
-				sessionId: '<?php print $sessionstripe->id; ?>'
-				}).then(function (result) {
-				// If `redirectToCheckout` fails due to a browser or network
-				// error, display the localized error message to your customer
-				// using `result.error.message`.
-				});
-
-
-				<?php
-			} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
-				?>
-				// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
-
-				// Create a Stripe client.
-				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-
-				// Create an instance of Elements
-				var elements = stripe.elements();
-
-				// Custom styling can be passed to options when creating an Element.
-				// (Note that this demo uses a wider set of styles than the guide below.)
-				var style = {
-				base: {
-				color: '#32325d',
-				lineHeight: '24px',
-				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-				fontSmoothing: 'antialiased',
-				fontSize: '16px',
-				'::placeholder': {
-				color: '#aab7c4'
-				}
-				},
-				invalid: {
-				color: '#fa755a',
-				iconColor: '#fa755a'
-				}
-				};
-
-				var cardElement = elements.create('card', {style: style});
-
-				// Add an instance of the card Element into the `card-element` <div>
-				cardElement.mount('#card-element');
-
-				// Handle real-time validation errors from the card Element.
-				cardElement.addEventListener('change', function(event) {
-				var displayError = document.getElementById('card-errors');
-				if (event.error) {
-				console.log("Show event error (like 'Incorrect card number', ...)");
-				displayError.textContent = event.error.message;
-				} else {
-				console.log("Reset error message");
-				displayError.textContent = '';
-				}
-				});
-
-				// Handle form submission
-				var cardholderName = document.getElementById('cardholder-name');
-				var cardButton = document.getElementById('buttontopay');
-				var clientSecret = cardButton.dataset.secret;
-
-				cardButton.addEventListener('click', function(event) {
-				console.log("We click on buttontopay");
-				event.preventDefault();
-
-				if (cardholderName.value == '')
-				{
-				console.log("Field Card holder is empty");
-				var displayError = document.getElementById('card-errors');
-				displayError.textContent = '<?php print dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardOwner"))); ?>';
-				}
-				else
-				{
-				/* Disable button to pay and show hourglass cursor */
-				jQuery('#hourglasstopay').show();
-				jQuery('#buttontopay').hide();
-
-				stripe.handleCardPayment(
-				clientSecret, cardElement, {
-				payment_method_data: {
-				billing_details: {
-				name: cardholderName.value
-				<?php if (GETPOST('email', 'alpha') || (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->email))) {
-					?>, email: '<?php echo dol_escape_js(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $object->thirdparty->email); ?>'<?php
-				} ?>
-				<?php if (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->phone)) {
-					?>, phone: '<?php echo dol_escape_js($object->thirdparty->phone); ?>'<?php
-				} ?>
-				<?php if (is_object($object) && is_object($object->thirdparty)) {
-					?>, address: {
-					city: '<?php echo dol_escape_js($object->thirdparty->town); ?>',
-					<?php if ($object->thirdparty->country_code) {
-						?>country: '<?php echo dol_escape_js($object->thirdparty->country_code); ?>',<?php
-					} ?>
-					line1: '<?php echo dol_escape_js(preg_replace('/\s\s+/', ' ', $object->thirdparty->address)); ?>',
-					postal_code: '<?php echo dol_escape_js($object->thirdparty->zip); ?>'
-					}
-				<?php } ?>
-				}
-				},
-				save_payment_method:<?php if ($stripecu) {
-					print 'true';
-				} else {
-					print 'false';
-				} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
-				}
-				).then(function(result) {
-				console.log(result);
-				if (result.error) {
-				console.log("Error on result of handleCardPayment");
-				jQuery('#buttontopay').show();
-				jQuery('#hourglasstopay').hide();
-				// Inform the user if there was an error
-				var errorElement = document.getElementById('card-errors');
-				errorElement.textContent = result.error.message;
-				} else {
-				// The payment has succeeded. Display a success message.
-				console.log("No error on result of handleCardPayment, so we submit the form");
-				// Submit the form
-				jQuery('#buttontopay').hide();
-				jQuery('#hourglasstopay').show();
-				// Send form (action=charge that will do nothing)
-				jQuery('#payment-form').submit();
-				}
-				});
-				}
-				});
-
-				<?php
-			} else {
-				// Old method (not SCA ready)
-				?>
-				// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
-
-				// Create a Stripe client.
-				var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-
-				// Create an instance of Elements
-				var elements = stripe.elements();
-
-				// Custom styling can be passed to options when creating an Element.
-				// (Note that this demo uses a wider set of styles than the guide below.)
-				var style = {
-				base: {
-				color: '#32325d',
-				lineHeight: '24px',
-				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-				fontSmoothing: 'antialiased',
-				fontSize: '16px',
-				'::placeholder': {
-				color: '#aab7c4'
-				}
-				},
-				invalid: {
-				color: '#fa755a',
-				iconColor: '#fa755a'
-				}
-				};
-
-				// Create an instance of the card Element
-				var card = elements.create('card', {style: style});
-
-				// Add an instance of the card Element into the `card-element` <div>
-				card.mount('#card-element');
-
-				// Handle real-time validation errors from the card Element.
-				card.addEventListener('change', function(event) {
-				var displayError = document.getElementById('card-errors');
-				if (event.error) {
-				displayError.textContent = event.error.message;
-				} else {
-				displayError.textContent = '';
-				}
-				});
-
-				// Handle form submission
-				var form = document.getElementById('payment-form');
-				console.log(form);
-				form.addEventListener('submit', function(event) {
-				event.preventDefault();
-				<?php
-				if (empty($conf->global->STRIPE_USE_3DSECURE)) {	// Ask credit card directly, no 3DS test
-					?>
-					/* Use token */
-					stripe.createToken(card).then(function(result) {
-					if (result.error) {
-					// Inform the user if there was an error
-					var errorElement = document.getElementById('card-errors');
-					errorElement.textContent = result.error.message;
-					} else {
-					// Send the token to your server
-					stripeTokenHandler(result.token);
-					}
-					});
-					<?php
-				} else // Ask credit card with 3DS test
-				{
-					?>
-					/* Use 3DS source */
-					stripe.createSource(card).then(function(result) {
-					if (result.error) {
-					// Inform the user if there was an error
-					var errorElement = document.getElementById('card-errors');
-					errorElement.textContent = result.error.message;
-					} else {
-					// Send the source to your server
-					stripeSourceHandler(result.source);
-					}
-					});
-					<?php
-				}
-				?>
-				});
-
-
-				/* Insert the Token into the form so it gets submitted to the server */
-				function stripeTokenHandler(token) {
-				// Insert the token ID into the form so it gets submitted to the server
-				var form = document.getElementById('payment-form');
-
-				var hiddenInput = document.createElement('input');
-				hiddenInput.setAttribute('type', 'hidden');
-				hiddenInput.setAttribute('name', 'stripeToken');
-				hiddenInput.setAttribute('value', token.id);
-				form.appendChild(hiddenInput);
-
-				var hiddenInput2 = document.createElement('input');
-				hiddenInput2.setAttribute('type', 'hidden');
-				hiddenInput2.setAttribute('name', 'token');
-				hiddenInput2.setAttribute('value', '<?php echo newToken(); ?>');
-				form.appendChild(hiddenInput2);
-
-				// Submit the form
-				jQuery('#buttontopay').hide();
-				jQuery('#hourglasstopay').show();
-				console.log("submit token");
-				form.submit();
-				}
-
-				/* Insert the Source into the form so it gets submitted to the server */
-				function stripeSourceHandler(source) {
-				// Insert the source ID into the form so it gets submitted to the server
-				var form = document.getElementById('payment-form');
-
-				var hiddenInput = document.createElement('input');
-				hiddenInput.setAttribute('type', 'hidden');
-				hiddenInput.setAttribute('name', 'stripeSource');
-				hiddenInput.setAttribute('value', source.id);
-				form.appendChild(hiddenInput);
-
-				var hiddenInput2 = document.createElement('input');
-				hiddenInput2.setAttribute('type', 'hidden');
-				hiddenInput2.setAttribute('name', 'token');
-				hiddenInput2.setAttribute('value', '<?php echo newToken(); ?>');
-				form.appendChild(hiddenInput2);
-
-				// Submit the form
-				jQuery('#buttontopay').hide();
-				jQuery('#hourglasstopay').show();
-				console.log("submit source");
-				form.submit();
-				}
-
-				<?php
-			}
-
-			print '</script>';
-		}
-	}
-	// This hook is used to show the embedded form to make payments with external payment modules (ie Payzen, ...)
-	$parameters = [
-		'paymentmethod' => $paymentmethod,
-		'amount' => price2num(GETPOST("newamount"), 'MT'),
-		'tag' => GETPOST("tag", 'alpha'),
-		'dopayment' => GETPOST('dopayment', 'alpha')
-	];
-	$reshook = $hookmanager->executeHooks('doPayment', $parameters, $object, $action);
-}
-
-
 htmlPrintOnlinePaymentFooter($mysoc, $langs, 1, $suffix, $object);
 
 llxFooter('', 'public');

From 7405813ad0df90922de51586627cd4c3a25b57e8 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 10:24:36 +0200
Subject: [PATCH 036/135] now displays only buttons if the corresponding
 boolean is checked

---
 htdocs/compta/paiement.php          |  2 +-
 htdocs/public/payment/paymentok.php |  6 +-----
 htdocs/public/project/index.php     | 32 ++++++++++++-----------------
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 94b114c03d8..418bca03d83 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -253,7 +253,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			// Create payment and update this->multicurrency_amounts if this->amounts filled or
 			// this->amounts if this->multicurrency_amounts filled.
-			$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
+			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
 			if ($paiement_id < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index a52ddb5fbcc..c4f6b0a012c 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -167,11 +167,7 @@ if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
 		// Creation of payment line
 		$paiement = new Paiement($db);
 		$paiement->datepaye     = dol_now();
-		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
-		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
-		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
-		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
-		$paiement->note_private = GETPOST('comment', 'alpha');
+		$paiement->amounts[]    = $paidinvoice->total_ttc; // Array with all payments dispatching with invoice id
 
 		// Validating the attendee
 		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 7ff74c31cb9..ff6da63be9a 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -172,22 +172,10 @@ if ($urllogo) {
 
 print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
 
-// Output introduction text
-$text = '';
-if (!empty($conf->global->PAYMENT_NEWFORM_TEXT)) {
-	$langs->load("members");
-	if (preg_match('/^\((.*)\)$/', $conf->global->PAYMENT_NEWFORM_TEXT, $reg)) {
-		$text .= $langs->trans($reg[1])."<br>\n";
-	} else {
-		$text .= $conf->global->PAYMENT_NEWFORM_TEXT."<br>\n";
-	}
-	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
-}
-if (empty($text)) {
-	$text .= '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
-	$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
-	$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
-}
+$text  = '<tr><td class="textpublicpayment"><br><strong>'.$langs->trans("EvntOrgRegistrationWelcomeMessage").'</strong></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$langs->trans("EvntOrgRegistrationHelpMessage").' '.$id.'.<br><br></td></tr>'."\n";
+$text .= '<tr><td class="textpublicpayment">'.$project->note_public.'<br><br></td></tr>'."\n";;
+
 print $text;
 
 // Output payment summary form
@@ -204,11 +192,17 @@ print "\n";
 
 // Show all action buttons
 print '<br>';
-print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
-print '<br><br>';
+// Output introduction text
+if($project->accept_conference_suggestions){
+	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
+	print '<br><br>';
+}
 print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
 print '<br><br>';
-print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
+if($project->accept_booth_suggestions){
+	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
+}
+
 
 
 print '</td></tr>'."\n";

From b43e85dbf48f3cc50779a9bed03ca34827e2144a Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 10:27:32 +0200
Subject: [PATCH 037/135] added global dolibarr_main_instance_unique_id in
 attendeesubscription page

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index b5ae6b0ba01..bb2de7a590c 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -71,6 +71,8 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
+global $dolibarr_main_instance_unique_id;
+
 // Init vars
 $errmsg = '';
 $num = 0;

From 3b17a0d66ae6b67e462051311f7ece6b6669eedc Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 10:42:50 +0200
Subject: [PATCH 038/135] wip on paymentok page

---
 htdocs/public/payment/paymentok.php | 40 +++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index c4f6b0a012c..533ce56cee1 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -164,18 +164,36 @@ if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
 	if ($resultinvoice < 0) {
 		setEventMessages(null, $paidinvoice->errors, "errors");
 	} else {
-		// Creation of payment line
-		$paiement = new Paiement($db);
-		$paiement->datepaye     = dol_now();
-		$paiement->amounts[]    = $paidinvoice->total_ttc; // Array with all payments dispatching with invoice id
-
-		// Validating the attendee
-		$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-		$resultattendee = $attendeetovalidate->fetch($ref);
-		if ($resultattendee < 0) {
-			setEventMessages(null, $attendeetovalidate->errors, "errors");
+		// Finding thirdparty
+		$thirdparty = new Societe($db);
+		$resultthirdparty = $thirdparty->fetch($paidinvoice->socid);
+		if ($resultthirdparty <= 0) {
+			$mesg = $thirdparty->error;
+			$error++;
 		} else {
-			$attendeetovalidate->setStatut(1);
+			// Creation of payment line
+			$paiement 				= new Paiement($db);
+			$paiement->facid 		= $paidinvoice->id;
+			$paiement->datepaye     = dol_now();
+			$paiement->amount       = $paidinvoice->total_ttc;
+			$paiement->amounts[]    = $paidinvoice->total_ttc;
+
+			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
+			if ($paiement_id < 0) {
+				setEventMessages($paiement->error, $paiement->errors, 'errors');
+				$error++;
+			}
+			else {
+				// Validating the attendee
+				$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+				$resultattendee = $attendeetovalidate->fetch($ref);
+				if ($resultattendee < 0) {
+					setEventMessages(null, $attendeetovalidate->errors, "errors");
+				} else {
+					$attendeetovalidate->setStatut(1);
+					// @todo send email
+				}
+			}
 		}
 	}
 }

From 5c490ca57e4e9794b55bcf86fbdc0b409ffbab8c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 10:56:45 +0200
Subject: [PATCH 039/135] security added to subscriptionok page

---
 .../attendee_subscription.php                 |  2 +-
 .../eventorganization/subscriptionok.php      | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index bb2de7a590c..03fa023ad11 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -349,7 +349,7 @@ if (empty($reshook) && $action == 'add') {
 			// No price has been set
 			// Validating the subscription
 			$confattendee->setStatut(1);
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php';
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
 			Header("Location: ".$redirection);
 			exit;
 		}
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index c12c1053e97..e51358f907d 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -56,12 +56,29 @@ if (!empty($conf->paypal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 }
 
+global $dolibarr_main_instance_unique_id, $dolibarr_main_url_root, $mysoc;
+
 $langs->loadLangs(array("main", "companies", "install", "other", "eventorganization"));
 
 $object = new stdClass(); // For triggers
 
 $error = 0;
 
+// Security check
+$securekey = dol_decode(GETPOST('securekey'), $dolibarr_main_instance_unique_id);
+if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY) {
+	print $langs->trans('MissingOrBadSecureKey');
+	exit;
+}
+
+$idthirdparty = dol_decode(GETPOST('idthirdparty'), $dolibarr_main_instance_unique_id);
+
+$thirdparty = new Societe($db);
+$resthirdparty = $thirdparty->fetch($idthirdparty);
+if ($resthirdparty<0) {
+	$error++;
+	$errmsg .= $thirdparty->error;
+}
 
 /*
  * Actions
@@ -153,4 +170,4 @@ unset($_SESSION["TRANSACTIONID"]);
 
 llxFooter('', 'public');
 
-$db->close();
\ No newline at end of file
+$db->close();

From 529909c3d1a8bd39729e72170074920acfdc2867 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 11:35:31 +0200
Subject: [PATCH 040/135] wip on sending mails

---
 .../eventorganization/subscriptionok.php      | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index e51358f907d..7fc72f78e7c 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -80,6 +80,38 @@ if ($resthirdparty<0) {
 	$errmsg .= $thirdparty->error;
 }
 
+// Send subscription email
+include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+$formmail = new FormMail($db);
+// Set output language
+$outputlangs = new Translate('', $conf);
+$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+// Load traductions files required by page
+$outputlangs->loadLangs(array("main", "members"));
+// Get email content from template
+$arraydefaultmessage = null;
+$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+
+if (!empty($labeltouse)) {
+	$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+}
+
+if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+	$subject = $arraydefaultmessage->topic;
+	$msg     = $arraydefaultmessage->content;
+}
+
+$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+complete_substitutions_array($substitutionarray, $outputlangs, $object);
+$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+if ($subjecttosend && $texttosend) {
+	$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
+
+	$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
+}
+
 /*
  * Actions
  */

From d0d0e0390b748758d075cd63425c3124c382cdb0 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 12:28:34 +0200
Subject: [PATCH 041/135] wip on mail

---
 .../eventorganization/subscriptionok.php      | 19 ++++++++++++++++++-
 htdocs/public/payment/paymentok.php           |  5 +----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 7fc72f78e7c..3fcf74a4c0c 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -109,7 +109,24 @@ $texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 if ($subjecttosend && $texttosend) {
 	$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
 
-	$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
+	global $conf, $langs;
+
+	// Envoi mail confirmation
+	$from = $conf->email_from;
+	if (!empty($conf->global->ADHERENT_MAIL_FROM)) {
+		$from = $conf->global->ADHERENT_MAIL_FROM;
+	}
+
+	$trackid = 'mem'.$this->id;
+
+	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	$mailfile = new CMailFile($subjecttosend, $thirdparty->email, $from, $texttosend, array(), array(), array(), "", "", 0, -1, '', '', $trackid, $moreinheader);
+	if ($mailfile->sendfile()) {
+		return 1;
+	} else {
+		$this->error = $langs->trans("ErrorFailedToSendMail", $from, $this->email).'. '.$mailfile->error;
+		return -1;
+	}
 }
 
 /*
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 533ce56cee1..90cf38a6051 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -177,13 +177,11 @@ if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
 			$paiement->datepaye     = dol_now();
 			$paiement->amount       = $paidinvoice->total_ttc;
 			$paiement->amounts[]    = $paidinvoice->total_ttc;
-
 			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
 			if ($paiement_id < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
-			}
-			else {
+			} else {
 				// Validating the attendee
 				$attendeetovalidate = new ConferenceOrBoothAttendee($db);
 				$resultattendee = $attendeetovalidate->fetch($ref);
@@ -191,7 +189,6 @@ if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
 					setEventMessages(null, $attendeetovalidate->errors, "errors");
 				} else {
 					$attendeetovalidate->setStatut(1);
-					// @todo send email
 				}
 			}
 		}

From 2cde31d17c3fd9300c0c99341a80c311c1a4c6da Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 14:39:41 +0200
Subject: [PATCH 042/135] creation of ATT and BOO payment event

---
 htdocs/public/payment/paymentok.php | 162 +++++++++++++++++++++-------
 1 file changed, 123 insertions(+), 39 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 90cf38a6051..950d68560b5 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -156,45 +156,6 @@ $object = new stdClass(); // For triggers
 
 $error = 0;
 
-// After a conference attendee payment
-if ($subscription == 'subscriptionok' && $ref == $reffrompayment) {
-	// Looking for the invoice to which add a payment
-	$paidinvoice = new Facture($db);
-	$resultinvoice = $paidinvoice->fetch($invoiceref);
-	if ($resultinvoice < 0) {
-		setEventMessages(null, $paidinvoice->errors, "errors");
-	} else {
-		// Finding thirdparty
-		$thirdparty = new Societe($db);
-		$resultthirdparty = $thirdparty->fetch($paidinvoice->socid);
-		if ($resultthirdparty <= 0) {
-			$mesg = $thirdparty->error;
-			$error++;
-		} else {
-			// Creation of payment line
-			$paiement 				= new Paiement($db);
-			$paiement->facid 		= $paidinvoice->id;
-			$paiement->datepaye     = dol_now();
-			$paiement->amount       = $paidinvoice->total_ttc;
-			$paiement->amounts[]    = $paidinvoice->total_ttc;
-			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
-			if ($paiement_id < 0) {
-				setEventMessages($paiement->error, $paiement->errors, 'errors');
-				$error++;
-			} else {
-				// Validating the attendee
-				$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-				$resultattendee = $attendeetovalidate->fetch($ref);
-				if ($resultattendee < 0) {
-					setEventMessages(null, $attendeetovalidate->errors, "errors");
-				} else {
-					$attendeetovalidate->setStatut(1);
-				}
-			}
-		}
-	}
-}
-
 /*
  * Actions
  */
@@ -822,6 +783,129 @@ if ($ispaymentok) {
 			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
+	} elseif (array_key_exists('ATT', $tmptag) && $tmptag['INV'] > 0) {
+		// Record payment
+		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+		$object = new Facture($db);
+		$result = $object->fetch($tmptag['INV']);
+		if ($result) {
+			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
+
+			$paymentTypeId = 0;
+			if ($paymentmethod == 'paybox') {
+				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if ($paymentmethod == 'paypal') {
+				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if ($paymentmethod == 'stripe') {
+				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if (empty($paymentTypeId)) {
+				$paymentType = $_SESSION["paymentType"];
+				if (empty($paymentType)) {
+					$paymentType = 'CB';
+				}
+				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+			}
+
+			$currencyCodeType = $_SESSION['currencyCodeType'];
+
+			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
+			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
+				$db->begin();
+
+				// Creation of payment line
+				include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+				$paiement = new Paiement($db);
+				$paiement->datepaye = $now;
+				if ($currencyCodeType == $conf->currency) {
+					$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
+				} else {
+					$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
+
+					$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+					$ispostactionok = -1;
+					$error++; // Not yet supported
+				}
+				$paiement->paiementid   = $paymentTypeId;
+				$paiement->num_payment = '';
+				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+				$paiement->ext_payment_id = $TRANSACTIONID;
+				$paiement->ext_payment_site = $service;
+
+				if (!$error) {
+					$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
+					if ($paiement_id < 0) {
+						$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+						$ispostactionok = -1;
+						$error++;
+					} else {
+						$postactionmessages[] = 'Payment created';
+						$ispostactionok = 1;
+					}
+				}
+
+				if (!$error && !empty($conf->banque->enabled)) {
+					$bankaccountid = 0;
+					if ($paymentmethod == 'paybox') {
+						$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+					} elseif ($paymentmethod == 'paypal') {
+						$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+					} elseif ($paymentmethod == 'stripe') {
+						$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+					}
+
+					if ($bankaccountid > 0) {
+						$label = '(CustomerInvoicePayment)';
+						if ($object->type == Facture::TYPE_CREDIT_NOTE) {
+							$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+						}
+						$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
+						if ($result < 0) {
+							$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+							$ispostactionok = -1;
+							$error++;
+						} else {
+							$postactionmessages[] = 'Bank transaction of payment created';
+							$ispostactionok = 1;
+						}
+					} else {
+						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
+						$ispostactionok = -1;
+						$error++;
+					}
+				}
+
+				if (!$error) {
+					$db->commit();
+
+					// Validating the attendee
+					$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+					$resultattendee = $attendeetovalidate->fetch($ref);
+					if ($resultattendee < 0) {
+						setEventMessages(null, $attendeetovalidate->errors, "errors");
+					} else {
+						$attendeetovalidate->setStatut(1);
+					}
+					$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+					Header("Location: ".$redirection);
+					exit;
+
+				} else {
+					$db->rollback();
+				}
+			} else {
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.';
+				$ispostactionok = -1;
+			}
+
+		} else {
+			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
+			$ispostactionok = -1;
+		}
+	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['INV'] > 0) {
+		// BOOTH CASE (to copy and adapt from above)
 	} else {
 		// Nothing done
 	}

From b70e477f471a571408f2521b72533558f0ca3d0c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 14:49:11 +0200
Subject: [PATCH 043/135] removal of the mail sending (not functional yet) in
 the subscriptionok page, it will be moved to the paymentok after payment or
 the attendeesubscription if no payment has to be done

---
 .../attendee_subscription.php                 |  2 +-
 .../eventorganization/subscriptionok.php      | 58 -------------------
 htdocs/public/payment/paymentok.php           | 24 +++++---
 3 files changed, 16 insertions(+), 68 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 03fa023ad11..56855c70b62 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -349,7 +349,7 @@ if (empty($reshook) && $action == 'add') {
 			// No price has been set
 			// Validating the subscription
 			$confattendee->setStatut(1);
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
 			Header("Location: ".$redirection);
 			exit;
 		}
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 3fcf74a4c0c..81db5ac1c02 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -71,64 +71,6 @@ if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY) {
 	exit;
 }
 
-$idthirdparty = dol_decode(GETPOST('idthirdparty'), $dolibarr_main_instance_unique_id);
-
-$thirdparty = new Societe($db);
-$resthirdparty = $thirdparty->fetch($idthirdparty);
-if ($resthirdparty<0) {
-	$error++;
-	$errmsg .= $thirdparty->error;
-}
-
-// Send subscription email
-include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-$formmail = new FormMail($db);
-// Set output language
-$outputlangs = new Translate('', $conf);
-$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-// Load traductions files required by page
-$outputlangs->loadLangs(array("main", "members"));
-// Get email content from template
-$arraydefaultmessage = null;
-$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-
-if (!empty($labeltouse)) {
-	$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
-}
-
-if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-	$subject = $arraydefaultmessage->topic;
-	$msg     = $arraydefaultmessage->content;
-}
-
-$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-complete_substitutions_array($substitutionarray, $outputlangs, $object);
-$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-if ($subjecttosend && $texttosend) {
-	$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
-
-	global $conf, $langs;
-
-	// Envoi mail confirmation
-	$from = $conf->email_from;
-	if (!empty($conf->global->ADHERENT_MAIL_FROM)) {
-		$from = $conf->global->ADHERENT_MAIL_FROM;
-	}
-
-	$trackid = 'mem'.$this->id;
-
-	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-	$mailfile = new CMailFile($subjecttosend, $thirdparty->email, $from, $texttosend, array(), array(), array(), "", "", 0, -1, '', '', $trackid, $moreinheader);
-	if ($mailfile->sendfile()) {
-		return 1;
-	} else {
-		$this->error = $langs->trans("ErrorFailedToSendMail", $from, $this->email).'. '.$mailfile->error;
-		return -1;
-	}
-}
-
 /*
  * Actions
  */
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 950d68560b5..88d50d66a62 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -783,11 +783,11 @@ if ($ispaymentok) {
 			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
 			$ispostactionok = -1;
 		}
-	} elseif (array_key_exists('ATT', $tmptag) && $tmptag['INV'] > 0) {
+	} elseif (array_key_exists('ATT', $tmptag) && $tmptag['ATT'] > 0) {
 		// Record payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
-		$result = $object->fetch($tmptag['INV']);
+		$result = $object->fetch($tmptag['ATT']);
 		if ($result) {
 			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
@@ -888,23 +888,29 @@ if ($ispaymentok) {
 					} else {
 						$attendeetovalidate->setStatut(1);
 					}
-					$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
-					Header("Location: ".$redirection);
-					exit;
 
+					// Redirecting to confirmation page
+					$thirdparty = new Societe($db);
+					$resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc);
+					if ($resultthirdparty < 0) {
+						setEventMessages(null, $thirdparty->errors, "errors");
+					} else {
+						$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+						Header("Location: ".$redirection);
+						exit;
+					}
 				} else {
 					$db->rollback();
 				}
 			} else {
-				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.';
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['ATT'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
-
 		} else {
-			$postactionmessages[] = 'Invoice paid '.$tmptag['INV'].' was not found';
+			$postactionmessages[] = 'Invoice paid '.$tmptag['ATT'].' was not found';
 			$ispostactionok = -1;
 		}
-	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['INV'] > 0) {
+	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['BOO'] > 0) {
 		// BOOTH CASE (to copy and adapt from above)
 	} else {
 		// Nothing done

From 07cd751c59046fb837bece52a4cbb9d5c25cd73c Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 20 Apr 2021 15:51:02 +0200
Subject: [PATCH 044/135] batch status dictionnary

---
 htdocs/admin/dict.php                         | 13 ++++++++-
 .../mysql/data/llx_c_productbatch_status.sql  | 28 +++++++++++++++++++
 .../tables/llx_c_productbatch_status.key.sql  | 19 +++++++++++++
 .../tables/llx_c_productbatch_status.sql      | 25 +++++++++++++++++
 htdocs/langs/en_US/admin.lang                 |  1 +
 htdocs/langs/en_US/productbatch.lang          |  5 ++--
 htdocs/langs/fr_FR/admin.lang                 |  1 +
 htdocs/langs/fr_FR/productbatch.lang          |  6 ++--
 8 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/install/mysql/data/llx_c_productbatch_status.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql
 create mode 100644 htdocs/install/mysql/tables/llx_c_productbatch_status.sql

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 9061fd150b7..8efbbf4cbfa 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0);
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
@@ -146,6 +146,7 @@ $tabname[39] = MAIN_DB_PREFIX."c_prospectcontactlevel";
 $tabname[40] = MAIN_DB_PREFIX."c_stcommcontact";
 $tabname[41] = MAIN_DB_PREFIX."c_transport_mode";
 $tabname[42] = MAIN_DB_PREFIX."c_product_nature";
+$tabname[43] = MAIN_DB_PREFIX."c_productbatch_status";
 
 // Dictionary labels
 $tablib = array();
@@ -191,6 +192,7 @@ $tablib[39] = "DictionaryProspectContactLevel";
 $tablib[40] = "DictionaryProspectContactStatus";
 $tablib[41] = "DictionaryTransportMode";
 $tablib[42] = "DictionaryProductNature";
+$tablib[43] = "DictionaryBatchStatus";
 
 // Requests to extract data
 $tabsql = array();
@@ -236,6 +238,7 @@ $tabsql[39] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_P
 $tabsql[40] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcommcontact";
 $tabsql[41] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_transport_mode";
 $tabsql[42] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_product_nature";
+$tabsql[43] = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_productbatch_status";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -281,6 +284,7 @@ $tabsqlsort[39] = "sortorder ASC";
 $tabsqlsort[40] = "code ASC";
 $tabsqlsort[41] = "code ASC";
 $tabsqlsort[42] = "code ASC";
+$tabsqlsort[43] = "code ASC";
 
 // Field names in select result for dictionary display
 $tabfield = array();
@@ -326,6 +330,7 @@ $tabfield[39] = "code,libelle,sortorder";
 $tabfield[40] = "code,libelle,picto";
 $tabfield[41] = "code,label";
 $tabfield[42] = "code,label";
+$tabfield[43] = "code,label";
 
 // Edit field names for editing a record
 $tabfieldvalue = array();
@@ -371,6 +376,7 @@ $tabfieldvalue[39] = "code,libelle,sortorder";
 $tabfieldvalue[40] = "code,libelle,picto";
 $tabfieldvalue[41] = "code,label";
 $tabfieldvalue[42] = "code,label";
+$tabfieldvalue[43] = "code,label";
 
 // Field names in the table for inserting a record
 $tabfieldinsert = array();
@@ -417,6 +423,7 @@ $tabfieldinsert[39] = "code,label,sortorder";
 $tabfieldinsert[40] = "code,libelle,picto";
 $tabfieldinsert[41] = "code,label";
 $tabfieldinsert[42] = "code,label";
+$tabfieldinsert[43] = "code,label";
 
 // Rowid name of field depending if field is autoincrement on or off..
 // Use "" if id field is "rowid" and has autoincrement on
@@ -464,6 +471,7 @@ $tabrowid[39] = "code";
 $tabrowid[40] = "id";
 $tabrowid[41] = "";
 $tabrowid[42] = "rowid";
+$tabrowid[43] = "rowid";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
@@ -509,6 +517,7 @@ $tabcond[39] = (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_
 $tabcond[40] = (!empty($conf->societe->enabled) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
 $tabcond[41] = !empty($conf->intracommreport->enabled);
 $tabcond[42] = !empty($conf->product->enabled);
+$tabcond[43] = !empty($conf->product->enabled && !empty($conf->productbatch->enabled));
 
 // List of help for fields
 $tabhelp = array();
@@ -554,6 +563,7 @@ $tabhelp[39] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[40] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
 $tabhelp[41] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[42] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[43] = array('code'=>$langs->trans("EnterAnyCode"));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck = array();
@@ -599,6 +609,7 @@ $tabfieldcheck[39] = array();
 $tabfieldcheck[40] = array();
 $tabfieldcheck[41] = array();
 $tabfieldcheck[42] = array();
+$tabfieldcheck[43] = array();
 
 // Complete all arrays with entries found into modules
 complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck);
diff --git a/htdocs/install/mysql/data/llx_c_productbatch_status.sql b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
new file mode 100644
index 00000000000..a4628e0bd91
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
@@ -0,0 +1,28 @@
+-- Copyright (C) 2021 Noé Cendrier <noe.cendrier@altairis.fr>
+--
+-- 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 <https://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Do not place a comment at the end of the line, this file is parsed when
+-- from the install and all '--' are removed.
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'ProductCanBeUsed', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
+
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql b/htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql
new file mode 100644
index 00000000000..fc72f556a97
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql
@@ -0,0 +1,19 @@
+-- ========================================================================
+-- Copyright (C) 2021 Noé Cendrier <noe.cendrier@altairis.fr>
+--
+-- 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 <https://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+ALTER TABLE llx_c_productbatch_status ADD UNIQUE INDEX uk_c_productbatch_status(code);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_status.sql b/htdocs/install/mysql/tables/llx_c_productbatch_status.sql
new file mode 100644
index 00000000000..2ffad7f5939
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_status.sql
@@ -0,0 +1,25 @@
+-- ========================================================================
+-- Copyright (C) 2012-2017      Noé Cendrier  <noe.cendrier@altairis.fr>
+--
+-- 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
+-- (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 <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+create table llx_c_productbatch_status
+(
+  rowid    integer            AUTO_INCREMENT PRIMARY KEY,
+  code     varchar(16)        NOT NULL,
+  label    varchar(50)        NOT NULL,
+  active   integer  DEFAULT 1 NOT NULL  
+)ENGINE=innodb;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b103d0082ba..5d336524798 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1043,6 +1043,7 @@ DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
+DictionaryBatchStatus=Product batch status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 4414b6ad8d8..dc1cccd7d7b 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Use lot/serial number
 ProductStatusOnBatch=Yes (lot required)
 ProductStatusOnSerial=Yes (unique serial number required)
@@ -32,4 +32,5 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-
+OutOfOrder=Out of order
+ProductCanBeUsed=Functional
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index ef48fc0a82d..a9a5327e924 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1034,6 +1034,7 @@ DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets
 DictionaryExpenseTaxCat=Note de frais - catégories de déplacement
 DictionaryExpenseTaxRange=Note de frais - Tri par catégorie de déplacement
 DictionaryTransportMode=Déclaration d'échanges intracommunautaires - Mode de transport
+DictionaryBatchStatus=État du lot (produits)
 TypeOfUnit=Type d'unité
 SetupSaved=Configuration sauvegardée
 SetupNotSaved=Configuration non enregistrée
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index cd38ac89278..ce8eae07253 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -1,4 +1,4 @@
-# ProductBATCH language file - en_US - ProductBATCH
+# ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Utiliser les numéros de lots/série
 ProductStatusOnBatch=Lot (requis)
 ProductStatusOnSerial=Numéro de série (doit être unique pour chaque équipement)
@@ -30,4 +30,6 @@ BatchLotNumberingModules=Modèle de génération et contrôle des numéros de lo
 BatchSerialNumberingModules=Modèle de génération et contrôle des numéros de série
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
 LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
-SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
\ No newline at end of file
+SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
+OutOfOrder=Hors d'usage
+ProductCanBeUsed=En état de marche
\ No newline at end of file

From a500d83c0bb988f18eb7217ec8843abfb2a87430 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 16:09:22 +0200
Subject: [PATCH 045/135] linked invoice and attendee

---
 htdocs/core/class/commonobject.class.php      |  5 +++
 .../attendee_subscription.php                 |  3 +-
 htdocs/public/payment/newpayment.php          | 37 +++++++++++--------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index a93acda2a17..2c9e81b369e 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -3820,6 +3820,11 @@ abstract class CommonObject
 						$classpath = 'projet/class';
 						$classfile = 'project';
 						$classname = 'Project';
+					} elseif ($objecttype == 'conferenceorboothattendee') {
+						$classpath = 'eventorganization/class';
+						$classfile = 'conferenceorboothattendee';
+						$classname = 'ConferenceOrBoothAttendee';
+						$module = 'eventorganization';
 					}
 
 					// Here $module, $classfile and $classname are set
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 56855c70b62..0f92400b5f2 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -321,12 +321,13 @@ if (empty($reshook) && $action == 'add') {
 						$confattendee->errors[] = $confattendee->error;
 					}
 				}
-
 				$resultfacture = $facture->create($user);
 				if ($resultfacture <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;
 					$error++;
+				} else {
+					$facture->add_object_linked($confattendee->element, $confattendee->id);
 				}
 			}
 
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 75d72b4bbea..06f81fccea3 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -117,17 +117,30 @@ if ($source == 'conferencesubscription') {
 	$invoice = new Facture($db);
 	$resultinvoice = $invoice->fetch($decodedinvoiceid);
 	if ($resultinvoice <= 0) {
-		$mesg = $invoice->error;
-		$error++;
+		setEventMessages(null, $invoice->errors, "errors");
 	} else {
+		$invoice->fetchObjectLinked();
 		// Finding the thirdparty associated to the Attendee
 		$thirdparty = new Societe($db);
 		$resultthirdparty = $thirdparty->fetch($invoice->socid);
 		if ($resultthirdparty <= 0) {
-			$mesg = $thirdparty->error;
-			$error++;
+			setEventMessages(null, $thirdparty->errors, "errors");
 		}
 		$object = $thirdparty;
+
+		$linkedAttendees = $invoice->linkedObjectsIds['conferenceorboothattendee'];
+
+		if (is_array($linkedAttendees)) {
+			$linkedAttendees = array_values($linkedAttendees);
+
+			$attendee = new ConferenceOrBoothAttendee($db);
+			$resultattendee = $attendee->fetch($linkedAttendees[0]);
+			if ($resultattendee <= 0) {
+				setEventMessages(null, $attendee->errors, "errors");
+			}
+			var_dump($attendee);
+			exit;
+		}
 	}
 }
 
@@ -363,7 +376,7 @@ if ($action == 'dopayment') {
 
 			// A redirect is added if API call successfull
 			if ($source == 'conferencesubscription') {
-				$PAYPAL_API_OK .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+				$PAYPAL_API_OK .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
@@ -384,7 +397,7 @@ if ($action == 'dopayment') {
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 
 		$mesg = '';
@@ -742,7 +755,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		exit;
 	} else {
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&conferencesubscription='.dol_encode('subscriptionok'.$ref, $dolibarr_main_instance_unique_id).'&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 		header("Location: ".$urlok);
 		exit;
@@ -1763,18 +1776,10 @@ if ($source == 'conferencesubscription') {
 	$found = true;
 	$langs->load("members");
 
-	if ($action != 'dopayment') { // Do not change amount if we just click on first dopayment
-		$amount = $project->price_registration;
-		if (GETPOST("amount", 'alpha')) {
-			$amount = GETPOST("amount", 'alpha');
-		}
-		$amount = price2num($amount, 'MT');
-	}
-
 	if (GETPOST('fulltag', 'alpha')) {
 		$fulltag = GETPOST('fulltag', 'alpha');
 	} else {
-		$fulltag = 'MEM='.$member->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+		$fulltag = 'ATT='.$attendee->id.'.DAT='.dol_print_date(dol_now(), '%Y%m%d%H%M%S');
 		if (!empty($TAG)) {
 			$tag = $TAG; $fulltag .= '.TAG='.$TAG;
 		}

From d340e21cb3ba468f24bdd04cdc21bdc46d4e00c7 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 20 Apr 2021 16:13:36 +0200
Subject: [PATCH 046/135] No translation for dictionary labels

---
 htdocs/install/mysql/data/llx_c_productbatch_status.sql | 4 ++--
 htdocs/langs/en_US/productbatch.lang                    | 2 --
 htdocs/langs/fr_FR/productbatch.lang                    | 4 +---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_productbatch_status.sql b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
index a4628e0bd91..ebe64ff3a26 100644
--- a/htdocs/install/mysql/data/llx_c_productbatch_status.sql
+++ b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
@@ -23,6 +23,6 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'ProductCanBeUsed', 1);
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'En état de marche', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', "Hors d'usage", 1);
 
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index dc1cccd7d7b..92c224b55f5 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -32,5 +32,3 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
-OutOfOrder=Out of order
-ProductCanBeUsed=Functional
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index ce8eae07253..c3e48ddbeb1 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -30,6 +30,4 @@ BatchLotNumberingModules=Modèle de génération et contrôle des numéros de lo
 BatchSerialNumberingModules=Modèle de génération et contrôle des numéros de série
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
 LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
-SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
-OutOfOrder=Hors d'usage
-ProductCanBeUsed=En état de marche
\ No newline at end of file
+SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
\ No newline at end of file

From 5ad64640c2270c2dc41c7bc598afe70531c0b0dc Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 16:26:11 +0200
Subject: [PATCH 047/135] removal of var_dump

---
 htdocs/public/payment/newpayment.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 06f81fccea3..22efe3d18af 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -138,8 +138,6 @@ if ($source == 'conferencesubscription') {
 			if ($resultattendee <= 0) {
 				setEventMessages(null, $attendee->errors, "errors");
 			}
-			var_dump($attendee);
-			exit;
 		}
 	}
 }

From f1d68c201b6169bc6f8d19df2e7806e96f003cf2 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 20 Apr 2021 16:56:15 +0200
Subject: [PATCH 048/135] conflict resolution

---
 htdocs/langs/en_US/productbatch.lang | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 92c224b55f5..aedf85a4fb8 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -32,3 +32,4 @@ CustomMasks=Adds an option to define mask in the product card
 LotProductTooltip=Adds an option in the product card to define a dedicated batch number mask
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
+

From 4c57a6c207636ba44cf2256c829d3a93d9a0c2de Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 20 Apr 2021 17:28:18 +0200
Subject: [PATCH 049/135] wip on mail, sending ok but no content

---
 htdocs/core/class/CMailFile.class.php         |  1 -
 htdocs/langs/en_US/eventorganization.lang     |  4 ++
 .../attendee_subscription.php                 | 46 +++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 863bb9a6794..526c464403f 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -584,7 +584,6 @@ class CMailFile
 			if ($reshook < 0) {
 				$this->error = "Error in hook maildao sendMail ".$reshook;
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-
 				return $reshook;
 			}
 			if ($reshook == 1) {	// Hook replace standard code
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 9e2df362467..5ddd3d259ea 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -113,6 +113,10 @@ ConferenceAttendeeFee = Conference attendee fee
 #
 SubscriptionOk = Your subscription to this conference has been validated
 #
+# Subscription validation mail
+#
+ConfAttendeeSubscriptionConfirmation = Confirmation of your subscription to a conference
+#
 # Payment page
 #
 Attendee = Participant
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 0f92400b5f2..cad279687e7 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -350,6 +350,52 @@ if (empty($reshook) && $action == 'add') {
 			// No price has been set
 			// Validating the subscription
 			$confattendee->setStatut(1);
+
+			// Sending mail
+			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+			$formmail = new FormMail($db);
+			// Set output language
+			$outputlangs = new Translate('', $conf);
+			$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+			// Load traductions files required by page
+			$outputlangs->loadLangs(array("main", "members"));
+			// Get email content from template
+			$arraydefaultmessage = null;
+
+			$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+
+			if (!empty($labeltouse)) {
+				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+			}
+
+			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+				$subject = $arraydefaultmessage->topic;
+				$msg     = $arraydefaultmessage->content;
+			}
+
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+			complete_substitutions_array($substitutionarray, $outputlangs, $object);
+			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+			$texttosend = $msg;
+
+			$sendto = $thirdparty->email;
+			$from = $conf->global->MAILING_EMAIL_FROM;
+			$urlback = $_SERVER["REQUEST_URI"];
+			$topic = $langs->trans("ConfAttendeeSubscriptionConfirmation");
+
+			$ishtml = dol_textishtml($texttosend); // May contain urls
+
+			$mailfile = new CMailFile($topic, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+			$result = $mailfile->sendfile();
+			var_dump($result);
+			if ($result) {
+				dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+			} else {
+				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+			}
+
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
 			Header("Location: ".$redirection);
 			exit;

From 86812c13ee4e1dbef605568ab2da0d2af4af93cc Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Wed, 21 Apr 2021 09:18:40 +0200
Subject: [PATCH 050/135] no double quote

---
 htdocs/install/mysql/data/llx_c_productbatch_status.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/data/llx_c_productbatch_status.sql b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
index ebe64ff3a26..c925c0cd937 100644
--- a/htdocs/install/mysql/data/llx_c_productbatch_status.sql
+++ b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
@@ -24,5 +24,5 @@
 --
 
 INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'En état de marche', 1);
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', "Hors d'usage", 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'Hors d’usage', 1);
 

From 790ff0c64c1a7c93392f87c614e5180ec88356f8 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 10:48:37 +0200
Subject: [PATCH 051/135] mail template working, but info in it not replaced by
 values

---
 htdocs/public/eventorganization/attendee_subscription.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index cad279687e7..6cad964446f 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -364,9 +364,8 @@ if (empty($reshook) && $action == 'add') {
 			$arraydefaultmessage = null;
 
 			$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-
 			if (!empty($labeltouse)) {
-				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
 			}
 
 			if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
@@ -377,16 +376,15 @@ if (empty($reshook) && $action == 'add') {
 			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 			complete_substitutions_array($substitutionarray, $outputlangs, $object);
 			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-			$texttosend = $msg;
+			$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
 			$sendto = $thirdparty->email;
 			$from = $conf->global->MAILING_EMAIL_FROM;
 			$urlback = $_SERVER["REQUEST_URI"];
-			$topic = $langs->trans("ConfAttendeeSubscriptionConfirmation");
 
 			$ishtml = dol_textishtml($texttosend); // May contain urls
 
-			$mailfile = new CMailFile($topic, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+			$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
 
 			$result = $mailfile->sendfile();
 			var_dump($result);

From 7a65a1768a10fb9b45ab83de56300449d05983b6 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 11:57:03 +0200
Subject: [PATCH 052/135] wip on mail content

---
 htdocs/public/eventorganization/attendee_subscription.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 6cad964446f..727f2c64d6f 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -373,8 +373,11 @@ if (empty($reshook) && $action == 'add') {
 				$msg     = $arraydefaultmessage->content;
 			}
 
-			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
 			complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+			$substitutionarray['ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived'] = 'Vous êtes bien enregistré.';
+
 			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
 			$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
@@ -387,7 +390,6 @@ if (empty($reshook) && $action == 'add') {
 			$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
 
 			$result = $mailfile->sendfile();
-			var_dump($result);
 			if ($result) {
 				dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
 			} else {

From 780b3f4714d8db3f07308ed0b51139bcfeff2da0 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 13:41:30 +0200
Subject: [PATCH 053/135] target:blank added for the link to the registration
 pag

---
 htdocs/eventorganization/conferenceorbooth_list.php       | 2 +-
 htdocs/public/eventorganization/attendee_subscription.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index feb202de663..cbf0e91f7fa 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -368,7 +368,7 @@ if ($projectid > 0) {
 	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$encodedid;
 	$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
 	$linkregister .= '&securekey='.urlencode($encodedsecurekey);
-	print '<a href="'.$linkregister.'">'.$linkregister.'</a>';
+	print '<a target="_blank" href="'.$linkregister.'">'.$linkregister.'</a>';
 	print '</td></tr>';
 
 	// Other attributes
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 727f2c64d6f..22b6955c6f5 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -376,8 +376,6 @@ if (empty($reshook) && $action == 'add') {
 			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
 			complete_substitutions_array($substitutionarray, $outputlangs, $object);
 
-			$substitutionarray['ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived'] = 'Vous êtes bien enregistré.';
-
 			$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
 			$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 

From 9809179aa45bb22f107b82a27e9dc1f88a774e2b Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 14:19:07 +0200
Subject: [PATCH 054/135] securekey added to newpayment page, correction in the
 invoice line created

---
 htdocs/langs/en_US/eventorganization.lang         |  2 +-
 .../eventorganization/attendee_subscription.php   | 15 +++++++++++++--
 htdocs/public/payment/newpayment.php              |  3 +++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 5ddd3d259ea..863cec82164 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -107,7 +107,7 @@ MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
 EvntOrgStartDuration = This conference starts on 
 EvntOrgEndDuration =  and ends on
-ConferenceAttendeeFee = Conference attendee fee
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s
 #
 # SubscriptionOk page
 #
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 22b6955c6f5..ed6d5261fcd 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -334,14 +334,25 @@ if (empty($reshook) && $action == 'add') {
 			if (!$error) {
 				// Add line to draft invoice
 				$vattouse = get_default_tva($mysoc, $thirdparty, $productforinvoicerow->id);
-				$result = $facture->addline($langs->trans("ConferenceAttendeeFee").' for the event : \''.$conference->label.'\' occuring from '.dol_print_date($conference->datep, '%d/%m/%y %H:%M:%S').' to '.dol_print_date($conference->datep2, '%d/%m/%y %H:%M:%S'), floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
+				$result = $facture->addline($langs->trans("ConferenceAttendeeFee", $conference->label, dol_print_date($conference->datep, '%d/%m/%y %H:%M:%S'), dol_print_date($conference->datep2, '%d/%m/%y %H:%M:%S')), floatval($project->price_registration), 1, $vattouse, 0, 0, $productforinvoicerow->id, 0, dol_now(), '', 0, 0, '', 'HT', 0, 1);
 				if ($result <= 0) {
 					$confattendee->error = $facture->error;
 					$confattendee->errors = $facture->errors;
 					$error++;
 				}
 				if (!$error) {
-					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source=conferencesubscription&ref='.dol_encode($facture->id, $dolibarr_main_instance_unique_id);
+					$valid = true;
+					$sourcetouse = 'conferencesubscription';
+					$reftouse = dol_encode($facture->id, $dolibarr_main_instance_unique_id);
+					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
+					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+							$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
+
+						} else {
+							$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+						}
+					}
 					Header("Location: ".$redirection);
 					exit;
 				}
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 22efe3d18af..2a43e655288 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -155,6 +155,7 @@ foreach ($_POST as $key => $val) {
 }
 
 
+
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
@@ -168,6 +169,7 @@ $ref = $REF = GETPOST('ref', 'alpha');
 $TAG = GETPOST("tag", 'alpha');
 $FULLTAG = GETPOST("fulltag", 'alpha'); // fulltag is tag with more informations
 $SECUREKEY = GETPOST("securekey"); // Secure key
+
 if ($paymentmethod && !preg_match('/'.preg_quote('PM='.$paymentmethod, '/').'/', $FULLTAG)) {
 	$FULLTAG .= ($FULLTAG ? '.' : '').'PM='.$paymentmethod;
 }
@@ -262,6 +264,7 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 	} else {
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
+
 	if ($SECUREKEY != $token) {
 		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 			$valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility

From f059cbe89c715775277140bec559283b4112a542 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 14:50:50 +0200
Subject: [PATCH 055/135] ref passed in url no longer crypted (useless) and
 correctly passed through POST at submit

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 htdocs/public/payment/newpayment.php                      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index ed6d5261fcd..7f04bfe0cb5 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -343,7 +343,7 @@ if (empty($reshook) && $action == 'add') {
 				if (!$error) {
 					$valid = true;
 					$sourcetouse = 'conferencesubscription';
-					$reftouse = dol_encode($facture->id, $dolibarr_main_instance_unique_id);
+					$reftouse = $facture->id;
 					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
 					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 2a43e655288..1032737919b 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -113,9 +113,9 @@ if (!$action) {
 
 if ($source == 'conferencesubscription') {
 	// Finding the Attendee
-	$decodedinvoiceid = dol_decode(GETPOST('ref'), $dolibarr_main_instance_unique_id);
+	$invoiceid = GETPOST('ref');
 	$invoice = new Facture($db);
-	$resultinvoice = $invoice->fetch($decodedinvoiceid);
+	$resultinvoice = $invoice->fetch($invoiceid);
 	if ($resultinvoice <= 0) {
 		setEventMessages(null, $invoice->errors, "errors");
 	} else {
@@ -1808,7 +1808,7 @@ if ($source == 'conferencesubscription') {
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
-	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($attendee->ref).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->id).'">';
 	print '</td></tr>'."\n";
 
 	// Amount

From 4d20079c496cd8a79a3e6cbf0a0d5d50b9e3dac0 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 15:20:08 +0200
Subject: [PATCH 056/135] fix: the ref passed in url is now attendee s one, not
 invoice s

---
 .../attendee_subscription.php                 |  2 +-
 htdocs/public/payment/newpayment.php          | 44 ++++++++++---------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 7f04bfe0cb5..91bc2da646b 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -343,7 +343,7 @@ if (empty($reshook) && $action == 'add') {
 				if (!$error) {
 					$valid = true;
 					$sourcetouse = 'conferencesubscription';
-					$reftouse = $facture->id;
+					$reftouse = $confattendee->id;
 					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
 					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 1032737919b..461cd406a92 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -59,6 +59,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societeaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -113,30 +114,31 @@ if (!$action) {
 
 if ($source == 'conferencesubscription') {
 	// Finding the Attendee
-	$invoiceid = GETPOST('ref');
-	$invoice = new Facture($db);
-	$resultinvoice = $invoice->fetch($invoiceid);
-	if ($resultinvoice <= 0) {
-		setEventMessages(null, $invoice->errors, "errors");
+	$attendeeid = GETPOST('ref');
+	$attendee = new ConferenceOrBoothAttendee($db);
+	$resultattendee = $attendee->fetch($attendeeid);
+	if ($resultattendee <= 0) {
+		setEventMessages(null, $attendee->errors, "errors");
 	} else {
-		$invoice->fetchObjectLinked();
-		// Finding the thirdparty associated to the Attendee
-		$thirdparty = new Societe($db);
-		$resultthirdparty = $thirdparty->fetch($invoice->socid);
-		if ($resultthirdparty <= 0) {
-			setEventMessages(null, $thirdparty->errors, "errors");
-		}
-		$object = $thirdparty;
 
-		$linkedAttendees = $invoice->linkedObjectsIds['conferenceorboothattendee'];
+		$attendee->fetchObjectLinked();
+		$linkedInvoices = $attendee->linkedObjectsIds['facture'];
 
-		if (is_array($linkedAttendees)) {
-			$linkedAttendees = array_values($linkedAttendees);
+		if (is_array($linkedInvoices)) {
+			$linkedInvoices = array_values($linkedInvoices);
 
-			$attendee = new ConferenceOrBoothAttendee($db);
-			$resultattendee = $attendee->fetch($linkedAttendees[0]);
-			if ($resultattendee <= 0) {
-				setEventMessages(null, $attendee->errors, "errors");
+			$invoice = new Facture($db);
+			$resultinvoice = $invoice->fetch($linkedInvoices[0]);
+			if ($resultinvoice <= 0) {
+				setEventMessages(null, $invoice->errors, "errors");
+			} else {
+				// Finding the associated thirdparty
+				$thirdparty = new Societe($db);
+				$resultthirdparty = $thirdparty->fetch($invoice->socid);
+				if ($resultthirdparty <= 0) {
+					setEventMessages(null, $thirdparty->errors, "errors");
+				}
+				$object = $thirdparty;
 			}
 		}
 	}
@@ -1808,7 +1810,7 @@ if ($source == 'conferencesubscription') {
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
-	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->id).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($attendee->id).'">';
 	print '</td></tr>'."\n";
 
 	// Amount

From 8e7043eca6d1a18d9d98c6328c41da3829ceb99e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 15:31:14 +0200
Subject: [PATCH 057/135] conforbooth class included in paymentok page

---
 htdocs/public/payment/paymentok.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 88d50d66a62..88ab62a8b2f 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -50,6 +50,7 @@ if (is_numeric($entity)) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
 
 if (!empty($conf->paypal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';

From ebf2466d7b347836edc500762d3838d4e9b859d3 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 15:36:07 +0200
Subject: [PATCH 058/135] no more redirection to subscriptionok after paymentok
 successful

---
 htdocs/public/payment/paymentok.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 88ab62a8b2f..8b040692dc8 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -889,17 +889,6 @@ if ($ispaymentok) {
 					} else {
 						$attendeetovalidate->setStatut(1);
 					}
-
-					// Redirecting to confirmation page
-					$thirdparty = new Societe($db);
-					$resultthirdparty = $thirdparty->fetch($attendeetovalidate->fk_soc);
-					if ($resultthirdparty < 0) {
-						setEventMessages(null, $thirdparty->errors, "errors");
-					} else {
-						$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?idthirdparty='.dol_encode($thirdparty->id, $dolibarr_main_instance_unique_id).'&securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
-						Header("Location: ".$redirection);
-						exit;
-					}
 				} else {
 					$db->rollback();
 				}

From e81637b60811babd93e5b8e2d1ba2ce598c821d9 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 16:37:02 +0200
Subject: [PATCH 059/135] wip on getting the existing attendee

---
 htdocs/langs/en_US/eventorganization.lang     |  3 +-
 .../attendee_subscription.php                 | 32 ++++++++++++-------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 863cec82164..6ef39e81ff6 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -105,8 +105,7 @@ ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
-EvntOrgStartDuration = This conference starts on 
-EvntOrgEndDuration =  and ends on
+EvntOrgDuration = This conference starts on %s and ends on %s
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s
 #
 # SubscriptionOk page
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 91bc2da646b..2bacd3a1951 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -284,14 +284,24 @@ if (empty($reshook) && $action == 'add') {
 		} else {
 			// creation of an attendee
 			$confattendee = new ConferenceOrBoothAttendee($db);
-			$confattendee->fk_soc = $thirdparty->id;
-			$confattendee->date_subscription = dol_now();
-			$confattendee->email = GETPOST("email");
-			$confattendee->fk_actioncomm = $id;
-			$resultconfattendee = $confattendee->create($user);
-			if ($resultconfattendee < 0) {
-				$error++;
-				$errmsg .= $confattendee->error;
+			$resultfetchattendee = $confattendee->fetchAll('','', 1, 0, array('t.fk_soc'=>$thirdparty->id, 't.fk_actioncomm'=>$id));
+			if ($resultfetchattendee == 0 || count($resultfetchattendee) == 0) {
+				// Need to create an attendee
+				$confattendee->fk_soc = $thirdparty->id;
+				$confattendee->date_subscription = dol_now();
+				$confattendee->email = GETPOST("email");
+				$confattendee->fk_actioncomm = $id;
+				$resultconfattendee = $confattendee->create($user);
+				if ($resultconfattendee < 0) {
+					$error++;
+					$errmsg .= $confattendee->error;
+				}
+				print 'created attendee';
+			} else {
+				// Found an attendee
+				print 'found attendee';
+				var_dump($resultfetchattendee);
+				$confattendee = $resultfetchattendee[0];
 			}
 		}
 	}
@@ -312,6 +322,7 @@ if (empty($reshook) && $action == 'add') {
 				$facture->paye = 0;
 				$facture->date = dol_now();
 				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
+
 				if (empty($facture->cond_reglement_id)) {
 					$paymenttermstatic = new PaymentTerm($confattendee->db);
 					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
@@ -437,10 +448,7 @@ print '<div class="center subscriptionformhelptext justify">';
 // Welcome message
 print $langs->trans("EvntOrgWelcomeMessage");
 print $id.".".'<br>';
-print $langs->trans("EvntOrgStartDuration");
-print dol_print_date($conference->datep).' ';
-print $langs->trans("EvntOrgEndDuration");
-print ' '.dol_print_date($conference->datef).".";
+print $langs->trans("EvntOrgDuration", dol_print_date($conference->datep), dol_print_date($conference->datef));
 print '</div>';
 
 dol_htmloutput_errors($errmsg);

From b9408d6c711df9e90091b317474bf40515150648 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 16:43:57 +0200
Subject: [PATCH 060/135] email sending added in paymentok

---
 htdocs/public/payment/paymentok.php | 43 +++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 8b040692dc8..27b00fec402 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -888,6 +888,49 @@ if ($ispaymentok) {
 						setEventMessages(null, $attendeetovalidate->errors, "errors");
 					} else {
 						$attendeetovalidate->setStatut(1);
+
+						// Sending mail
+						require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+						$formmail = new FormMail($db);
+						// Set output language
+						$outputlangs = new Translate('', $conf);
+						$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+						// Load traductions files required by page
+						$outputlangs->loadLangs(array("main", "members"));
+						// Get email content from template
+						$arraydefaultmessage = null;
+
+						$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+						if (!empty($labeltouse)) {
+							$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+						}
+
+						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+							$subject = $arraydefaultmessage->topic;
+							$msg     = $arraydefaultmessage->content;
+						}
+
+						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+						complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+						$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+						$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+						$sendto = $thirdparty->email;
+						$from = $conf->global->MAILING_EMAIL_FROM;
+						$urlback = $_SERVER["REQUEST_URI"];
+
+						$ishtml = dol_textishtml($texttosend); // May contain urls
+
+						$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+						$result = $mailfile->sendfile();
+						if ($result) {
+							dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+						} else {
+							dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+						}
 					}
 				} else {
 					$db->rollback();

From 1700ac937a33c69ef007a4d4361f8f66dcbe8eb8 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 17:25:28 +0200
Subject: [PATCH 061/135] wip on looking for existing attendees instead of
 creating them each time

---
 .../attendee_subscription.php                 | 51 ++++++++-----------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 2bacd3a1951..d88a1ddd55a 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -228,10 +228,26 @@ if (empty($reshook) && $action == 'add') {
 	}
 
 	if (!$error) {
-		// Vérifier si client existe par l'email
+		// Check if attendee already exists (by email)
+		$confattendee = new ConferenceOrBoothAttendee($db);
+		$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 't.email'=>$email));
+		if ($resultfetchconfattendee != 0 && count($resultfetchconfattendee)>0) {
+			// Found confattendee
+			$confattendee = $resultfetchconfattendee[0];
+		} else {
+			// Need to create a confattendee
+		}
+		$confattendee->date_subscription = dol_now();
+		$confattendee->email = GETPOST("email");
+		$confattendee->fk_actioncomm = $id;
+		$resultconfattendee = $confattendee->create($user);
+		if ($resultconfattendee < 0) {
+			$error++;
+			$errmsg .= $confattendee->error;
+		}
+		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
-		$resultfetchthirdparty = $thirdparty->fetch('', '', '', '', '', '', '', '', '', '', $email);
-
+		$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
 		if ($resultfetchthirdparty<0) {
 			$error++;
 			$errmsg .= $thirdparty->error;
@@ -277,33 +293,8 @@ if (empty($reshook) && $action == 'add') {
 			// We have an existing thirdparty ready to use
 			$readythirdparty = 1;
 		}
-
-		if ($readythirdparty < 0) {
-			$error++;
-			$errmsg .= $thirdparty->error;
-		} else {
-			// creation of an attendee
-			$confattendee = new ConferenceOrBoothAttendee($db);
-			$resultfetchattendee = $confattendee->fetchAll('','', 1, 0, array('t.fk_soc'=>$thirdparty->id, 't.fk_actioncomm'=>$id));
-			if ($resultfetchattendee == 0 || count($resultfetchattendee) == 0) {
-				// Need to create an attendee
-				$confattendee->fk_soc = $thirdparty->id;
-				$confattendee->date_subscription = dol_now();
-				$confattendee->email = GETPOST("email");
-				$confattendee->fk_actioncomm = $id;
-				$resultconfattendee = $confattendee->create($user);
-				if ($resultconfattendee < 0) {
-					$error++;
-					$errmsg .= $confattendee->error;
-				}
-				print 'created attendee';
-			} else {
-				// Found an attendee
-				print 'found attendee';
-				var_dump($resultfetchattendee);
-				$confattendee = $resultfetchattendee[0];
-			}
-		}
+		// Updating the fk_soc associated to the confattendee to match the ready to use thirdparty we have got
+		$confattendee->fk_soc = $thirdparty->id;
 	}
 
 	if (!$error) {

From 22dab0e0afb32b929ed503ca88fff5eb60edba34 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Wed, 21 Apr 2021 17:26:46 +0200
Subject: [PATCH 062/135] fix on creating attendee

---
 .../attendee_subscription.php                 | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index d88a1ddd55a..e564bec5839 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -228,7 +228,7 @@ if (empty($reshook) && $action == 'add') {
 	}
 
 	if (!$error) {
-		// Check if attendee already exists (by email)
+		// Check if attendee already exists (by email and for this event)
 		$confattendee = new ConferenceOrBoothAttendee($db);
 		$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 't.email'=>$email));
 		if ($resultfetchconfattendee != 0 && count($resultfetchconfattendee)>0) {
@@ -236,15 +236,16 @@ if (empty($reshook) && $action == 'add') {
 			$confattendee = $resultfetchconfattendee[0];
 		} else {
 			// Need to create a confattendee
+			$confattendee->date_subscription = dol_now();
+			$confattendee->email = GETPOST("email");
+			$confattendee->fk_actioncomm = $id;
+			$resultconfattendee = $confattendee->create($user);
+			if ($resultconfattendee < 0) {
+				$error++;
+				$errmsg .= $confattendee->error;
+			}
 		}
-		$confattendee->date_subscription = dol_now();
-		$confattendee->email = GETPOST("email");
-		$confattendee->fk_actioncomm = $id;
-		$resultconfattendee = $confattendee->create($user);
-		if ($resultconfattendee < 0) {
-			$error++;
-			$errmsg .= $confattendee->error;
-		}
+
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
 		$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);

From e05c318fd863845edf09aae4a5cae50aeda4d970 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 11:45:00 +0200
Subject: [PATCH 063/135] various modifications on the way existing attendees
 and thirdparties are handled at registration

---
 .../class/conferenceorboothattendee.class.php |  1 +
 .../attendee_subscription.php                 | 55 +++++++++++++------
 2 files changed, 40 insertions(+), 16 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 6418d73580b..d8e166fde5a 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -438,6 +438,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		}
 
 		$resql = $this->db->query($sql);
+
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index e564bec5839..6e06838de91 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -81,6 +81,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 $email = GETPOST("email");
+$societe = GETPOST("societe");
 
 // Getting id from Post and decoding it
 $encodedid = GETPOST('id');
@@ -230,14 +231,14 @@ if (empty($reshook) && $action == 'add') {
 	if (!$error) {
 		// Check if attendee already exists (by email and for this event)
 		$confattendee = new ConferenceOrBoothAttendee($db);
-		$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 't.email'=>$email));
-		if ($resultfetchconfattendee != 0 && count($resultfetchconfattendee)>0) {
+		$resultfetchconfattendee = $confattendee->fetchAll('', '', 0, 0, array('t.fk_actioncomm'=>$id, 'customsql'=>'t.email="'.$email.'"'));
+		if ($resultfetchconfattendee > 0 && count($resultfetchconfattendee)>0) {
 			// Found confattendee
-			$confattendee = $resultfetchconfattendee[0];
+			$confattendee = array_shift($resultfetchconfattendee);
 		} else {
 			// Need to create a confattendee
 			$confattendee->date_subscription = dol_now();
-			$confattendee->email = GETPOST("email");
+			$confattendee->email = $email;
 			$confattendee->fk_actioncomm = $id;
 			$resultconfattendee = $confattendee->create($user);
 			if ($resultconfattendee < 0) {
@@ -248,17 +249,36 @@ if (empty($reshook) && $action == 'add') {
 
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
-		$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
+		// Fetch using fk_soc of the existing attendee
+		if (!empty($confattendee->fk_soc)) {
+			$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
+		} else {
+			// Fetch using the input field by user
+			if (!empty($societe)) {
+				$resultfetchthirdparty = $thirdparty->fetch('', $societe);
+				var_dump($resultfetchthirdparty);
+				if ($resultfetchthirdparty<=0) {
+					// Need to create a new one
+					$resultfetchthirdparty = 0;
+				} else {
+					$confattendee->fk_soc = $thirdparty->id;
+					$confattendee->update($user);
+				}
+			} else {
+				// Need to create a thirdparty
+				$resultfetchthirdparty = 0;
+			}
+		}
+		var_dump($resultfetchthirdparty);
 		if ($resultfetchthirdparty<0) {
 			$error++;
 			$errmsg .= $thirdparty->error;
-			$readythirdparty = -1;
 		} elseif ($resultfetchthirdparty==0) {
 			// creation of a new thirdparty
-			if (!empty(GETPOST("societe"))) {
-				$thirdparty->name        = GETPOST("societe");
+			if (!empty($societe)) {
+				$thirdparty->name     = $societe;
 			} else {
-				$thirdparty->name        = $email;
+				$thirdparty->name     = $email;
 			}
 			$thirdparty->address      = GETPOST("address");
 			$thirdparty->zip          = GETPOST("zipcode");
@@ -288,14 +308,16 @@ if (empty($reshook) && $action == 'add') {
 			}
 			$thirdparty->code_client = $tmpcode;
 			$readythirdparty = $thirdparty->create($user);
-			$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
-			$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
-		} else {
-			// We have an existing thirdparty ready to use
-			$readythirdparty = 1;
+			if ($readythirdparty <0) {
+				$error++;
+				$errmsg .= $thirdparty->error;
+			} else {
+				$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
+				$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
+				$confattendee->fk_soc = $thirdparty->id;
+				$confattendee->update($user);
+			}
 		}
-		// Updating the fk_soc associated to the confattendee to match the ready to use thirdparty we have got
-		$confattendee->fk_soc = $thirdparty->id;
 	}
 
 	if (!$error) {
@@ -316,6 +338,7 @@ if (empty($reshook) && $action == 'add') {
 				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
 
 				if (empty($facture->cond_reglement_id)) {
+					var_dump($confattendee->db);
 					$paymenttermstatic = new PaymentTerm($confattendee->db);
 					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
 					if (empty($facture->cond_reglement_id)) {

From e6318eb4f4da90eaaed1d01828c2f46486acd0fa Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 12:06:33 +0200
Subject: [PATCH 064/135] style

---
 htdocs/public/eventorganization/attendee_subscription.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 6e06838de91..1a17f13c2b4 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -256,7 +256,6 @@ if (empty($reshook) && $action == 'add') {
 			// Fetch using the input field by user
 			if (!empty($societe)) {
 				$resultfetchthirdparty = $thirdparty->fetch('', $societe);
-				var_dump($resultfetchthirdparty);
 				if ($resultfetchthirdparty<=0) {
 					// Need to create a new one
 					$resultfetchthirdparty = 0;
@@ -269,7 +268,6 @@ if (empty($reshook) && $action == 'add') {
 				$resultfetchthirdparty = 0;
 			}
 		}
-		var_dump($resultfetchthirdparty);
 		if ($resultfetchthirdparty<0) {
 			$error++;
 			$errmsg .= $thirdparty->error;
@@ -314,7 +312,7 @@ if (empty($reshook) && $action == 'add') {
 			} else {
 				$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
 				$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
-				$confattendee->fk_soc = $thirdparty->id;
+				$confattendee->fk_soc     = $thirdparty->id;
 				$confattendee->update($user);
 			}
 		}
@@ -338,7 +336,6 @@ if (empty($reshook) && $action == 'add') {
 				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
 
 				if (empty($facture->cond_reglement_id)) {
-					var_dump($confattendee->db);
 					$paymenttermstatic = new PaymentTerm($confattendee->db);
 					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();
 					if (empty($facture->cond_reglement_id)) {

From 467595ce60a4291f581746088cf2200ebfaa773e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 14:53:32 +0200
Subject: [PATCH 065/135] an already subscribed attendee will not be redirected
 to a payment page, now

---
 htdocs/public/eventorganization/attendee_subscription.php | 8 ++++++--
 htdocs/public/payment/paymentok.php                       | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 1a17f13c2b4..6c069122d65 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -72,6 +72,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
 global $dolibarr_main_instance_unique_id;
+global $dolibarr_main_url_root;
 
 // Init vars
 $errmsg = '';
@@ -246,7 +247,11 @@ if (empty($reshook) && $action == 'add') {
 				$errmsg .= $confattendee->error;
 			}
 		}
-
+		if($confattendee->status == 1) {
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+			Header("Location: ".$redirection);
+			exit;
+		}
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
 		// Fetch using fk_soc of the existing attendee
@@ -320,7 +325,6 @@ if (empty($reshook) && $action == 'add') {
 
 	if (!$error) {
 		$db->commit();
-		global $dolibarr_main_url_root;
 		if (!empty(floatval($project->price_registration))) {
 			$productforinvoicerow = new Product($db);
 			$resultprod = $productforinvoicerow->fetch($conf->global->SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION);
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 27b00fec402..d4946ce0ac7 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -944,7 +944,7 @@ if ($ispaymentok) {
 			$ispostactionok = -1;
 		}
 	} elseif (array_key_exists('BOO', $tmptag) && $tmptag['BOO'] > 0) {
-		// BOOTH CASE (to copy and adapt from above)
+		// @todo BOOTH CASE (to copy and adapt from above)
 	} else {
 		// Nothing done
 	}

From eb96d5bd58017c1d236e56e7fb6c163569c9a753 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 15:27:16 +0200
Subject: [PATCH 066/135] added comments

---
 .../eventorganization/attendee_subscription.php      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 6c069122d65..9fb27168fd1 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -247,6 +247,9 @@ if (empty($reshook) && $action == 'add') {
 				$errmsg .= $confattendee->error;
 			}
 		}
+		// At this point, we have an attendee. It may not be linked to a thirdparty if we just created it
+
+		// If the attendee has already paid
 		if($confattendee->status == 1) {
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
 			Header("Location: ".$redirection);
@@ -254,22 +257,23 @@ if (empty($reshook) && $action == 'add') {
 		}
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
-		// Fetch using fk_soc of the existing attendee
+		// Fetch using fk_soc if the attendee was already existing
 		if (!empty($confattendee->fk_soc)) {
 			$resultfetchthirdparty = $thirdparty->fetch($confattendee->fk_soc);
 		} else {
-			// Fetch using the input field by user
+			// Fetch using the input field by user if we just created the attendee
 			if (!empty($societe)) {
 				$resultfetchthirdparty = $thirdparty->fetch('', $societe);
 				if ($resultfetchthirdparty<=0) {
-					// Need to create a new one
+					// Need to create a new one (not found or multiple with the same name)
 					$resultfetchthirdparty = 0;
 				} else {
+					// We found an unique result with that name, so we put in in fk_soc of attendee
 					$confattendee->fk_soc = $thirdparty->id;
 					$confattendee->update($user);
 				}
 			} else {
-				// Need to create a thirdparty
+				// Need to create a thirdparty (put number>0 if we do not want to create a thirdparty for free-conferences)
 				$resultfetchthirdparty = 0;
 			}
 		}

From 804547997bea4a6b65e52286ce376d671fecc91f Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 15:52:45 +0200
Subject: [PATCH 067/135] removed obsolete post information and now giving the
 source in the url

---
 htdocs/public/payment/newpayment.php | 8 +++-----
 htdocs/public/payment/paymentok.php  | 6 ------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 461cd406a92..1b737037a93 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -207,8 +207,6 @@ if (!empty($entity)) {
 $urlok = preg_replace('/&$/', '', $urlok); // Remove last &
 $urlko = preg_replace('/&$/', '', $urlko); // Remove last &
 
-
-
 // Make special controls
 
 if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled)) {
@@ -379,7 +377,7 @@ if ($action == 'dopayment') {
 
 			// A redirect is added if API call successfull
 			if ($source == 'conferencesubscription') {
-				$PAYPAL_API_OK .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+				$PAYPAL_API_OK .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
@@ -400,7 +398,7 @@ if ($action == 'dopayment') {
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 
 		$mesg = '';
@@ -758,7 +756,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		exit;
 	} else {
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 		header("Location: ".$urlok);
 		exit;
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index d4946ce0ac7..681c980a3e8 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -109,12 +109,6 @@ $invoiceref = GETPOST('invoice');
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');
 
-$conferencesubscription = GETPOST('conferencesubscription');
-$uncryptedconferencesubscription = dol_decode($conferencesubscription, $dolibarr_main_instance_unique_id);
-$subscription = substr($uncryptedconferencesubscription, 0, strlen($uncryptedconferencesubscription)-strlen($ref));
-$reffrompayment = substr($uncryptedconferencesubscription, -strlen($ref), strlen($ref));
-
-
 // Detect $paymentmethod
 $paymentmethod = '';
 $reg = array();

From f832434ce3ebfbd2245d33ef5d456169ce562927 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 22 Apr 2021 16:17:22 +0200
Subject: [PATCH 068/135] removing mistake from last commit: source is already
 given in urlok

---
 htdocs/public/payment/newpayment.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 1b737037a93..2f6b61a82d4 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -377,7 +377,7 @@ if ($action == 'dopayment') {
 
 			// A redirect is added if API call successfull
 			if ($source == 'conferencesubscription') {
-				$PAYPAL_API_OK .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+				$PAYPAL_API_OK .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
@@ -398,7 +398,7 @@ if ($action == 'dopayment') {
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 
 		$mesg = '';
@@ -756,7 +756,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		exit;
 	} else {
 		if ($source == 'conferencesubscription') {
-			$urlok .= '&source=conferencesubscription&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
+			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
 		}
 		header("Location: ".$urlok);
 		exit;

From 4589813d3f87521e10f7fdb05d239e009cc50934 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 09:46:02 +0200
Subject: [PATCH 069/135] added thirdparty fetch before mail sending to get its
 name

---
 htdocs/public/payment/paymentok.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 681c980a3e8..cdee63c2955 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -884,6 +884,9 @@ if ($ispaymentok) {
 						$attendeetovalidate->setStatut(1);
 
 						// Sending mail
+						$thirdparty = new Societe($db);
+						$thirdparty->fetch($attendeetovalidate->fk_soc);
+
 						require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 						$formmail = new FormMail($db);

From b441c600bb1a9c5fe8daff4df13ba68c836be9fe Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 10:32:28 +0200
Subject: [PATCH 070/135] fixing error introduced in a previous commit

---
 htdocs/compta/paiement.php                                    | 2 +-
 htdocs/core/class/CMailFile.class.php                         | 1 +
 .../class/conferenceorboothattendee.class.php                 | 1 -
 htdocs/public/payment/newpayment.php                          | 4 ++--
 htdocs/public/payment/paymentok.php                           | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 418bca03d83..94b114c03d8 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -253,7 +253,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			// Create payment and update this->multicurrency_amounts if this->amounts filled or
 			// this->amounts if this->multicurrency_amounts filled.
-			$paiement_id = $paiement->create($user, 1, $thirdparty); // This include closing invoices and regenerating documents
+			$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
 			if ($paiement_id < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 526c464403f..863bb9a6794 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -584,6 +584,7 @@ class CMailFile
 			if ($reshook < 0) {
 				$this->error = "Error in hook maildao sendMail ".$reshook;
 				dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+
 				return $reshook;
 			}
 			if ($reshook == 1) {	// Hook replace standard code
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index d8e166fde5a..6418d73580b 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -438,7 +438,6 @@ class ConferenceOrBoothAttendee extends CommonObject
 		}
 
 		$resql = $this->db->query($sql);
-
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 2f6b61a82d4..5007b325c11 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -157,7 +157,6 @@ foreach ($_POST as $key => $val) {
 }
 
 
-
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
@@ -207,6 +206,8 @@ if (!empty($entity)) {
 $urlok = preg_replace('/&$/', '', $urlok); // Remove last &
 $urlko = preg_replace('/&$/', '', $urlko); // Remove last &
 
+
+
 // Make special controls
 
 if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled)) {
@@ -264,7 +265,6 @@ if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 	} else {
 		$token = $conf->global->PAYMENT_SECURITY_TOKEN;
 	}
-
 	if ($SECUREKEY != $token) {
 		if (empty($conf->global->PAYMENT_SECURITY_ACCEPT_ANY_TOKEN)) {
 			$valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index cdee63c2955..444a769673c 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -109,6 +109,7 @@ $invoiceref = GETPOST('invoice');
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');
 
+
 // Detect $paymentmethod
 $paymentmethod = '';
 $reg = array();
@@ -151,6 +152,7 @@ $object = new stdClass(); // For triggers
 
 $error = 0;
 
+
 /*
  * Actions
  */

From 432bdaea654a030c2968b7e2fdf0b1e0bee13269 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 10:36:12 +0200
Subject: [PATCH 071/135] same as previous commit

---
 htdocs/admin/eventorganization.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index b4b6604b118..9cbbdaf3f7d 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -283,6 +283,8 @@ if ($action == 'edit') {
 					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
 					$form->select_produits($selected, $constname, '', 0);
 				}
+			} else {
+				print '<input name="' . $constname . '"  class="flat ' . (empty($val['css']) ? 'minwidth200' : $val['css']) . '" value="' . $conf->global->{$constname} . '">';
 			}
 			print '</td></tr>';
 		}

From 1511bf811c0438f36d7c088fc49abd52ab285057 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 12:22:03 +0200
Subject: [PATCH 072/135] now getting the amount of the invoice in the
 newpayment page

---
 htdocs/public/payment/newpayment.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 5007b325c11..d6613cb86de 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -132,6 +132,7 @@ if ($source == 'conferencesubscription') {
 			if ($resultinvoice <= 0) {
 				setEventMessages(null, $invoice->errors, "errors");
 			} else {
+				$amount = price2num($invoice->total_ttc);
 				// Finding the associated thirdparty
 				$thirdparty = new Societe($db);
 				$resultthirdparty = $thirdparty->fetch($invoice->socid);
@@ -1814,7 +1815,7 @@ if ($source == 'conferencesubscription') {
 	// Amount
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Amount");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'">';
-	$valtoshow = $invoice->total_ttc;
+	$valtoshow = $amount;
 	print '<b>'.price($valtoshow).'</b>';
 	print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 	print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';

From f8479b4a574a2f175f00daa1fc7c88cca3e5b787 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@scopen.fr>
Date: Fri, 23 Apr 2021 16:37:39 +0200
Subject: [PATCH 073/135] fixed invoice validation, payment, and attendee
 validation

---
 .../attendee_subscription.php                 |  2 +-
 htdocs/public/payment/newpayment.php          | 28 +++++++++----------
 htdocs/public/payment/paymentok.php           | 12 ++++++--
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 9fb27168fd1..fab0a9733c8 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -374,7 +374,7 @@ if (empty($reshook) && $action == 'add') {
 				if (!$error) {
 					$valid = true;
 					$sourcetouse = 'conferencesubscription';
-					$reftouse = $confattendee->id;
+					$reftouse = $facture->id;
 					$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.$sourcetouse.'&ref='.$reftouse;
 					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index d6613cb86de..4460988ea60 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -114,23 +114,23 @@ if (!$action) {
 
 if ($source == 'conferencesubscription') {
 	// Finding the Attendee
-	$attendeeid = GETPOST('ref');
-	$attendee = new ConferenceOrBoothAttendee($db);
-	$resultattendee = $attendee->fetch($attendeeid);
-	if ($resultattendee <= 0) {
-		setEventMessages(null, $attendee->errors, "errors");
+	$invoiceid = GETPOST('ref');
+	$invoice = new Facture($db);
+	$resultinvoice = $invoice->fetch($invoiceid);
+	if ($resultinvoice <= 0) {
+		setEventMessages(null, $invoice->errors, "errors");
 	} else {
 
-		$attendee->fetchObjectLinked();
-		$linkedInvoices = $attendee->linkedObjectsIds['facture'];
+		$invoice->fetchObjectLinked();
+		$linkedAttendees = $invoice->linkedObjectsIds['conferenceorboothattendee'];
 
-		if (is_array($linkedInvoices)) {
-			$linkedInvoices = array_values($linkedInvoices);
+		if (is_array($linkedAttendees)) {
+			$linkedAttendees = array_values($linkedAttendees);
 
-			$invoice = new Facture($db);
-			$resultinvoice = $invoice->fetch($linkedInvoices[0]);
-			if ($resultinvoice <= 0) {
-				setEventMessages(null, $invoice->errors, "errors");
+			$attendee = new ConferenceOrBoothAttendee($db);
+			$resultattendee = $attendee->fetch($linkedAttendees[0]);
+			if ($resultattendee <= 0) {
+				setEventMessages(null, $attendee->errors, "errors");
 			} else {
 				$amount = price2num($invoice->total_ttc);
 				// Finding the associated thirdparty
@@ -1809,7 +1809,7 @@ if ($source == 'conferencesubscription') {
 	print '<tr class="CTableRow'.($var ? '1' : '2').'"><td class="CTableRow'.($var ? '1' : '2').'">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow'.($var ? '1' : '2').'">'.$text;
 	print '<input type="hidden" name="source" value="'.dol_escape_htmltag($source).'">';
-	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($attendee->id).'">';
+	print '<input type="hidden" name="ref" value="'.dol_escape_htmltag($invoice->id).'">';
 	print '</td></tr>'."\n";
 
 	// Amount
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 444a769673c..39cfa0f37c9 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -784,7 +784,7 @@ if ($ispaymentok) {
 		// Record payment
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 		$object = new Facture($db);
-		$result = $object->fetch($tmptag['ATT']);
+		$result = $object->fetch($ref);
 		if ($result) {
 			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
@@ -810,6 +810,14 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
+				$resultvalidate = $object->validate($user); 
+ 				if ($resultvalidate < 0) {
+					$postactionmessages[] = 'Cannot validate invoice';
+                                        $ispostactionok = -1;
+                                        $error++; // Not yet supported
+				} else {
+				
+				}
 				$db->begin();
 
 				// Creation of payment line
@@ -879,7 +887,7 @@ if ($ispaymentok) {
 
 					// Validating the attendee
 					$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-					$resultattendee = $attendeetovalidate->fetch($ref);
+					$resultattendee = $attendeetovalidate->fetch($tmptag['ATT']);
 					if ($resultattendee < 0) {
 						setEventMessages(null, $attendeetovalidate->errors, "errors");
 					} else {

From f65fa98c37a7894ea69e6afb5f0c6bdb7a57732c Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 16:46:09 +0200
Subject: [PATCH 074/135] indent fix, validation and mail sending put into else
 block to avoid errors

---
 htdocs/public/payment/paymentok.php | 219 ++++++++++++++--------------
 1 file changed, 109 insertions(+), 110 deletions(-)

diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 39cfa0f37c9..3d3946927c8 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -810,137 +810,136 @@ if ($ispaymentok) {
 
 			// Do action only if $FinalPaymentAmt is set (session variable is cleaned after this page to avoid duplicate actions when page is POST a second time)
 			if (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
-				$resultvalidate = $object->validate($user); 
- 				if ($resultvalidate < 0) {
+				$resultvalidate = $object->validate($user);
+				if ($resultvalidate < 0) {
 					$postactionmessages[] = 'Cannot validate invoice';
-                                        $ispostactionok = -1;
-                                        $error++; // Not yet supported
-				} else {
-				
-				}
-				$db->begin();
-
-				// Creation of payment line
-				include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
-				$paiement = new Paiement($db);
-				$paiement->datepaye = $now;
-				if ($currencyCodeType == $conf->currency) {
-					$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
-				} else {
-					$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
-
-					$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
 					$ispostactionok = -1;
 					$error++; // Not yet supported
-				}
-				$paiement->paiementid   = $paymentTypeId;
-				$paiement->num_payment = '';
-				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
-				$paiement->ext_payment_id = $TRANSACTIONID;
-				$paiement->ext_payment_site = $service;
+				} else {
+					$db->begin();
 
-				if (!$error) {
-					$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
-					if ($paiement_id < 0) {
-						$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
-						$ispostactionok = -1;
-						$error++;
+					// Creation of payment line
+					include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+					$paiement = new Paiement($db);
+					$paiement->datepaye = $now;
+					if ($currencyCodeType == $conf->currency) {
+						$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with invoice id
 					} else {
-						$postactionmessages[] = 'Payment created';
-						$ispostactionok = 1;
-					}
-				}
+						$paiement->multicurrency_amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching
 
-				if (!$error && !empty($conf->banque->enabled)) {
-					$bankaccountid = 0;
-					if ($paymentmethod == 'paybox') {
-						$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
-					} elseif ($paymentmethod == 'paypal') {
-						$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
-					} elseif ($paymentmethod == 'stripe') {
-						$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+						$postactionmessages[] = 'Payment was done in a different currency that currency expected of company';
+						$ispostactionok = -1;
+						$error++; // Not yet supported
 					}
+					$paiement->paiementid   = $paymentTypeId;
+					$paiement->num_payment = '';
+					$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
+					$paiement->ext_payment_id = $TRANSACTIONID;
+					$paiement->ext_payment_site = $service;
 
-					if ($bankaccountid > 0) {
-						$label = '(CustomerInvoicePayment)';
-						if ($object->type == Facture::TYPE_CREDIT_NOTE) {
-							$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
-						}
-						$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
-						if ($result < 0) {
+					if (!$error) {
+						$paiement_id = $paiement->create($user, 1); // This include closing invoices and regenerating documents
+						if ($paiement_id < 0) {
 							$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
 							$ispostactionok = -1;
 							$error++;
 						} else {
-							$postactionmessages[] = 'Bank transaction of payment created';
+							$postactionmessages[] = 'Payment created';
 							$ispostactionok = 1;
 						}
-					} else {
-						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
-						$ispostactionok = -1;
-						$error++;
 					}
-				}
 
-				if (!$error) {
-					$db->commit();
-
-					// Validating the attendee
-					$attendeetovalidate = new ConferenceOrBoothAttendee($db);
-					$resultattendee = $attendeetovalidate->fetch($tmptag['ATT']);
-					if ($resultattendee < 0) {
-						setEventMessages(null, $attendeetovalidate->errors, "errors");
-					} else {
-						$attendeetovalidate->setStatut(1);
-
-						// Sending mail
-						$thirdparty = new Societe($db);
-						$thirdparty->fetch($attendeetovalidate->fk_soc);
-
-						require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-						$formmail = new FormMail($db);
-						// Set output language
-						$outputlangs = new Translate('', $conf);
-						$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
-						// Load traductions files required by page
-						$outputlangs->loadLangs(array("main", "members"));
-						// Get email content from template
-						$arraydefaultmessage = null;
-
-						$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-						if (!empty($labeltouse)) {
-							$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+					if (!$error && !empty($conf->banque->enabled)) {
+						$bankaccountid = 0;
+						if ($paymentmethod == 'paybox') {
+							$bankaccountid = $conf->global->PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS;
+						} elseif ($paymentmethod == 'paypal') {
+							$bankaccountid = $conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS;
+						} elseif ($paymentmethod == 'stripe') {
+							$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
 						}
 
-						if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-							$subject = $arraydefaultmessage->topic;
-							$msg     = $arraydefaultmessage->content;
-						}
-
-						$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
-						complete_substitutions_array($substitutionarray, $outputlangs, $object);
-
-						$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-						$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-						$sendto = $thirdparty->email;
-						$from = $conf->global->MAILING_EMAIL_FROM;
-						$urlback = $_SERVER["REQUEST_URI"];
-
-						$ishtml = dol_textishtml($texttosend); // May contain urls
-
-						$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
-
-						$result = $mailfile->sendfile();
-						if ($result) {
-							dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+						if ($bankaccountid > 0) {
+							$label = '(CustomerInvoicePayment)';
+							if ($object->type == Facture::TYPE_CREDIT_NOTE) {
+								$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+							}
+							$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
+							if ($result < 0) {
+								$postactionmessages[] = $paiement->error.' '.join("<br>\n", $paiement->errors);
+								$ispostactionok = -1;
+								$error++;
+							} else {
+								$postactionmessages[] = 'Bank transaction of payment created';
+								$ispostactionok = 1;
+							}
 						} else {
-							dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+							$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
+							$ispostactionok = -1;
+							$error++;
 						}
 					}
-				} else {
-					$db->rollback();
+
+					if (!$error) {
+						$db->commit();
+
+						// Validating the attendee
+						$attendeetovalidate = new ConferenceOrBoothAttendee($db);
+						$resultattendee = $attendeetovalidate->fetch($tmptag['ATT']);
+						if ($resultattendee < 0) {
+							setEventMessages(null, $attendeetovalidate->errors, "errors");
+						} else {
+							$attendeetovalidate->setStatut(1);
+
+							// Sending mail
+							$thirdparty = new Societe($db);
+							$thirdparty->fetch($attendeetovalidate->fk_soc);
+
+							require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+							include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+							$formmail = new FormMail($db);
+							// Set output language
+							$outputlangs = new Translate('', $conf);
+							$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
+							// Load traductions files required by page
+							$outputlangs->loadLangs(array("main", "members"));
+							// Get email content from template
+							$arraydefaultmessage = null;
+
+							$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+							if (!empty($labeltouse)) {
+								$arraydefaultmessage = $formmail->getEMailTemplate($db, 'eventorganization_send', $user, $outputlangs, $labeltouse, 1, '');
+							}
+
+							if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+								$subject = $arraydefaultmessage->topic;
+								$msg     = $arraydefaultmessage->content;
+							}
+
+							$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
+							complete_substitutions_array($substitutionarray, $outputlangs, $object);
+
+							$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+							$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
+
+							$sendto = $thirdparty->email;
+							$from = $conf->global->MAILING_EMAIL_FROM;
+							$urlback = $_SERVER["REQUEST_URI"];
+
+							$ishtml = dol_textishtml($texttosend); // May contain urls
+
+							$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+
+							$result = $mailfile->sendfile();
+							if ($result) {
+								dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
+							} else {
+								dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+							}
+						}
+					} else {
+						$db->rollback();
+					}
 				}
 			} else {
 				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['ATT'].'. May be payment was already recorded.';

From e9b35cf36b7f5b4e3ad1441bdd33afae09cb2a8e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Fri, 23 Apr 2021 16:53:34 +0200
Subject: [PATCH 075/135] mail template modified to add company name and remove
 useless payment link

---
 htdocs/install/mysql/data/llx_c_email_templates.sql | 2 +-
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index fabbbf2e700..5ca98be8545 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -35,6 +35,6 @@ INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_u
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskConf', 10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskBooth', 20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsBooth', 30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailAttendees', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailSpeakers', 60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index ba36b27e885..52ac44e05a0 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -196,7 +196,7 @@ ALTER TABLE llx_tva ALTER COLUMN paye SET DEFAULT 0;
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskConf', 10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskBooth', 20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsBooth', 30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__(Sincerely)__<br /><br />__MYCOMPANY_NAME__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailAttendees', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailSpeakers', 60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
 

From 7f9f67e7efadf8a732daa1e8c55a944af2617b70 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 23 Apr 2021 15:12:34 +0000
Subject: [PATCH 076/135] Fixing style errors.

---
 .../class/conferenceorbooth.class.php         | 12 ++++----
 .../conferenceorbooth_card.php                |  2 +-
 htdocs/modulebuilder/template/admin/setup.php | 30 +++++++++----------
 .../attendee_subscription.php                 |  3 +-
 htdocs/public/payment/newpayment.php          |  1 -
 htdocs/public/project/index.php               |  4 +--
 6 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index b859c10a98d..02714496b35 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -237,19 +237,19 @@ class ConferenceOrBooth extends ActionComm
 	 */
 	public function fetch($id, $ref = null, $ref_ext = '', $email_msgid = '')
 	{
-	    global $dolibarr_main_url_root, $dolibarr_main_instance_unique_id, $conf, $langs;
-	    
+		global $dolibarr_main_url_root, $dolibarr_main_instance_unique_id, $conf, $langs;
+
 		$result = parent::fetch($id, $ref, $ref_ext, $email_msgid);
-		
+
 		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
-		
+
 		$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
-		
+
 		$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
 		$this->pubregister = $link_subscription;
-		
+
 		$this->getActionCommFields();
 		return $result;
 	}
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index fc232406ce9..f983994c4ec 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -494,7 +494,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
 	$keyforbreak='pubregister';
-	
+
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 	//var_dump($object);
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index 96f4d831261..21057347115 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -81,8 +81,8 @@ $arrayofparameters = array(
 	//'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),
+	//'MYMODULE_MYPARAM6'=>array('type'=>'securekey', 'enabled'=>1),
+	//'MYMODULE_MYPARAM7'=>array('type'=>'product', 'enabled'=>1),
 );
 
 $error = 0;
@@ -296,13 +296,13 @@ if ($action == 'edit') {
             				});
                          });
                     });';
-			        print '</script>';
-			    }
+					print '</script>';
+				}
 			} elseif ($val['type'] == 'product') {
-			    if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-			        $selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
-			        $form->select_produits($selected, $constname, '', 0);
-			    }
+				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+					$form->select_produits($selected, $constname, '', 0);
+				}
 			} else {
 				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
 			}
@@ -370,13 +370,13 @@ if ($action == 'edit') {
 						print $langs->trans("NorProspectNorCustomer");
 					}
 				} elseif ($val['type'] == 'product') {
-				    $product = new Product($db);
-				    $resprod = $product->fetch($conf->global->{$constname});
-				    if ($resprod > 0) {
-				        print $product->ref;
-				    } elseif ($resprod < 0) {
-				        setEventMessages(null, $object->errors, "errors");
-				    }
+					$product = new Product($db);
+					$resprod = $product->fetch($conf->global->{$constname});
+					if ($resprod > 0) {
+						print $product->ref;
+					} elseif ($resprod < 0) {
+						setEventMessages(null, $object->errors, "errors");
+					}
 				} else {
 					print $conf->global->{$constname};
 				}
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index fab0a9733c8..40f238c90d6 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -250,7 +250,7 @@ if (empty($reshook) && $action == 'add') {
 		// At this point, we have an attendee. It may not be linked to a thirdparty if we just created it
 
 		// If the attendee has already paid
-		if($confattendee->status == 1) {
+		if ($confattendee->status == 1) {
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
 			Header("Location: ".$redirection);
 			exit;
@@ -379,7 +379,6 @@ if (empty($reshook) && $action == 'add') {
 					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 						if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 							$redirection .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
-
 						} else {
 							$redirection .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
 						}
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 4460988ea60..b351367f6ea 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -120,7 +120,6 @@ if ($source == 'conferencesubscription') {
 	if ($resultinvoice <= 0) {
 		setEventMessages(null, $invoice->errors, "errors");
 	} else {
-
 		$invoice->fetchObjectLinked();
 		$linkedAttendees = $invoice->linkedObjectsIds['conferenceorboothattendee'];
 
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index ff6da63be9a..03f26ed2f37 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -193,13 +193,13 @@ print "\n";
 // Show all action buttons
 print '<br>';
 // Output introduction text
-if($project->accept_conference_suggestions){
+if ($project->accept_conference_suggestions) {
 	print '<input type="submit" value="'.$langs->trans("SuggestConference").'" id="suggestconference" class="button">';
 	print '<br><br>';
 }
 print '<input type="submit" value="'.$langs->trans("ViewAndVote").'" id="viewandvote" class="button">';
 print '<br><br>';
-if($project->accept_booth_suggestions){
+if ($project->accept_booth_suggestions) {
 	print '<input type="submit" value="'.$langs->trans("SuggestBooth").'" id="suggestbooth" class="button">';
 }
 

From 99589fd69318f3777ad1913af1ac4e55f12dd797 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 09:57:27 +0200
Subject: [PATCH 077/135] added fk_project in $facture

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 40f238c90d6..5f0025b23aa 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -342,7 +342,7 @@ if (empty($reshook) && $action == 'add') {
 				$facture->paye = 0;
 				$facture->date = dol_now();
 				$facture->cond_reglement_id = $confattendee->cond_reglement_id;
-
+				$facture->fk_project = $project->id;
 				if (empty($facture->cond_reglement_id)) {
 					$paymenttermstatic = new PaymentTerm($confattendee->db);
 					$facture->cond_reglement_id = $paymenttermstatic->getDefaultId();

From d034446205e41d31d7c103500b99c483386852ad Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 10:08:32 +0200
Subject: [PATCH 078/135] not giving the invoiceref anymore in the url from
 newpayment to paymentok, since it was already in ref= anyway

---
 htdocs/public/payment/newpayment.php | 10 ----------
 htdocs/public/payment/paymentok.php  |  1 -
 2 files changed, 11 deletions(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index b351367f6ea..0e24d94c177 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -376,9 +376,6 @@ if ($action == 'dopayment') {
 			dol_syslog("SCRIPT_URI: ".(empty($_SERVER["SCRIPT_URI"]) ? '' : $_SERVER["SCRIPT_URI"]), LOG_DEBUG); // If defined script uri must match domain of PAYPAL_API_OK and PAYPAL_API_KO
 
 			// A redirect is added if API call successfull
-			if ($source == 'conferencesubscription') {
-				$PAYPAL_API_OK .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
-			}
 			$mesg = print_paypal_redirect($PAYPAL_API_PRICE, $PAYPAL_API_DEVISE, $PAYPAL_PAYMENT_TYPE, $PAYPAL_API_OK, $PAYPAL_API_KO, $FULLTAG);
 
 			// If we are here, it means the Paypal redirect was not done, so we show error message
@@ -397,10 +394,6 @@ if ($action == 'dopayment') {
 		$urlok = preg_replace('/securekey=[^&]+/', '', $urlok);
 		$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
 
-		if ($source == 'conferencesubscription') {
-			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
-		}
-
 		$mesg = '';
 		if (empty($PRICE) || !is_numeric($PRICE)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
@@ -755,9 +748,6 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		header("Location: ".$urlko);
 		exit;
 	} else {
-		if ($source == 'conferencesubscription') {
-			$urlok .= '&invoice='.dol_encode($invoice->id, $dolibarr_main_instance_unique_id);
-		}
 		header("Location: ".$urlok);
 		exit;
 	}
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index 3d3946927c8..1cfeb99ec80 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -104,7 +104,6 @@ if (empty($FULLTAG)) {
 }
 $source = GETPOST('s', 'alpha') ? GETPOST('s', 'alpha') : GETPOST('source', 'alpha');
 $ref = GETPOST('ref');
-$invoiceref = GETPOST('invoice');
 
 $suffix = GETPOST("suffix", 'aZ09');
 $membertypeid = GETPOST("membertypeid", 'int');

From a508cdbf5957dbc4d87035ee6119e374fb055147 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 14:01:44 +0200
Subject: [PATCH 079/135] every dol_encode for securekey replaced with dol_hash
 (dol_encode kept for encoding ids

---
 .../class/conferenceorbooth.class.php         |  2 +-
 .../conferenceorbooth_list.php                |  2 +-
 htdocs/langs/en_US/eventorganization.lang     |  4 ++--
 .../attendee_subscription.php                 | 21 ++++++++++---------
 .../eventorganization/subscriptionok.php      |  8 +++++--
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 02714496b35..16e61959f0c 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -244,7 +244,7 @@ class ConferenceOrBooth extends ActionComm
 		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
 
-		$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
+		$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 
 		$this->fields['pubregister'] = array('type'=>'url', 'label'=>$langs->trans("PublicAttendeeSubscriptionPage"), 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>1);
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index cbf0e91f7fa..e3ba815121c 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -366,7 +366,7 @@ if ($projectid > 0) {
 	print '<tr><td>'.$langs->trans("RegisterPage").'</td><td>';
 	$encodedid = dol_encode($project->id, $dolibarr_main_instance_unique_id);
 	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$encodedid;
-	$encodedsecurekey = dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY.$encodedid, $dolibarr_main_instance_unique_id);
+	$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$project->id, 2);
 	$linkregister .= '&securekey='.urlencode($encodedsecurekey);
 	print '<a target="_blank" href="'.$linkregister.'">'.$linkregister.'</a>';
 	print '</td></tr>';
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 6ef39e81ff6..55117ebb5e4 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -105,8 +105,8 @@ ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
 EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
-EvntOrgDuration = This conference starts on %s and ends on %s
-ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s
+EvntOrgDuration = This conference starts on %s and ends on %s.
+ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 #
 # SubscriptionOk page
 #
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 5f0025b23aa..0f583f7cfc0 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -101,16 +101,13 @@ if ($resultproject < 0) {
 	$errmsg .= $project->error;
 }
 
-// Getting 'securekey'.'id' from Post and decoding it
-$encodedsecurekeyandid = GETPOST('securekey', 'alpha');
-$securekeyandid = dol_decode($encodedsecurekeyandid, $dolibarr_main_instance_unique_id);
 
-// Securekey decomposition into pure securekey and id added at the end
-$securekey = substr($securekeyandid, 0, strlen($securekeyandid)-strlen($encodedid));
-$idgotfromsecurekey = dol_decode(substr($securekeyandid, -strlen($encodedid), strlen($encodedid)), $dolibarr_main_instance_unique_id);
+// Getting 'securekey'.'id' from Post and decoding it
+$securekeyreceived = GETPOST('securekey', 'alpha');
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
 // We check if the securekey collected is OK and if the id collected is the same than the id in the securekey
-if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY || $idgotfromsecurekey != $id) {
+if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
 	exit;
 }
@@ -251,7 +248,9 @@ if (empty($reshook) && $action == 'add') {
 
 		// If the attendee has already paid
 		if ($confattendee->status == 1) {
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+			$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
 			Header("Location: ".$redirection);
 			exit;
 		}
@@ -435,7 +434,9 @@ if (empty($reshook) && $action == 'add') {
 				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			}
 
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?securekey='.dol_encode($conf->global->EVENTORGANIZATION_SECUREKEY, $dolibarr_main_instance_unique_id);
+			$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
+			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
 			Header("Location: ".$redirection);
 			exit;
 		}
@@ -478,7 +479,7 @@ print '<input type="hidden" name="token" value="'.newToken().'" / >';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print '<input type="hidden" name="action" value="add" />';
 print '<input type="hidden" name="id" value="'.$encodedid.'" />';
-print '<input type="hidden" name="securekey" value="'.$encodedsecurekeyandid.'" />';
+print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
 
 print '<br>';
 
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 81db5ac1c02..31c3281a526 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -65,8 +65,12 @@ $object = new stdClass(); // For triggers
 $error = 0;
 
 // Security check
-$securekey = dol_decode(GETPOST('securekey'), $dolibarr_main_instance_unique_id);
-if ($securekey != $conf->global->EVENTORGANIZATION_SECUREKEY) {
+$encodedid = GETPOST("id");
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$securekeyreceived = GETPOST("securekey");
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+
+if ($securekeyreceived != $securekeytocompare) {
 	print $langs->trans('MissingOrBadSecureKey');
 	exit;
 }

From fab12bc5e582e61b41e42487acdfea7c27d9e45e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 14:04:08 +0200
Subject: [PATCH 080/135] removed the indicated id of conf when on the
 subscription page for security (now showing label instead)

---
 htdocs/langs/en_US/eventorganization.lang                 | 2 +-
 htdocs/public/eventorganization/attendee_subscription.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 55117ebb5e4..9f75374f2a0 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -104,7 +104,7 @@ SuggestBooth = Suggest a booth
 ViewAndVote = View and vote for suggested events
 PublicAttendeeSubscriptionPage = Public link of registration to a conference
 MissingOrBadSecureKey = The security key is invalid or missing
-EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference 
+EvntOrgWelcomeMessage = This form allows you to register as a new participant to the conference : '%s'
 EvntOrgDuration = This conference starts on %s and ends on %s.
 ConferenceAttendeeFee = Conference attendee fee for the event : '%s' occurring from %s to %s.
 #
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 0f583f7cfc0..f6b167d91f3 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -466,8 +466,8 @@ print '<div id="divsubscribe">';
 print '<div class="center subscriptionformhelptext justify">';
 
 // Welcome message
-print $langs->trans("EvntOrgWelcomeMessage");
-print $id.".".'<br>';
+print $langs->trans("EvntOrgWelcomeMessage", $conference->label);
+print '<br>';
 print $langs->trans("EvntOrgDuration", dol_print_date($conference->datep), dol_print_date($conference->datef));
 print '</div>';
 

From 79dce3ad0567ffed65841402e8a9e515c989802e Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 14:06:40 +0200
Subject: [PATCH 081/135] typo in comment

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index f6b167d91f3..5c31c88c38a 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -102,7 +102,7 @@ if ($resultproject < 0) {
 }
 
 
-// Getting 'securekey'.'id' from Post and decoding it
+// Security check
 $securekeyreceived = GETPOST('securekey', 'alpha');
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 

From 74057251980a089632f4bb1d28009dddaddf0792 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Tue, 27 Apr 2021 14:11:46 +0200
Subject: [PATCH 082/135] added security check at beginning of /project/index
 page (according to the security I added in the previous commits)

---
 .../public/eventorganization/attendee_subscription.php |  2 +-
 htdocs/public/project/index.php                        | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 5c31c88c38a..4940f5965fe 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -106,7 +106,7 @@ if ($resultproject < 0) {
 $securekeyreceived = GETPOST('securekey', 'alpha');
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
-// We check if the securekey collected is OK and if the id collected is the same than the id in the securekey
+// We check if the securekey collected is OK
 if ($securekeytocompare != $securekeyreceived) {
 	print $langs->trans('MissingOrBadSecureKey');
 	exit;
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 03f26ed2f37..d1744db0b4e 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -78,7 +78,15 @@ $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors",
 // No check on module enabled. Done later according to $validpaymentmethod
 
 $action = GETPOST('action', 'aZ09');
-$id = dol_decode(GETPOST('id'), $dolibarr_main_instance_unique_id);
+$encodedid = GETPOST('id');
+$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$securekeyreceived = GETPOST("securekey");
+$securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
+
+if ($securekeytocompare != $securekeyreceived) {
+	print $langs->trans('MissingOrBadSecureKey');
+	exit;
+}
 
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));

From 9fc67275fd7ce174a9ca2c50dfcef41de1e72137 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Tue, 27 Apr 2021 15:55:51 +0200
Subject: [PATCH 083/135] llx_c_productbatch_status to migration and
 translatable strings

---
 .../install/mysql/data/llx_c_productbatch_status.sql  |  4 ++--
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql      | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_productbatch_status.sql b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
index c925c0cd937..cd57bbb504b 100644
--- a/htdocs/install/mysql/data/llx_c_productbatch_status.sql
+++ b/htdocs/install/mysql/data/llx_c_productbatch_status.sql
@@ -23,6 +23,6 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'En état de marche', 1);
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'Hors d’usage', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
 
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 3f17d23b51f..818381588c4 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -141,6 +141,17 @@ CREATE TABLE llx_workstation_workstation_usergroup(
 	fk_workstation integer
 ) ENGINE=innodb;
 
+CREATE TABLE llx_c_producbatch_status(
+  rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+  code     varchar(16)        NOT NULL,
+  label    varchar(50)        NOT NULL,
+  active   integer  DEFAULT 1 NOT NULL
+) ENGINE=innodb;
+
+ALTER TABLE llx_c_productbatch_status ADD UNIQUE INDEX uk_c_productbatch_status(code);
+
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
+INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
 
 ALTER TABLE llx_product_customer_price ADD COLUMN ref_customer varchar(30);
 ALTER TABLE llx_product_customer_price_log ADD COLUMN ref_customer varchar(30);

From df2849152454406114472dacbb7495af211159cb Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 29 Apr 2021 09:40:47 +0200
Subject: [PATCH 084/135] every id is now clear in url + in the hash of the
 securekey

---
 .../eventorganization/class/conferenceorbooth.class.php  | 3 +--
 htdocs/eventorganization/conferenceorbooth_list.php      | 3 +--
 .../public/eventorganization/attendee_subscription.php   | 9 +++------
 htdocs/public/eventorganization/subscriptionok.php       | 3 +--
 htdocs/public/project/index.php                          | 3 +--
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 16e61959f0c..0df30ac61db 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -241,8 +241,7 @@ class ConferenceOrBooth extends ActionComm
 
 		$result = parent::fetch($id, $ref, $ref_ext, $email_msgid);
 
-		$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
-		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$encodedid;
+		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_subscription.php?id='.$id;
 
 		$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index e3ba815121c..be8770b6390 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -364,8 +364,7 @@ if ($projectid > 0) {
 
 	// Link to the vote/register page
 	print '<tr><td>'.$langs->trans("RegisterPage").'</td><td>';
-	$encodedid = dol_encode($project->id, $dolibarr_main_instance_unique_id);
-	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$encodedid;
+	$linkregister = $dolibarr_main_url_root.'/public/project/index.php?id='.$project->id;
 	$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$project->id, 2);
 	$linkregister .= '&securekey='.urlencode($encodedsecurekey);
 	print '<a target="_blank" href="'.$linkregister.'">'.$linkregister.'</a>';
diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index 4940f5965fe..c833cdaec8e 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -85,8 +85,7 @@ $email = GETPOST("email");
 $societe = GETPOST("societe");
 
 // Getting id from Post and decoding it
-$encodedid = GETPOST('id');
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$id = GETPOST('id');
 
 $conference = new ConferenceOrBooth($db);
 $resultconf = $conference->fetch($id);
@@ -248,9 +247,8 @@ if (empty($reshook) && $action == 'add') {
 
 		// If the attendee has already paid
 		if ($confattendee->status == 1) {
-			$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 			Header("Location: ".$redirection);
 			exit;
 		}
@@ -434,9 +432,8 @@ if (empty($reshook) && $action == 'add') {
 				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			}
 
-			$encodedid = dol_encode($id, $dolibarr_main_instance_unique_id);
 			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
-			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$encodedid.'&securekey='.$securekeyurl;
+			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.$id.'&securekey='.$securekeyurl;
 			Header("Location: ".$redirection);
 			exit;
 		}
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 31c3281a526..02fb456f7d2 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -65,8 +65,7 @@ $object = new stdClass(); // For triggers
 $error = 0;
 
 // Security check
-$encodedid = GETPOST("id");
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$id = GETPOST("id");
 $securekeyreceived = GETPOST("securekey");
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index d1744db0b4e..ce48db9e729 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -78,8 +78,7 @@ $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors",
 // No check on module enabled. Done later according to $validpaymentmethod
 
 $action = GETPOST('action', 'aZ09');
-$encodedid = GETPOST('id');
-$id = dol_decode($encodedid, $dolibarr_main_instance_unique_id);
+$id = GETPOST('id');
 $securekeyreceived = GETPOST("securekey");
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 2);
 

From d1fe595c09af59eac57d24f19bc512840d974bd1 Mon Sep 17 00:00:00 2001
From: Dorian Vabre <dorian.vabre@gmail.com>
Date: Thu, 29 Apr 2021 10:00:49 +0200
Subject: [PATCH 085/135] fix on the clear ids

---
 htdocs/public/eventorganization/attendee_subscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/eventorganization/attendee_subscription.php b/htdocs/public/eventorganization/attendee_subscription.php
index c833cdaec8e..70e994d57cd 100644
--- a/htdocs/public/eventorganization/attendee_subscription.php
+++ b/htdocs/public/eventorganization/attendee_subscription.php
@@ -475,7 +475,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'.
 print '<input type="hidden" name="token" value="'.newToken().'" / >';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
 print '<input type="hidden" name="action" value="add" />';
-print '<input type="hidden" name="id" value="'.$encodedid.'" />';
+print '<input type="hidden" name="id" value="'.$id.'" />';
 print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
 
 print '<br>';

From 762f41ea861018239eaa16cc88ca952960f107ef Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 29 Apr 2021 12:49:15 +0200
Subject: [PATCH 086/135] llx_c_productbatch_qcstatus as dictionnary name

---
 htdocs/admin/dict.php                                     | 7 +++++--
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql          | 8 ++++----
 ...status.key.sql => llx_c_productbatch_qcstatus.key.sql} | 2 +-
 ...ctbatch_status.sql => llx_c_productbatch_qcstatus.sql} | 2 +-
 htdocs/langs/en_US/productbatch.lang                      | 3 +++
 htdocs/langs/fr_FR/productbatch.lang                      | 6 +++++-
 6 files changed, 19 insertions(+), 9 deletions(-)
 rename htdocs/install/mysql/tables/{llx_c_productbatch_status.key.sql => llx_c_productbatch_qcstatus.key.sql} (90%)
 rename htdocs/install/mysql/tables/{llx_c_productbatch_status.sql => llx_c_productbatch_qcstatus.sql} (96%)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 8efbbf4cbfa..2b331c0c175 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -146,7 +146,7 @@ $tabname[39] = MAIN_DB_PREFIX."c_prospectcontactlevel";
 $tabname[40] = MAIN_DB_PREFIX."c_stcommcontact";
 $tabname[41] = MAIN_DB_PREFIX."c_transport_mode";
 $tabname[42] = MAIN_DB_PREFIX."c_product_nature";
-$tabname[43] = MAIN_DB_PREFIX."c_productbatch_status";
+$tabname[43] = MAIN_DB_PREFIX."c_productbatch_qcstatus";
 
 // Dictionary labels
 $tablib = array();
@@ -238,7 +238,7 @@ $tabsql[39] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_P
 $tabsql[40] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcommcontact";
 $tabsql[41] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_transport_mode";
 $tabsql[42] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_product_nature";
-$tabsql[43] = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_productbatch_status";
+$tabsql[43] = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_productbatch_qcstatus";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -1979,6 +1979,9 @@ if ($id) {
 							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') {
 								$langs->load("products");
 								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_productbatch_qcstatus') {
+								$langs->load("productbatch");
+								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
 							}
 							$class .= ($class ? ' ' : '').'tddict';
 							if ($fieldlist[$field] == 'note' && $id == 10) {
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 818381588c4..9eedc2872c6 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -141,17 +141,17 @@ CREATE TABLE llx_workstation_workstation_usergroup(
 	fk_workstation integer
 ) ENGINE=innodb;
 
-CREATE TABLE llx_c_producbatch_status(
+CREATE TABLE llx_c_producbatch_qcstatus(
   rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
   code     varchar(16)        NOT NULL,
   label    varchar(50)        NOT NULL,
   active   integer  DEFAULT 1 NOT NULL
 ) ENGINE=innodb;
 
-ALTER TABLE llx_c_productbatch_status ADD UNIQUE INDEX uk_c_productbatch_status(code);
+ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code);
 
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
 
 ALTER TABLE llx_product_customer_price ADD COLUMN ref_customer varchar(30);
 ALTER TABLE llx_product_customer_price_log ADD COLUMN ref_customer varchar(30);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
similarity index 90%
rename from htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql
rename to htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
index fc72f556a97..1c00ac13deb 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_status.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
@@ -16,4 +16,4 @@
 --
 -- ========================================================================
 
-ALTER TABLE llx_c_productbatch_status ADD UNIQUE INDEX uk_c_productbatch_status(code);
+ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_status.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
similarity index 96%
rename from htdocs/install/mysql/tables/llx_c_productbatch_status.sql
rename to htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
index 2ffad7f5939..35a9581bf8e 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_status.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
@@ -16,7 +16,7 @@
 --
 -- ========================================================================
 
-create table llx_c_productbatch_status
+create table llx_c_productbatch_qcstatus
 (
   rowid    integer            AUTO_INCREMENT PRIMARY KEY,
   code     varchar(16)        NOT NULL,
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index aedf85a4fb8..2a19be96cf6 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -33,3 +33,6 @@ LotProductTooltip=Adds an option in the product card to define a dedicated batch
 SNProductTooltip=Adds an option in the product card to define a dedicated serial number mask
 QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 
+#Traceability - qc status
+OutOfOrder=Out of order
+InWorkingOrder=In working order
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index c3e48ddbeb1..49a249ce0e5 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -30,4 +30,8 @@ BatchLotNumberingModules=Modèle de génération et contrôle des numéros de lo
 BatchSerialNumberingModules=Modèle de génération et contrôle des numéros de série
 CustomMasks=Ajoute une option pour définir le masque dans la fiche produit
 LotProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de lot
-SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
\ No newline at end of file
+SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle spécifique de numéro de série
+
+#Traceability - qc status
+OutOfOrder=Hors d'usage
+InWorkingOrder=En état de marche
\ No newline at end of file

From f7182d43fdd0c72cc9f49d97bf35926b36795763 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 29 Apr 2021 13:00:47 +0200
Subject: [PATCH 087/135] add entity in c_productbatch_qcstatus key

---
 ...roductbatch_status.sql => llx_c_productbatch_qcstatus.sql} | 4 ++--
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql              | 3 ++-
 .../install/mysql/tables/llx_c_productbatch_qcstatus.key.sql  | 2 +-
 htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql   | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename htdocs/install/mysql/data/{llx_c_productbatch_status.sql => llx_c_productbatch_qcstatus.sql} (83%)

diff --git a/htdocs/install/mysql/data/llx_c_productbatch_status.sql b/htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql
similarity index 83%
rename from htdocs/install/mysql/data/llx_c_productbatch_status.sql
rename to htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql
index cd57bbb504b..7e0bb6661f6 100644
--- a/htdocs/install/mysql/data/llx_c_productbatch_status.sql
+++ b/htdocs/install/mysql/data/llx_c_productbatch_qcstatus.sql
@@ -23,6 +23,6 @@
 -- de l'install et tous les sigles '--' sont supprimés.
 --
 
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
-INSERT INTO llx_c_productbatch_status (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
+INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
 
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 9eedc2872c6..81b5f8b96f7 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -143,12 +143,13 @@ CREATE TABLE llx_workstation_workstation_usergroup(
 
 CREATE TABLE llx_c_producbatch_qcstatus(
   rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+  entity   integer NOT NULL DEFAULT 1,
   code     varchar(16)        NOT NULL,
   label    varchar(50)        NOT NULL,
   active   integer  DEFAULT 1 NOT NULL
 ) ENGINE=innodb;
 
-ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code);
+ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code, entity);
 
 INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('OK', 'InWorkingOrder', 1);
 INSERT INTO llx_c_productbatch_qcstatus (code, label, active) VALUES ('KO', 'OutOfOrder', 1);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
index 1c00ac13deb..9ffa27bc3a5 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.key.sql
@@ -16,4 +16,4 @@
 --
 -- ========================================================================
 
-ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code);
+ALTER TABLE llx_c_productbatch_qcstatus ADD UNIQUE INDEX uk_c_productbatch_qcstatus(code, entity);
diff --git a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
index 35a9581bf8e..73daa56067a 100644
--- a/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
+++ b/htdocs/install/mysql/tables/llx_c_productbatch_qcstatus.sql
@@ -16,9 +16,10 @@
 --
 -- ========================================================================
 
-create table llx_c_productbatch_qcstatus
+CREATE TABLE llx_c_productbatch_qcstatus
 (
   rowid    integer            AUTO_INCREMENT PRIMARY KEY,
+  entity 	 integer NOT NULL DEFAULT 1,
   code     varchar(16)        NOT NULL,
   label    varchar(50)        NOT NULL,
   active   integer  DEFAULT 1 NOT NULL  

From b04afc17538981a8b259b5cf0d1e397fd645eb4d Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 29 Apr 2021 13:08:24 +0200
Subject: [PATCH 088/135] merge conflict resolution

---
 htdocs/admin/dict.php                | 4 ++--
 htdocs/langs/en_US/productbatch.lang | 2 +-
 htdocs/langs/fr_FR/productbatch.lang | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 2b331c0c175..06aad44d123 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1978,10 +1978,10 @@ if ($id) {
 								$valuetoshow = $obj->state_code;
 							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') {
 								$langs->load("products");
-								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+								$valuetoshow = $langs->trans($obj->{$value});
 							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_productbatch_qcstatus') {
 								$langs->load("productbatch");
-								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+								$valuetoshow = $langs->trans($obj->{$value});
 							}
 							$class .= ($class ? ' ' : '').'tddict';
 							if ($fieldlist[$field] == 'note' && $id == 10) {
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index 2a19be96cf6..756eb0a5947 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -35,4 +35,4 @@ QtyToAddAfterBarcodeScan=Qty to add for each barcode/lot/serial scanned
 
 #Traceability - qc status
 OutOfOrder=Out of order
-InWorkingOrder=In working order
\ No newline at end of file
+InWorkingOrder=In working order
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 49a249ce0e5..37ebb65135b 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -34,4 +34,4 @@ SNProductTooltip=Crée un champ dans la fiche produit pour définir un modèle s
 
 #Traceability - qc status
 OutOfOrder=Hors d'usage
-InWorkingOrder=En état de marche
\ No newline at end of file
+InWorkingOrder=En état de marche

From f3ede35b4fa66d79132f7c672ac7106533447878 Mon Sep 17 00:00:00 2001
From: altairis-noe <noe.cendrier@altairis.fr>
Date: Thu, 29 Apr 2021 13:18:14 +0200
Subject: [PATCH 089/135] lang correction

---
 htdocs/langs/en_US/admin.lang | 2 +-
 htdocs/langs/fr_FR/admin.lang | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9f93b416668..85bc7871a74 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1043,7 +1043,7 @@ DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
 DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product batch status
+DictionaryBatchStatus=Product lot/serial Quality Control status
 TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index ff8531e1809..9d33eb2b74a 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1043,7 +1043,7 @@ DictionaryOpportunityStatus=Statut d'opportunités pour les affaires/projets
 DictionaryExpenseTaxCat=Note de frais - catégories de déplacement
 DictionaryExpenseTaxRange=Note de frais - Tri par catégorie de déplacement
 DictionaryTransportMode=Déclaration d'échanges intracommunautaires - Mode de transport
-DictionaryBatchStatus=État du lot (produits)
+DictionaryBatchStatus=État de qualité du lot/série (produits)
 TypeOfUnit=Type d'unité
 SetupSaved=Configuration sauvegardée
 SetupNotSaved=Configuration non enregistrée

From 05a96b3ee2bf7c08e67363a6baeb0e8267c1dede Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 30 Apr 2021 10:46:05 +0200
Subject: [PATCH 090/135] FIX missing token on dolGetButtonAction for action
 delete

---
 htdocs/core/lib/functions.lib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 37e55b42fde..73f75cc98cf 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8731,6 +8731,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 	$class = 'butAction';
 	if ($actionType == 'danger' || $actionType == 'delete') {
 		$class = 'butActionDelete';
+		$url .= '&token='.newToken();
 	}
 
 	$attr = array(

From 773b16928d5d2fed4e0635eb44a2d62fdd035fcc Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Fri, 30 Apr 2021 11:15:01 +0200
Subject: [PATCH 091/135] only if no token

---
 htdocs/core/lib/functions.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 73f75cc98cf..766ee1b71a8 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8731,7 +8731,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 	$class = 'butAction';
 	if ($actionType == 'danger' || $actionType == 'delete') {
 		$class = 'butActionDelete';
-		$url .= '&token='.newToken();
+		if (strpos($url, 'token=') === false) $url .= '&token='.newToken();
 	}
 
 	$attr = array(

From ce677c4f272fbc4fcac7754592ba5566ee9f8cf4 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 30 Apr 2021 14:50:18 +0200
Subject: [PATCH 092/135] Fix #17361 : change of llx_export_model type to
 varchar(64)

---
 htdocs/install/mysql/migration/12.0.0-13.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index bfa8bf01b39..81471e18e4c 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -583,4 +583,5 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
 -- VMYSQL4.3 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN montant double(24,8) NULL;
 -- VPGSQL8.2 ALTER TABLE llx_accounting_bookkeeping ALTER COLUMN montant DROP NOT NULL;
 
+ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
 

From 034378a9588da5cb0b29614d7acda402a53e9783 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 00:58:29 +0200
Subject: [PATCH 093/135] Add online substitution keys link in mailing

---
 htdocs/comm/mailing/card.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index c3ef480d2ae..98b3622d5ef 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -222,14 +222,23 @@ if (empty($reshook)) {
 							$onlinepaymentenabled++;
 						}
 						if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+							require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+							$substitutionarray['__ONLINEPAYMENTLINK_MEMBER__'] = getOnlinePaymentUrl(0, 'member', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_DONATION__'] = getOnlinePaymentUrl(0, 'donation', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_ORDER__'] = getOnlinePaymentUrl(0, 'order', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_INVOICE__'] = getOnlinePaymentUrl(0, 'invoice', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = getOnlinePaymentUrl(0, 'contractline', $obj->source_id);
+
 							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_DONATION__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							} else {
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'membersubscription'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'member'.$obj->source_id, 2);
+								$substitutionarray['__SECUREKEYPAYMENT_DONATION__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'donation'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'order'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'invoice'.$obj->source_id, 2);
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.'contractline'.$obj->source_id, 2);

From 9ab7f4ec0194c910a94fd5c4a1e66ddef329d456 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 01:41:32 +0200
Subject: [PATCH 094/135] Add tooltip for new substitution keys

---
 htdocs/core/class/html.formmail.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index f56b9f6070e..ff38cdcf282 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1592,15 +1592,23 @@ class FormMail extends Form
 				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
 				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 					if ($conf->adherent->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';
 						$tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
 					}
+					if ($conf->donation->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_DONATION__'] = 'OnlinePaymentLinkUniquePerDonation';
+						$tmparray['__SECUREKEYPAYMENT_DONATION__'] = 'SecureKeyPAYMENTUniquePerDonation';
+					}
 					if ($conf->facture->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_INVOICE__'] = 'OnlinePaymentLinkUniquePerInvoice';
 						$tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
 					}
 					if ($conf->commande->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';
 						$tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					}
 					if ($conf->contrat->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = 'OnlinePaymentLinkUniquePerContractLine';
 						$tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 					}
 				}

From 729a5677ad4610e39f0f5e88dbc777cdd9cb67ed Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 01:53:46 +0200
Subject: [PATCH 095/135] Group tooltip by key type

---
 htdocs/core/class/html.formmail.class.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index ff38cdcf282..96f6ee0a741 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1592,25 +1592,37 @@ class FormMail extends Form
 				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
 				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 					if ($conf->adherent->enabled) {
-						$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';
 						$tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
 					}
 					if ($conf->donation->enabled) {
-						$tmparray['__ONLINEPAYMENTLINK_DONATION__'] = 'OnlinePaymentLinkUniquePerDonation';
 						$tmparray['__SECUREKEYPAYMENT_DONATION__'] = 'SecureKeyPAYMENTUniquePerDonation';
 					}
 					if ($conf->facture->enabled) {
-						$tmparray['__ONLINEPAYMENTLINK_INVOICE__'] = 'OnlinePaymentLinkUniquePerInvoice';
 						$tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
 					}
 					if ($conf->commande->enabled) {
-						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';
 						$tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					}
 					if ($conf->contrat->enabled) {
-						$tmparray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = 'OnlinePaymentLinkUniquePerContractLine';
 						$tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 					}
+
+					//Online payement link
+					if ($conf->adherent->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';
+					}
+					if ($conf->donation->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_DONATION__'] = 'OnlinePaymentLinkUniquePerDonation';
+					}
+					if ($conf->facture->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_INVOICE__'] = 'OnlinePaymentLinkUniquePerInvoice';
+					}
+					if ($conf->commande->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';
+					}
+					if ($conf->contrat->enabled) {
+						$tmparray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = 'OnlinePaymentLinkUniquePerContractLine';
+					}
 				}
 			} else {
 				/* No need to show into tooltip help, option is not enabled

From ef6ebd4793220540d474abc9b54cc7382b2c64e7 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 4 May 2021 16:24:15 +0200
Subject: [PATCH 096/135] FIX: expense report: column last_main_doc forgotten
 in v14 migration script

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index af6c2f48f50..a18bc993441 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -187,6 +187,7 @@ ALTER TABLE llx_mrp_production ADD COLUMN origin_type varchar(10) AFTER origin_i
 
 ALTER TABLE llx_fichinter ADD COLUMN last_main_doc varchar(255) AFTER model_pdf;
 ALTER TABLE llx_projet ADD COLUMN last_main_doc varchar(255) AFTER model_pdf;
+ALTER TABLE llx_expensereport ADD COLUMN last_main_doc varchar(255) DEFAULT NULL AFTER model_pdf;
 
 create table llx_payment_vat
 (

From c4e0d8da42696410089d4dca02f611cb60d6ec33 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Tue, 4 May 2021 17:28:20 +0200
Subject: [PATCH 097/135] FIX: merge thirparty also work for bank URL entry

---
 htdocs/compta/bank/class/account.class.php | 22 ++++++++++++++++++++++
 htdocs/societe/card.php                    |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 0002dbcb8ed..c59e768f6dc 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1676,6 +1676,28 @@ class Account extends CommonObject
 		$this->owner_address   = 'Owner address';
 		$this->country_id      = 1;
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB 	$db 			Database handler
+	 * @param int 		$origin_id 		Old thirdparty id
+	 * @param int 		$dest_id 		New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty($db, $origin_id, $dest_id)
+	{
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'bank_url SET url_id = '.$dest_id.' WHERE url_id = '.$origin_id.' AND type=\'company\'';
+
+		if (!$db->query($sql))
+		{
+			//if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+			//$this->errors = $db->lasterror();
+			return false;
+		} else {
+			return true;
+		}
+	}
 }
 
 
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 66b5f68564e..1fbb1ad6082 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -254,7 +254,8 @@ if (empty($reshook))
 						'Product' => '/product/class/product.class.php',
 						'Project' => '/projet/class/project.class.php',
 						'Ticket' => '/ticket/class/ticket.class.php',
-						'User' => '/user/class/user.class.php'
+						'User' => '/user/class/user.class.php',
+						'Account' => '/compta/bank/class/account.class.php',
 					);
 
 					//First, all core objects must update their tables

From 6574e54a41e9f2be5aae55c4478767e15b38236b Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Tue, 4 May 2021 18:09:13 +0200
Subject: [PATCH 098/135] Fix saving template email

---
 htdocs/admin/mails_templates.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 60a15f4899e..f82e67096eb 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -257,7 +257,7 @@ if (empty($reshook))
             $sql = "INSERT INTO ".$tabname[$id]." (";
             // List of fields
             $sql .= $tabfieldinsert[$id];
-            $sql .= ",active)";
+            $sql .= ",active,enabled)";
             $sql .= " VALUES(";
 
             // List of values
@@ -289,7 +289,7 @@ if (empty($reshook))
 
                 $i++;
             }
-            $sql .= ", 1)";
+            $sql .= ", 1, 1)";
 
             dol_syslog("actionadd", LOG_DEBUG);
             $result = $db->query($sql);

From b04dfcadc77d26e8863413dc4af7d05b6c98cfbe Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 21:55:19 +0200
Subject: [PATCH 099/135] Add function to get html online payment link

---
 htdocs/core/lib/payments.lib.php | 39 ++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 494a92d33e3..90fba70464c 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2013	    Marcos García	        <marcosgdf@gmail.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Abbes Bahfir            <bafbes@gmail.com>
+ * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
  *
  * 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
@@ -26,8 +27,7 @@
  * @param Paiement $object Current payment object
  * @return array Tabs for the payment section
  */
-function payment_prepare_head(Paiement $object)
-{
+function payment_prepare_head(Paiement $object) {
 	global $langs, $conf;
 
 	$h = 0;
@@ -61,8 +61,7 @@ function payment_prepare_head(Paiement $object)
  * @param 	int		$id		ID of bank line
  * @return 	array 			Tabs for the Bankline section
  */
-function bankline_prepare_head($id)
-{
+function bankline_prepare_head($id) {
 	global $langs, $conf;
 
 	$h = 0;
@@ -96,8 +95,7 @@ function bankline_prepare_head($id)
  * @param Paiement $object Current payment object
  * @return array Tabs for the payment section
  */
-function payment_supplier_prepare_head(Paiement $object)
-{
+function payment_supplier_prepare_head(Paiement $object) {
 	global $langs, $conf;
 
 	$h = 0;
@@ -130,8 +128,7 @@ function payment_supplier_prepare_head(Paiement $object)
  * @param	string	$paymentmethod		Filter on this payment method (''=none, 'paypal', ...)
  * @return	array						Array of valid payment method
  */
-function getValidOnlinePaymentMethods($paymentmethod = '')
-{
+function getValidOnlinePaymentMethods($paymentmethod = '') {
 	global $conf, $langs;
 
 	$validpaymentmethod = array();
@@ -155,14 +152,13 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
 }
 
 /**
- * Return string with full Url
+ * Return string with full online payment Url
  *
  * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
-function showOnlinePaymentUrl($type, $ref)
-{
+function showOnlinePaymentUrl($type, $ref) {
 	global $langs;
 
 	// Load translation files required by the page
@@ -178,6 +174,21 @@ function showOnlinePaymentUrl($type, $ref)
 	return $out;
 }
 
+/**
+ * Return string with HTML link for online payment
+ *
+ * @param	string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'membersubscription' ...)
+ * @param	string	$ref		Ref of object
+ * @param	string	$label		Text or HTML tag to display, if empty it display the URL
+ * @return	string			Url string
+ */
+function getHtmlOnlinePaymentLink($type, $ref, $label='') {
+	$url = getOnlinePaymentUrl(0, $type, $ref);
+	$label = $label ? $label : $url;
+	return'<a href="'.$url.'" target="_blank">'.$label.'</a>';
+}
+
+
 /**
  * Return string with full Url
  *
@@ -189,8 +200,7 @@ function showOnlinePaymentUrl($type, $ref)
  * @param   string  $localorexternal  0=Url for browser, 1=Url for external access
  * @return	string				      Url string
  */
-function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0)
-{
+function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0) {
 	global $conf, $dolibarr_main_url_root;
 
 	$ref = str_replace(' ', '', $ref);
@@ -355,8 +365,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
  * @param	Object		$object			Object related to payment
  * @return	void
  */
-function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)
-{
+function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null) {
 	global $conf;
 
 	// Juridical status

From 866857c111ae2523294b40a0e40d910d43aaf3b6 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 21:57:59 +0200
Subject: [PATCH 100/135] Html link instead of url in substitutionarray

---
 htdocs/comm/mailing/card.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 98b3622d5ef..ce260a44a35 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -223,11 +223,11 @@ if (empty($reshook)) {
 						}
 						if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 							require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-							$substitutionarray['__ONLINEPAYMENTLINK_MEMBER__'] = getOnlinePaymentUrl(0, 'member', $obj->source_id);
-							$substitutionarray['__ONLINEPAYMENTLINK_DONATION__'] = getOnlinePaymentUrl(0, 'donation', $obj->source_id);
-							$substitutionarray['__ONLINEPAYMENTLINK_ORDER__'] = getOnlinePaymentUrl(0, 'order', $obj->source_id);
-							$substitutionarray['__ONLINEPAYMENTLINK_INVOICE__'] = getOnlinePaymentUrl(0, 'invoice', $obj->source_id);
-							$substitutionarray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = getOnlinePaymentUrl(0, 'contractline', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_MEMBER__'] = getHtmlOnlinePaymentLink('member', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_DONATION__'] = getHtmlOnlinePaymentLink('donation', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_ORDER__'] = getHtmlOnlinePaymentLink('order', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_INVOICE__'] = getHtmlOnlinePaymentLink('invoice', $obj->source_id);
+							$substitutionarray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = getHtmlOnlinePaymentLink('contractline', $obj->source_id);
 
 							$substitutionarray['__SECUREKEYPAYMENT__'] = dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
 							if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {

From fb3c8e698ed028cad7d5c707e1ea1c70343be14a Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 4 May 2021 20:59:32 +0000
Subject: [PATCH 101/135] Fixing style errors.

---
 htdocs/core/lib/payments.lib.php | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 90fba70464c..59d9eb4aa4c 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -27,7 +27,8 @@
  * @param Paiement $object Current payment object
  * @return array Tabs for the payment section
  */
-function payment_prepare_head(Paiement $object) {
+function payment_prepare_head(Paiement $object)
+{
 	global $langs, $conf;
 
 	$h = 0;
@@ -61,7 +62,8 @@ function payment_prepare_head(Paiement $object) {
  * @param 	int		$id		ID of bank line
  * @return 	array 			Tabs for the Bankline section
  */
-function bankline_prepare_head($id) {
+function bankline_prepare_head($id)
+{
 	global $langs, $conf;
 
 	$h = 0;
@@ -95,7 +97,8 @@ function bankline_prepare_head($id) {
  * @param Paiement $object Current payment object
  * @return array Tabs for the payment section
  */
-function payment_supplier_prepare_head(Paiement $object) {
+function payment_supplier_prepare_head(Paiement $object)
+{
 	global $langs, $conf;
 
 	$h = 0;
@@ -128,7 +131,8 @@ function payment_supplier_prepare_head(Paiement $object) {
  * @param	string	$paymentmethod		Filter on this payment method (''=none, 'paypal', ...)
  * @return	array						Array of valid payment method
  */
-function getValidOnlinePaymentMethods($paymentmethod = '') {
+function getValidOnlinePaymentMethods($paymentmethod = '')
+{
 	global $conf, $langs;
 
 	$validpaymentmethod = array();
@@ -158,7 +162,8 @@ function getValidOnlinePaymentMethods($paymentmethod = '') {
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
-function showOnlinePaymentUrl($type, $ref) {
+function showOnlinePaymentUrl($type, $ref)
+{
 	global $langs;
 
 	// Load translation files required by the page
@@ -182,7 +187,8 @@ function showOnlinePaymentUrl($type, $ref) {
  * @param	string	$label		Text or HTML tag to display, if empty it display the URL
  * @return	string			Url string
  */
-function getHtmlOnlinePaymentLink($type, $ref, $label='') {
+function getHtmlOnlinePaymentLink($type, $ref, $label = '')
+{
 	$url = getOnlinePaymentUrl(0, $type, $ref);
 	$label = $label ? $label : $url;
 	return'<a href="'.$url.'" target="_blank">'.$label.'</a>';
@@ -200,7 +206,8 @@ function getHtmlOnlinePaymentLink($type, $ref, $label='') {
  * @param   string  $localorexternal  0=Url for browser, 1=Url for external access
  * @return	string				      Url string
  */
-function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0) {
+function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0)
+{
 	global $conf, $dolibarr_main_url_root;
 
 	$ref = str_replace(' ', '', $ref);
@@ -365,7 +372,8 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
  * @param	Object		$object			Object related to payment
  * @return	void
  */
-function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null) {
+function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)
+{
 	global $conf;
 
 	// Juridical status

From d840593ed795acdce1b9cbe2824ee9f982279aa0 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Tue, 4 May 2021 23:19:19 +0200
Subject: [PATCH 102/135] Fix amnt can be paid for member as membersubscription

---
 htdocs/public/payment/newpayment.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 7007455791a..1c0939ea9a8 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -1753,7 +1753,7 @@ if ($action != 'dopayment') {
 			print '<br><br><span class="amountpaymentcomplete size15x">'.$langs->trans("DonationPaid").'</span>';
 		} else {
 			// Membership can be paid and we still allow to make renewal
-			if ($source == 'membersubscription' && $object->datefin > dol_now()) {
+			if (($source == 'member' || $source == 'membersubscription') && $object->datefin > dol_now()) {
 				$langs->load("members");
 				print '<br><span class="amountpaymentcomplete size15x">'.$langs->trans("MembershipPaid", dol_print_date($object->datefin, 'day')).'</span><br>';
 				print '<div class="opacitymedium margintoponly">'.$langs->trans("PaymentWillBeRecordedForNextPeriod").'</div>';

From 3807804acc6babca8d63d6ef4eff8250c9091d95 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 5 May 2021 00:15:52 +0200
Subject: [PATCH 103/135] Fix option MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE

---
 .../modules/supplier_order/doc/pdf_cornas.modules.php     | 7 +++----
 .../modules/supplier_order/doc/pdf_muscadet.modules.php   | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 9ebff653a56..cfe7a476d05 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -218,12 +218,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
-					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+					$pdir = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
-					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+					$pdir = get_exdir($objphoto->id, 0, 0, 0, $objphoto, 'product');
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
 
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index be195d923da..e76793db00c 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -233,15 +233,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
-					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+					$pdir = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
-					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+					$pdir = get_exdir($objphoto->id, 0, 0, 0, $objphoto, 'product');
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				}
-
 				$realpath = '';
 				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
 				{

From 209682e7102155684cc5f6fa4835ed16fe163a54 Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Wed, 5 May 2021 11:30:13 +0200
Subject: [PATCH 104/135] Fix #17361 : changes into mysql/tables of
 export_model

---
 htdocs/install/mysql/tables/llx_export_model.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/tables/llx_export_model.sql b/htdocs/install/mysql/tables/llx_export_model.sql
index 53952430c14..7e68eab4ad5 100644
--- a/htdocs/install/mysql/tables/llx_export_model.sql
+++ b/htdocs/install/mysql/tables/llx_export_model.sql
@@ -24,7 +24,7 @@ create table llx_export_model
   	rowid		integer AUTO_INCREMENT PRIMARY KEY,
 	fk_user		integer DEFAULT 0 NOT NULL,
   	label		varchar(50) NOT NULL,
-  	type		varchar(20) NOT NULL,
+  	type		varchar(64) NOT NULL,
   	field		text NOT NULL,
   	filter		text
   	

From 139ae3db0025ce86d1898739f3df4e6e7a24ec0a Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Wed, 5 May 2021 11:49:11 +0200
Subject: [PATCH 105/135] FIX: pgsql: prevent 'WHERE 1'

---
 build/exe/doliwamp/config.inc.php.install | 2 +-
 htdocs/core/lib/functions.lib.php         | 2 +-
 htdocs/user/class/user.class.php          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/exe/doliwamp/config.inc.php.install b/build/exe/doliwamp/config.inc.php.install
index 19a3d36a45e..6ad04752766 100644
--- a/build/exe/doliwamp/config.inc.php.install
+++ b/build/exe/doliwamp/config.inc.php.install
@@ -542,7 +542,7 @@ $cfg['ThemePerServer']      = FALSE;         // allow diferent theme for each co
  * %f will be replaced by a list of field names.
  * (%t and %f only applies to DefaultQueryTable)
  */
-$cfg['DefaultQueryTable']    = 'SELECT * FROM %t WHERE 1';
+$cfg['DefaultQueryTable']    = 'SELECT * FROM %t WHERE 1 = 1';
 $cfg['DefaultQueryDatabase'] = '';
 
 /**
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index fccb019a730..4148d385716 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8123,7 +8123,7 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield
 	if (!isset($dictvalues[$tablename]))
 	{
 		$dictvalues[$tablename] = array();
-		$sql = 'SELECT * FROM '.$tablename.' WHERE 1'; // Here select * is allowed as it is generic code and we don't have list of fields
+		$sql = 'SELECT * FROM '.$tablename.' WHERE 1 = 1'; // Here select * is allowed as it is generic code and we don't have list of fields
 		if ($checkentity) $sql .= ' AND entity IN (0,'.getEntity($tablename).')';
 
 		$resql = $db->query($sql);
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index cc405571990..89995a4584e 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3320,7 +3320,7 @@ class User extends CommonObject
 		}
 		else
 		{
-			$sql .= " WHERE 1";
+			$sql .= " WHERE 1 = 1";
 		}
 
 		// Manage filter

From ed26e75c0b6cb4428cf32ba2f91465a44ae58c4f Mon Sep 17 00:00:00 2001
From: Anthony Berton <34568357+bb2a@users.noreply.github.com>
Date: Wed, 5 May 2021 11:54:16 +0200
Subject: [PATCH 106/135] init

---
 htdocs/install/mysql/data/llx_c_action_trigger.sql | 6 ++++--
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql   | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 34cef4c94d4..45503449492 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -35,6 +35,7 @@
 delete from llx_c_action_trigger;
 -- actions enabled by default (constant created for that) when we enable module agenda
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2);
@@ -129,8 +130,9 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','mrp',662);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','mrp',663);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact address record','contact',51);
-insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact address record','contact',52);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',53);
 
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index af6c2f48f50..84c305240d4 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -482,3 +482,9 @@ create table llx_knowledgemanagement_knowledgerecord_extrafields
 
 -- add default amount by member type
 ALTER TABLE llx_adherent_type ADD COLUMN amount DOUBLE(24,8) NULL DEFAULT NULL AFTER subscription;
+
+-- add action trigger
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) VALUES ('COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1);
+INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) VALUES ('CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51);
+
+

From 7857da4db755937deb9d7d6c3691ae0c2a9b525c Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 5 May 2021 17:05:51 +0200
Subject: [PATCH 107/135] fix missing token

---
 htdocs/core/class/html.formfile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 0ca49a49ff2..3adb6265564 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -1870,7 +1870,7 @@ class FormFile
 				print '<td class="center">'.dol_print_date($link->datea, "dayhour", "tzuser").'</td>';
 				print '<td class="center"></td>';
 				print '<td class="right">';
-				print '<a href="'.$_SERVER['PHP_SELF'].'?action=update&linkid='.$link->id.$param.'" class="editfilelink editfielda reposition" >'.img_edit().'</a>'; // id= is included into $param
+				print '<a href="'.$_SERVER['PHP_SELF'].'?action=update&linkid='.$link->id.$param.'&token='.newToken().'" class="editfilelink editfielda reposition" >'.img_edit().'</a>'; // id= is included into $param
 				if ($permissiontodelete) {
 					print ' &nbsp; <a class="deletefilelink" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&linkid='.$link->id.$param.'">'.img_delete().'</a>'; // id= is included into $param
 				} else {

From adc862050692184a4feb2c5b5157174e9ae155e6 Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Wed, 5 May 2021 17:14:58 +0200
Subject: [PATCH 108/135] fix: allow webdavs link type

---
 htdocs/core/actions_linkedfiles.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index b0671bbf555..73b80a47973 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -68,7 +68,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 	$link = GETPOST('link', 'alpha');
 	if ($link)
 	{
-		if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://') {
+		if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://' && substr($link, 0, 7) != 'davs://') {
 			$link = 'http://'.$link;
 		}
 		dol_add_file_process($upload_dir, 0, 1, 'userfile', null, $link, '', 0);

From 63292255ccbc7ad08270bb6820f033f2bc7ed0ff Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Wed, 5 May 2021 18:45:23 +0200
Subject: [PATCH 109/135] Fix search accented words in product description

---
 htdocs/societe/consumption.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index cd82533fc88..420282c4cef 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -309,7 +309,7 @@ if (!empty($sql_select))
 	if ($sref) $sql.= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
 	if ($sprod_fulldescr)
 	{
-	    $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
+	    $sql.= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%' OR d.description LIKE '%".$db->escape(dol_htmlentities($sprod_fulldescr))."%'";
 	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
 	    if (GETPOST('type_element') != 'fichinter') $sql.= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
 	    $sql.=")";

From 9cd78e6ecf0dcdcb2cc387e8aac0ffa5c01ffae5 Mon Sep 17 00:00:00 2001
From: UT from dolibit <45215329+dolibit-ut@users.noreply.github.com>
Date: Thu, 6 May 2021 16:00:49 +0200
Subject: [PATCH 110/135] Update modules_member.class.php

---
 htdocs/core/modules/member/modules_member.class.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/core/modules/member/modules_member.class.php b/htdocs/core/modules/member/modules_member.class.php
index 1ff1ffc3d30..3a1b4edcc1d 100644
--- a/htdocs/core/modules/member/modules_member.class.php
+++ b/htdocs/core/modules/member/modules_member.class.php
@@ -20,10 +20,6 @@
  */
 
 
-/**
- *	    \class      ModeleProductCode
- *		\brief  	Parent class for product code generators
- */
 
 /**
  *  \file       htdocs/core/modules/member/modules_member.class.php

From 7386a223e80572284bf833b170d85974c9592564 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 16:38:34 +0200
Subject: [PATCH 111/135] Update account.class.php

---
 htdocs/compta/bank/class/account.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index c59e768f6dc..75738abc3d4 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1687,7 +1687,7 @@ class Account extends CommonObject
 	 */
 	public static function replaceThirdparty($db, $origin_id, $dest_id)
 	{
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'bank_url SET url_id = '.$dest_id.' WHERE url_id = '.$origin_id.' AND type=\'company\'';
+		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_url SET url_id = ".((int) $dest_id)." WHERE url_id = ".((int) $origin_id)." AND type='company'";
 
 		if (!$db->query($sql))
 		{

From 98a4f603f2af21052b331937c28c1d20ef21d0b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 16:41:06 +0200
Subject: [PATCH 112/135] Complete merge of thirdparty into API

---
 htdocs/societe/class/api_thirdparties.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index af9122cba9d..39773b7b637 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -445,7 +445,8 @@ class Thirdparties extends DolibarrApi
 				'Product' => '/product/class/product.class.php',
 				'Project' => '/projet/class/project.class.php',
 				'Ticket' => '/ticket/class/ticket.class.php',
-				'User' => '/user/class/user.class.php'
+				'User' => '/user/class/user.class.php',
+				'Account' => '/compta/bank/class/account.class.php'
 			);
 
 			//First, all core objects must update their tables

From 0daab6a55ae87d7bfa5abb2036877aac31e71c2b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 16:50:22 +0200
Subject: [PATCH 113/135] Code comment

---
 htdocs/install/mysql/migration/13.0.0-14.0.0.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index 642ce0cb98d..8eacab54fa8 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -59,11 +59,11 @@ insert into llx_c_actioncomm (id, code, type, libelle, module, active, position)
 
 UPDATE llx_c_country SET eec = 1 WHERE code IN ('AT','BE','BG','CY','CZ','DE','DK','EE','ES','FI','FR','GR','HR','NL','HU','IE','IM','IT','LT','LU','LV','MC','MT','PL','PT','RO','SE','SK','SI');
 
+ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
+
 
 -- For v14
 
-ALTER TABLE llx_export_model MODIFY COLUMN type varchar(64);
-
 create table llx_accounting_groups_account
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,

From d5c737ddb6b069fd655caa3f3332df0d0c8cecfa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 17:19:28 +0200
Subject: [PATCH 114/135] Update modTakePos.class.php

---
 htdocs/core/modules/modTakePos.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 84810e80a53..5cb7a7f0c38 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -198,21 +198,21 @@ class modTakePos extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 50151;
-		$this->rights[$r][1] = 'Use Point Of Sale';
+		$this->rights[$r][1] = 'Use Point Of Sale (record a sale, add products, record payment)';
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'run';
 
 		$r++;
 		$this->rights[$r][0] = 50152;
-		$this->rights[$r][1] = 'Edit sales lines';
+		$this->rights[$r][1] = 'Can modify added sales lines (prices, discount)';
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'editlines';
 
 		$r++;
 		$this->rights[$r][0] = 50153;
-		$this->rights[$r][1] = 'Edit ordered sales lines';
+		$this->rights[$r][1] = 'Edit ordered sales lines (useful only when option "Order printers" has been enabled). Allow to edit sales lines even after the order has been printed';
 		$this->rights[$r][2] = 'a';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'editorderedlines';

From 6b825cbc3b125096e3051a13e94022f2f194965f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 18:06:19 +0200
Subject: [PATCH 115/135] Clean code

---
 htdocs/admin/dict.php         | 16 +++++++++---
 htdocs/core/lib/admin.lib.php | 49 ++++++++++++++++++++++++++---------
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 5bba24a6a59..220c0e88678 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -517,7 +517,7 @@ $tabcond[39] = (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_
 $tabcond[40] = (!empty($conf->societe->enabled) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
 $tabcond[41] = !empty($conf->intracommreport->enabled);
 $tabcond[42] = !empty($conf->product->enabled);
-$tabcond[43] = !empty($conf->product->enabled && !empty($conf->productbatch->enabled));
+$tabcond[43] = !empty($conf->product->enabled) && !empty($conf->productbatch->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2;
 
 // List of help for fields
 $tabhelp = array();
@@ -611,9 +611,11 @@ $tabfieldcheck[41] = array();
 $tabfieldcheck[42] = array();
 $tabfieldcheck[43] = array();
 
-// Complete all arrays with entries found into modules
-complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck);
+// Table to store complete informations (will replace all other table). Key is table name.
+$tabcomplete = array();
 
+// Complete all arrays with entries found into modules
+complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck, $tabcomplete);
 
 // Defaut sortorder
 if (empty($sortfield)) {
@@ -2156,7 +2158,13 @@ if ($id) {
 			$value = $tabname[$i];
 			print '<tr class="oddeven"><td width="50%">';
 			if (!empty($tabcond[$i])) {
-				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
+				$tabnamenoprefix = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabname[$i]);
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">';
+				if (!empty($tabcomplete[$tabnamenoprefix]['picto'])) {
+					print img_picto('', $tabcomplete[$tabnamenoprefix]['picto'], 'class="pictofixedwidth paddingrightonly"');
+				}
+				print $langs->trans($tablib[$i]);
+				print '</a>';
 			} else {
 				print $langs->trans($tablib[$i]);
 			}
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 66ceae8a198..185858fd9c2 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1190,9 +1190,10 @@ function unActivateModule($value, $requiredby = 1)
  * 	@param		array		$tabcond			Tabcond
  * 	@param		array		$tabhelp			Tabhelp
  *  @param		array		$tabfieldcheck		Tabfieldcheck
+ *  @param		array		$tabcomplete   		Tab complete (will replace all other in future). Key is table name.
  * 	@return		int			1
  */
-function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabfieldcheck)
+function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabfieldcheck, &$tabcomplete)
 {
 	global $db, $modules, $conf, $langs;
 
@@ -1255,53 +1256,77 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 							if (!empty($objMod->dictionaries)) {
 								//var_dump($objMod->dictionaries['tabname']);
 								$nbtabname = $nbtablib = $nbtabsql = $nbtabsqlsort = $nbtabfield = $nbtabfieldvalue = $nbtabfieldinsert = $nbtabrowid = $nbtabcond = $nbtabfieldcheck = $nbtabhelp = 0;
-								foreach ($objMod->dictionaries['tabname'] as $val) {
+								$tabnamerelwithkey = array();
+								foreach ($objMod->dictionaries['tabname'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $val);
 									$nbtabname++;
 									$taborder[] = max($taborder) + 1;
 									$tabname[] = $val;
+									$tabnamerelwithkey[$key] = $val;
+									$tabcomplete[$tmptablename]['picto'] = $objMod->picto;
 								}		// Position
-								foreach ($objMod->dictionaries['tablib'] as $val) {
+								foreach ($objMod->dictionaries['tablib'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtablib++;
 									$tablib[] = $val;
+									$tabcomplete[$tmptablename]['lib'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabsql'] as $val) {
+								foreach ($objMod->dictionaries['tabsql'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabsql++;
 									$tabsql[] = $val;
+									$tabcomplete[$tmptablename]['sql'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabsqlsort'] as $val) {
+								foreach ($objMod->dictionaries['tabsqlsort'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabsqlsort++;
 									$tabsqlsort[] = $val;
+									$tabcomplete[$tmptablename]['sqlsort'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabfield'] as $val) {
+								foreach ($objMod->dictionaries['tabfield'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabfield++;
 									$tabfield[] = $val;
+									$tabcomplete[$tmptablename]['field'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabfieldvalue'] as $val) {
+								foreach ($objMod->dictionaries['tabfieldvalue'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabfieldvalue++;
 									$tabfieldvalue[] = $val;
+									$tabcomplete[$tmptablename]['value'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabfieldinsert'] as $val) {
+								foreach ($objMod->dictionaries['tabfieldinsert'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabfieldinsert++;
 									$tabfieldinsert[] = $val;
+									$tabcomplete[$tmptablename]['fieldinsert'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabrowid'] as $val) {
+								foreach ($objMod->dictionaries['tabrowid'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabrowid++;
 									$tabrowid[] = $val;
+									$tabcomplete[$tmptablename]['rowid'] = $val;
 								}
-								foreach ($objMod->dictionaries['tabcond'] as $val) {
+								foreach ($objMod->dictionaries['tabcond'] as $key => $val) {
+									$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 									$nbtabcond++;
 									$tabcond[] = $val;
+									$tabcomplete[$tmptablename]['rowid'] = $val;
 								}
 								if (!empty($objMod->dictionaries['tabhelp'])) {
-									foreach ($objMod->dictionaries['tabhelp'] as $val) {
+									foreach ($objMod->dictionaries['tabhelp'] as $key => $val) {
+										$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 										$nbtabhelp++;
 										$tabhelp[] = $val;
+										$tabcomplete[$tmptablename]['help'] = $val;
 									}
 								}
 								if (!empty($objMod->dictionaries['tabfieldcheck'])) {
-									foreach ($objMod->dictionaries['tabfieldcheck'] as $val) {
+									foreach ($objMod->dictionaries['tabfieldcheck'] as $key => $val) {
+										$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 										$nbtabfieldcheck++;
 										$tabfieldcheck[] = $val;
+										$tabcomplete[$tmptablename]['fieldcheck'] = $val;
 									}
 								}
 

From 6159321bedb955bc613d068fa40929d2323d9e00 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 18:31:36 +0200
Subject: [PATCH 116/135] NEW Show picto of module into the list of
 dictionaries

---
 htdocs/admin/dict.php             | 97 +++++++++++++++----------------
 htdocs/core/lib/admin.lib.php     |  4 +-
 htdocs/core/lib/functions.lib.php |  2 +-
 3 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 220c0e88678..72c33db2a0d 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
@@ -565,57 +565,56 @@ $tabhelp[41] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[42] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[43] = array('code'=>$langs->trans("EnterAnyCode"));
 
-// List of check for fields (NOT USED YET)
-$tabfieldcheck = array();
-$tabfieldcheck[1]  = array();
-$tabfieldcheck[2]  = array();
-$tabfieldcheck[3]  = array();
-$tabfieldcheck[4]  = array();
-$tabfieldcheck[5]  = array();
-$tabfieldcheck[6]  = array();
-$tabfieldcheck[7]  = array();
-$tabfieldcheck[8]  = array();
-$tabfieldcheck[9]  = array();
-$tabfieldcheck[10] = array();
-$tabfieldcheck[11] = array();
-$tabfieldcheck[12] = array();
-$tabfieldcheck[13] = array();
-$tabfieldcheck[14] = array();
-$tabfieldcheck[15] = array();
-$tabfieldcheck[16] = array();
-$tabfieldcheck[17] = array();
-$tabfieldcheck[18] = array();
-$tabfieldcheck[19] = array();
-$tabfieldcheck[20] = array();
-$tabfieldcheck[21] = array();
-$tabfieldcheck[22] = array();
-$tabfieldcheck[23] = array();
-$tabfieldcheck[24] = array();
-$tabfieldcheck[25] = array();
-//$tabfieldcheck[26] = array();
-$tabfieldcheck[27] = array();
-$tabfieldcheck[28] = array();
-$tabfieldcheck[29] = array();
-$tabfieldcheck[30] = array();
-//$tabfieldcheck[31] = array();
-$tabfieldcheck[32] = array();
-$tabfieldcheck[33] = array();
-$tabfieldcheck[34] = array();
-$tabfieldcheck[35] = array();
-$tabfieldcheck[36] = array();
-$tabfieldcheck[37] = array();
-$tabfieldcheck[38] = array();
-$tabfieldcheck[39] = array();
-$tabfieldcheck[40] = array();
-$tabfieldcheck[41] = array();
-$tabfieldcheck[42] = array();
-$tabfieldcheck[43] = array();
-
 // Table to store complete informations (will replace all other table). Key is table name.
-$tabcomplete = array();
+$tabcomplete = array(
+	'c_forme_juridique'=>array('picto'=>'company'),
+	'c_departements'=>array('picto'=>'country'),
+	'c_regions'=>array('picto'=>'country'),
+	'c_country'=>array('picto'=>'country'),
+	'c_civility'=>array('picto'=>'contact'),
+	'c_actioncomm'=>array('picto'=>'action'),
+	'c_chargesociales'=>array('picto'=>'bill'),
+	'c_typent'=>array('picto'=>'company'),
+	'c_currencies'=>array('picto'=>'multicurrency'),
+	'c_tva'=>array('picto'=>'bill'),
+	'c_type_contact'=>array('picto'=>'contact'),
+	'c_payment_term'=>array('picto'=>'bill'),
+	'c_paiement'=>array('picto'=>'bill'),
+	'c_ecotaxe'=>array('picto'=>'bill'),
+	'c_paper_format'=>array('picto'=>'generic'),
+	'c_prospectlevel'=>array('picto'=>'company'),
+	'c_type_fees'=>array('picto'=>'trip'),
+	'c_effectif'=>array('picto'=>'company'),
+	'c_input_method'=>array('picto'=>'order'),
+	'c_input_reason'=>array('picto'=>'order'),
+	'c_availability'=>array('picto'=>'shipment'),
+	'c_shipment_mode'=>array('picto'=>'shipment'),
+	'c_revenuestamp'=>array('picto'=>'bill'),
+	'c_type_resource'=>array('picto'=>'resource'),
+	'c_type_container'=>array('picto'=>'website'),
+	'c_stcomm'=>array('picto'=>'company'),
+	'c_holiday_types'=>array('picto'=>'holiday'),
+	'c_lead_status'=>array('picto'=>'project'),
+	'c_format_cards'=>array('picto'=>'generic'),
+	'c_hrm_public_holiday'=>array('picto'=>'holiday'),
+	'c_hrm_department'=>array('picto'=>'hrm'),
+	'c_hrm_function'=>array('picto'=>'hrm'),
+	'c_exp_tax_cat'=>array('picto'=>'expensereport'),
+	'c_exp_tax_range'=>array('picto'=>'expensereport'),
+	'c_units'=>array('picto'=>'product'),
+	'c_socialnetworks'=>array('picto'=>'share-alt'),
+	'c_product_nature'=>array('picto'=>'product'),
+	'c_transport_mode'=>array('picto'=>'incoterm'),
+	'c_prospectcontactlevel'=>array('picto'=>'company'),
+	'c_stcommcontact'=>array('picto'=>'company'),
+	'c_product_nature'=>array('picto'=>'product'),
+	'c_productbatch_qcstatus'=>array('picto'=>'batch'),
+
+);
+
 
 // Complete all arrays with entries found into modules
-complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck, $tabcomplete);
+complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabcomplete);
 
 // Defaut sortorder
 if (empty($sortfield)) {
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 185858fd9c2..513b73658f7 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1189,11 +1189,10 @@ function unActivateModule($value, $requiredby = 1)
  * 	@param		array		$tabrowid			Tabrowid
  * 	@param		array		$tabcond			Tabcond
  * 	@param		array		$tabhelp			Tabhelp
- *  @param		array		$tabfieldcheck		Tabfieldcheck
  *  @param		array		$tabcomplete   		Tab complete (will replace all other in future). Key is table name.
  * 	@return		int			1
  */
-function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabfieldcheck, &$tabcomplete)
+function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tabsql, &$tabsqlsort, &$tabfield, &$tabfieldvalue, &$tabfieldinsert, &$tabrowid, &$tabcond, &$tabhelp, &$tabcomplete)
 {
 	global $db, $modules, $conf, $langs;
 
@@ -1325,7 +1324,6 @@ function complete_dictionary_with_modules(&$taborder, &$tabname, &$tablib, &$tab
 									foreach ($objMod->dictionaries['tabfieldcheck'] as $key => $val) {
 										$tmptablename = preg_replace('/'.MAIN_DB_PREFIX.'/', '', $tabnamerelwithkey[$key]);
 										$nbtabfieldcheck++;
-										$tabfieldcheck[] = $val;
 										$tabcomplete[$tmptablename]['fieldcheck'] = $val;
 									}
 								}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index cf8f247d54e..1e97b424b8f 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3492,7 +3492,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
 				'bank_account', 'barcode', 'bank', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'bug', 'building',
-				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'cron', 'cubes',
+				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'cron', 'cubes', 'multicurrency',
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
 				'edit', 'ellipsis-h', 'email', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',

From 3e345570666c97558c8a67a7e2faae6d950cde4f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 18:36:02 +0200
Subject: [PATCH 117/135] Clean code

---
 htdocs/admin/dict.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 72c33db2a0d..ef379a7b059 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2138,7 +2138,7 @@ if ($id) {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
-	print '<td>'.$langs->trans("Table").'</td>';
+	print '<td></td>';
 	print '</tr>';
 
 	$showemptyline = '';
@@ -2167,6 +2167,7 @@ if ($id) {
 			} else {
 				print $langs->trans($tablib[$i]);
 			}
+			print $form->textwithpicto('', $langs->trans("Table").': '.$tabname[$i]);
 			print '</td>';
 			print '<td>';
 			/*if (empty($tabcond[$i]))
@@ -2174,7 +2175,9 @@ if ($id) {
 			 print info_admin($langs->trans("DictionaryDisabledSinceNoModuleNeedIt"),1);
 			 }*/
 			print '</td>';
-			print '<td>'.$tabname[$i].'</td></tr>';
+			print '<td class="right">';
+			print '</td>';
+			print '</tr>';
 			$lastlineisempty = false;
 		} else {
 			if (!$lastlineisempty) {

From b8b6919cb00bece2f604294b84b93a52d1c625b0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 18:41:27 +0200
Subject: [PATCH 118/135] Fix label of dictionaries

---
 htdocs/admin/dict.php         | 2 +-
 htdocs/langs/en_US/admin.lang | 2 +-
 htdocs/langs/en_US/hrm.lang   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ef379a7b059..174abe5a2c0 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -100,7 +100,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 6, 0, 29, 0, 33, 34, 32, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0, 43, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a69bf9e9ca2..34852c2ca61 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1042,7 +1042,7 @@ DictionaryMeasuringUnits=Measuring Units
 DictionarySocialNetworks=Social Networks
 DictionaryProspectStatus=Prospect status for companies
 DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Types of leave
+DictionaryHolidayTypes=Leave - Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
index 3b8f137e103..da098e10bdb 100644
--- a/htdocs/langs/en_US/hrm.lang
+++ b/htdocs/langs/en_US/hrm.lang
@@ -9,7 +9,7 @@ ConfirmDeleteEstablishment=Are you sure you wish to delete this establishment?
 OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
-DictionaryPublicHolidays=HRM - Public holidays
+DictionaryPublicHolidays=Leave - Public holidays
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Job positions
 # Module

From 457050f1c52042757187602fa564e2597fdae611 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 18:45:20 +0200
Subject: [PATCH 119/135] Add pen to edit dictionary

---
 htdocs/admin/dict.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 174abe5a2c0..f8a782a54e5 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -2167,15 +2167,14 @@ if ($id) {
 			} else {
 				print $langs->trans($tablib[$i]);
 			}
-			print $form->textwithpicto('', $langs->trans("Table").': '.$tabname[$i]);
 			print '</td>';
 			print '<td>';
-			/*if (empty($tabcond[$i]))
-			 {
-			 print info_admin($langs->trans("DictionaryDisabledSinceNoModuleNeedIt"),1);
-			 }*/
+			print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">';
+			print img_picto('Edit', 'edit', '');
+			print '</a>';
 			print '</td>';
 			print '<td class="right">';
+			print $form->textwithpicto('', $langs->trans("Table").': '.$tabname[$i]);
 			print '</td>';
 			print '</tr>';
 			$lastlineisempty = false;

From 7b8d4c26566e0d557f4de0d46f6d85e982637d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 May 2021 20:32:41 +0200
Subject: [PATCH 120/135] phpcs

---
 htdocs/admin/mails_templates.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 68e579697d3..c2a54e31a3a 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2011-2016  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2016       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
  * 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
@@ -339,7 +339,7 @@ if (empty($reshook)) {
 			$sql = "INSERT INTO ".$tabname[$id]." (";
 			// List of fields
 			$sql .= $tabfieldinsert[$id];
-            $sql .= ", active, enabled)";
+			$sql .= ", active, enabled)";
 			$sql .= " VALUES(";
 
 			// List of values

From 7897469963fd897a12c592c67318a90f0b8e8cc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 May 2021 20:34:45 +0200
Subject: [PATCH 121/135] Update account.class.php

---
 htdocs/compta/bank/class/account.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 0a094a8ab7b..8c29a9ffc36 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1693,8 +1693,7 @@ class Account extends CommonObject
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_url SET url_id = ".((int) $dest_id)." WHERE url_id = ".((int) $origin_id)." AND type='company'";
 
-		if (!$db->query($sql))
-		{
+		if (!$db->query($sql)) {
 			//if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
 			//$this->errors = $db->lasterror();
 			return false;

From 4ef53234f12bfeeeb2b83e1e79fb0badb74ae4b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 6 May 2021 20:39:36 +0200
Subject: [PATCH 122/135] Update partnership.class.php

---
 htdocs/partnership/class/partnership.class.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index a42e12fd412..8b3c9b8240a 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -119,6 +119,10 @@ class Partnership extends CommonObject
 	public $date_partnership_end;
 	public $count_last_url_check_error;
 	public $last_check_backlink;
+
+	/**
+	 * @var string reason_decline_or_cancel
+	 */
 	public $reason_decline_or_cancel;
 	// END MODULEBUILDER PROPERTIES
 
@@ -848,9 +852,10 @@ class Partnership extends CommonObject
 	/**
 	 *	Set refused status
 	 *
-	 *	@param	User	$user			Object user that modify
-	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
-	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 *	@param	User	$user			    Object user that modify
+	 *  @param  string  $reasondeclinenote  Reason decline
+	 *  @param	int		$notrigger		    1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						    <0 if KO, 0=Nothing done, >0 if OK
 	 */
 	public function refused($user, $reasondeclinenote = '', $notrigger = 0)
 	{

From f655cab5eb7a285875a73260a7ffdbef6b40763e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 21:11:39 +0200
Subject: [PATCH 123/135] Clean code

---
 htdocs/bom/bom_list.php                         | 10 +++++-----
 htdocs/bom/class/bom.class.php                  |  2 +-
 htdocs/modulebuilder/template/myobject_list.php |  8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index be0a79075f8..2fa59d8d6ef 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -495,20 +495,20 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth150', 1);
 		} elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
@@ -543,7 +543,7 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -601,7 +601,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status' && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
 		if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) {
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index b6ca36b6b42..9fe0543c4cf 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -97,7 +97,7 @@ class BOM extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>5),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'noteditable'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of BOM", 'showoncombobox'=>'1',),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
-		'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth150', 'csslist'=>'minwidth150'),
+		'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth150', 'csslist'=>'minwidth150 center'),
 		//'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>32, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing')),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'picto'=>'product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp', 'css'=>'maxwidth500'),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'notnull'=>-1,),
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 07a5cf4fa03..05cce2ba934 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -502,14 +502,14 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -557,7 +557,7 @@ foreach ($object->fields as $key => $val) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -615,7 +615,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';

From a7649a5bc241c52c3fb2cc44b9ce8e1d955b290f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 21:15:20 +0200
Subject: [PATCH 124/135] Trans

---
 htdocs/langs/en_US/mrp.lang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index fceeb1a15f1..3ec0398d59b 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -13,7 +13,7 @@ BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=List of Manufacturing Orders
 NewBOM=New bill of materials
-ProductBOMHelp=Product to create with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
+ProductBOMHelp=Product to create (or disassemble) with this BOM.<br>Note: Products with the property 'Nature of product' = 'Raw material' are not visible into this list.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOM document templates
 MOsNumberingModules=MO numbering templates
@@ -39,7 +39,7 @@ DateStartPlannedMo=Date start planned
 DateEndPlannedMo=Date end planned
 KeepEmptyForAsap=Empty means 'As Soon As Possible'
 EstimatedDuration=Estimated duration
-EstimatedDurationDesc=Estimated duration to manufacture this product using this BOM
+EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
 ConfirmValidateBom=Are you sure you want to validate the BOM with the reference <strong>%s</strong> (you will be able to use it to build new Manufacturing Orders)
 ConfirmCloseBom=Are you sure you want to cancel this BOM (you won't be able to use it to build new Manufacturing Orders anymore) ?
 ConfirmReopenBom=Are you sure you want to re-open this BOM (you will be able to use it to build new Manufacturing Orders)

From 36d50c940a4c9117d1439b74cdef0747e77823c3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 21:21:11 +0200
Subject: [PATCH 125/135] Clean code

---
 htdocs/bom/bom_card.php                         | 14 +++++++-------
 htdocs/modulebuilder/template/myobject_card.php | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index ebc2045aca3..fbd219a298b 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -610,7 +610,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Back to draft
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=setdraft&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>'."\n";
 				}
 			}
 
@@ -627,34 +627,34 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($object->status == $object::STATUS_DRAFT) {
 				if ($permissiontoadd) {
 					if (is_array($object->lines) && count($object->lines) > 0) {
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate&amp;token='.newToken().'">'.$langs->trans("Validate").'</a>';
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate&amp;token='.newToken().'">'.$langs->trans("Validate").'</a>'."\n";
 					} else {
 						$langs->load("errors");
-						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>'."\n";
 					}
 				}
 			}
 
 			// Re-open
 			if ($permissiontoadd && $object->status == $object::STATUS_CANCELED) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen">'.$langs->trans("ReOpen").'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen">'.$langs->trans("ReOpen").'</a>'."\n";
 			}
 
 			// Create MO
 			if ($conf->mrp->enabled) {
 				if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write)) {
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>';
+					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>'."\n";
 				}
 			}
 
 			// Clone
 			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&object=bom">'.$langs->trans("ToClone").'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&object=bom">'.$langs->trans("ToClone").'</a>'."\n";
 			}
 
 			// Close / Cancel
 			if ($permissiontoadd && $object->status == $object::STATUS_VALIDATED) {
-				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close">'.$langs->trans("Disable").'</a>';
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close">'.$langs->trans("Disable").'</a>'."\n";
 			}
 
 			/*
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 31bb4fd36ab..1f9da9c80ae 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -506,7 +506,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				} else {
 					$langs->load("errors");
 					//print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', 0);
-					print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+					print '<a class="butActionRefused" href="" title="'.dol_escape_htmltag($langs->trans("ErrorAddAtLeastOneLineFirst")).'">'.$langs->trans("Validate").'</a>';
 				}
 			}
 
@@ -516,16 +516,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			/*
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ENABLED) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable&token='.newToken().'">'.$langs->trans("Disable").'</a>'."\n";
+					print dolGetButtonAction($langs->trans('Disable'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable&token='.newToken(), '', $permissiontoadd);
 				} else {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Enable").'</a>'."\n";
+					print dolGetButtonAction($langs->trans('Enable'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable&token='.newToken(), '', $permissiontoadd);
 				}
 			}
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_VALIDATED) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
+					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
 				} else {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
+					print dolGetButtonAction($langs->trans('Re-Open'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken(), '', $permissiontoadd);
 				}
 			}
 			*/

From e791f9b86394856de2b8e1b1eda0a7d5c61778b5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 6 May 2021 21:34:59 +0200
Subject: [PATCH 126/135] Debug MRP feature

---
 htdocs/langs/en_US/mrp.lang   |  1 +
 htdocs/mrp/class/mo.class.php |  8 +++++++-
 htdocs/mrp/mo_production.php  | 17 ++++++++++++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 3ec0398d59b..f47354958eb 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -63,6 +63,7 @@ ConsumeAndProduceAll=Consume and Produce All
 Manufactured=Manufactured
 TheProductXIsAlreadyTheProductToProduce=The product to add is already the product to produce.
 ForAQuantityOf=For a quantity to produce of %s
+ForAQuantityToConsumeOf=For a quantity to disassemble of %s
 ConfirmValidateMo=Are you sure you want to validate this Manufacturing Order?
 ConfirmProductionDesc=By clicking on '%s', you will validate the consumption and/or production for the quantities set. This will also update the stock and record stock movements.
 ProductionForRef=Production of %s
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index ea37715b4e5..d48d4959fd1 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1280,7 +1280,13 @@ class Mo extends CommonObject
 
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('Ref').'</td>';
-		print '<td class="right">'.$langs->trans('Qty').' <span class="opacitymedium">('.$langs->trans("ForAQuantityOf", $this->bom->qty).')</span></td>';
+		print '<td class="right">'.$langs->trans('Qty');
+		if ($this->bom->bomtype == 0) {
+			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityOf", $this->bom->qty).')</span>';
+		} else {
+			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityToConsumeOf", $this->bom->qty).')</span>';
+		}
+		print '</td>';
 		print '<td class="center">'.$langs->trans('QtyFrozen').'</td>';
 		print '<td class="center">'.$langs->trans('DisableStockChange').'</td>';
 		//print '<td class="right">'.$langs->trans('Efficiency').'</td>';
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 6f35f1f1a25..65d4da3c908 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -707,16 +707,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Product").'</td>';
+		// Qty
 		print '<td class="right">'.$langs->trans("Qty").'</td>';
+		// Cost price
 		if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 			print '<td class="right">'.$langs->trans("UnitCost").'</td>';
 		}
+		// Qty already consumed
 		print '<td class="right">'.$langs->trans("QtyAlreadyConsumed").'</td>';
+		// Warehouse
 		print '<td>';
 		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 			print $langs->trans("Warehouse");
 		}
 		print '</td>';
+		// Lot - serial
 		if ($conf->productbatch->enabled) {
 			print '<td>';
 			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
@@ -724,6 +729,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 			print '</td>';
 		}
+		// Action
 		if ($permissiontodelete) {
 			print '<td></td>';
 		}
@@ -735,17 +741,26 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<td>';
 			print $form->select_produits('', 'productidtoadd', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
 			print '</td>';
+			// Qty
 			print '<td class="right"><input type="text" name="qtytoadd" value="1" class="width50 right"></td>';
+			// Cost price
 			if ($permissiontoupdatecost && !empty($conf->global->MRP_SHOW_COST_FOR_CONSUMPTION)) {
 				print '<td></td>';
 			}
-			print '<td class="right"></td>';
+			// Qty already consumed
+			print '<td></td>';
+			// Warehouse
 			print '<td>';
 			print '<input type="submit" class="button buttongen" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
 			print '</td>';
+			// Lot - serial
 			if ($conf->productbatch->enabled) {
 				print '<td></td>';
 			}
+			// Action
+			if ($permissiontodelete) {
+				print '<td></td>';
+			}
 			print '</tr>';
 		}
 

From 82bf9cd3e970b305ca581c48c33ae214305c5798 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 00:13:49 +0200
Subject: [PATCH 127/135] Fix public new member form use adh type amount

---
 htdocs/public/members/new.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 233bc483d06..9bf8cfdb18e 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -543,6 +543,10 @@ jQuery(document).ready(function () {
            document.newmember.action.value="create";
            document.newmember.submit();
         });
+        jQuery("#typeid").change(function() {
+           document.newmember.action.value="create";
+           document.newmember.submit();
+        });
     });
 });
 </script>';
@@ -561,7 +565,7 @@ if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
 		$isempty = 0;
 	}
 	print '<tr><td class="titlefield">'.$langs->trans("Type").' <FONT COLOR="red">*</FONT></td><td>';
-	print $form->selectarray("typeid", $adht->liste_array(), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
+	print $form->selectarray("typeid", $adht->liste_array(1), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
 	print '</td></tr>'."\n";
 } else {
 	$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
@@ -704,7 +708,8 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 	// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
 
 	// Set amount for the subscription
-	$amount = isset($amount) ? $amount : 0;
+	$amountbytype = adht->amountByType(1);
+	$amount = !empty($amountbytype[GETPOST('typeid',int)]) ? $amountbytype[GETPOST('typeid',int)] : (isset ($amount) ? $amount : 0);
 
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
@@ -713,6 +718,9 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 	if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
 		$amount = $amount ? $amount : (GETPOST('amount') ? GETPOST('amount') : $conf->global->MEMBER_NEWFORM_AMOUNT);
 	}
+
+	$amount = price2num($amount);
+
 	// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
 	print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
 	if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {

From 2e2b6af98ea80217d4602e01406e25a43e3c219e Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 00:23:46 +0200
Subject: [PATCH 128/135] Update new.php

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 9bf8cfdb18e..1b4fc6283b1 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -708,7 +708,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 	// $conf->global->MEMBER_NEWFORM_SHOWAMOUNT is an amount
 
 	// Set amount for the subscription
-	$amountbytype = adht->amountByType(1);
+	$amountbytype = $adht->amountByType(1);
 	$amount = !empty($amountbytype[GETPOST('typeid',int)]) ? $amountbytype[GETPOST('typeid',int)] : (isset ($amount) ? $amount : 0);
 
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {

From 9af05f3c6eff76e6106bf26687b3ebc24e29c1c4 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 00:25:38 +0200
Subject: [PATCH 129/135] Update new.php

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 1b4fc6283b1..33af176a169 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -709,7 +709,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 
 	// Set amount for the subscription
 	$amountbytype = $adht->amountByType(1);
-	$amount = !empty($amountbytype[GETPOST('typeid',int)]) ? $amountbytype[GETPOST('typeid',int)] : (isset ($amount) ? $amount : 0);
+	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid',int)] : (isset ($amount) ? $amount : 0);
 
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;

From 912995a5588511a11409d534ee959052ee052243 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 00:28:03 +0200
Subject: [PATCH 130/135] Create new.php

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 33af176a169..aaa504bc54d 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -709,7 +709,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 
 	// Set amount for the subscription
 	$amountbytype = $adht->amountByType(1);
-	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid',int)] : (isset ($amount) ? $amount : 0);
+	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid', 'int')] : (isset ($amount) ? $amount : 0);
 
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;

From 949e797390437fd3a03c68f5eb6df6a482d29174 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 6 May 2021 22:31:41 +0000
Subject: [PATCH 131/135] Fixing style errors.

---
 htdocs/public/members/new.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index aaa504bc54d..bbd1661ad94 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -709,7 +709,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT) || !empty($conf->global->MEMBER
 
 	// Set amount for the subscription
 	$amountbytype = $adht->amountByType(1);
-	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid', 'int')] : (isset ($amount) ? $amount : 0);
+	$amount = !empty($amountbytype[GETPOST('typeid', 'int')]) ? $amountbytype[GETPOST('typeid', 'int')] : (isset($amount) ? $amount : 0);
 
 	if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
 		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;

From 6504f961887f5e442071a71ed57aa437d9d49ce4 Mon Sep 17 00:00:00 2001
From: daraelmin <daraelmin@gmail.com>
Date: Fri, 7 May 2021 00:43:01 +0200
Subject: [PATCH 132/135] Copyright

---
 htdocs/public/members/new.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index bbd1661ad94..71446b58779 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
  * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2021       Waël Almoman            <info@almoman.com>
  *
  * 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

From 5dfa18758c64dc7d69747da7a875c973952b4163 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 01:36:59 +0200
Subject: [PATCH 133/135] CSS

---
 htdocs/theme/eldy/global.inc.php | 5 ++++-
 htdocs/website/index.php         | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 01ed6b127dd..b1c08e194b3 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4790,7 +4790,6 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im
 }
 
 
-
 /* ============================================================================== */
 /*  Module agenda                                                                 */
 /* ============================================================================== */
@@ -6991,6 +6990,10 @@ div.phpdebugbar-widgets-templates a.phpdebugbar-widgets-editor-link:before
 	input#addedfile {
 		width: 95%;
 	}
+
+	#divbodywebsite {
+		word-break: break-all;
+	}
 }
 
 @media only screen and (max-width: 320px)
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 1a71a162cb6..da1244b567c 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2745,7 +2745,7 @@ if (!GETPOST('hide_websitemenu')) {
 
 	if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm'))) {
 		if ($action == 'editcss') {
-			print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+			print '<input type="submit" id="savefileandstay" class="button buttonforacesave hideonsmartphone" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
 		}
 		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
 			print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
@@ -3075,7 +3075,7 @@ if (!GETPOST('hide_websitemenu')) {
 		}
 		if (!in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite'))) {
 			if ($action == 'editsource' || $action == 'editmeta') {
-				print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+				print '<input type="submit" id="savefileandstay" class="button buttonforacesave hideonsmartphone" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
 			}
 			if (preg_match('/^create/', $action)) {
 				print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';

From cc79fc6eeedf8aeffaf78a4402a811ddab01e0c0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 7 May 2021 11:30:27 +0200
Subject: [PATCH 134/135] Lang

---
 htdocs/langs/en_US/cashdesk.lang | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 47bf937a90e..aba05d67fc8 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 TakeposGroupSameProduct=Group same products lines
 StartAParallelSale=Start a new parallel sale
 SaleStartedAt=Sale started at %s
-ControlCashOpening=Control cash popup at opening POS
+ControlCashOpening=Open the "Control cash" popup when opening the POS
 CloseCashFence=Close cash desk control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
@@ -126,5 +126,5 @@ ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
 WeighingScale=Weighing scale
-ShowPriceHT = Display the price excluding tax column
-ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
+ShowPriceHT = Display the column with the price excluding tax (on screen)
+ShowPriceHTOnReceipt = Display the column with the price excluding tax (on receipt)

From 671633fe867ef1f04c76d7a32023cf7f71aad35c Mon Sep 17 00:00:00 2001
From: lmarcouiller <lucas.marcouiller@gmail.com>
Date: Fri, 7 May 2021 11:48:14 +0200
Subject: [PATCH 135/135] Fix : Bug included in develop branch and 13.0

---
 test/phpunit/CodingPhpTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index b3250b9e265..37fc7eee703 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -219,7 +219,8 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 					'multicurrency.class.php',
 					'productbatch.class.php',
 					'reception.class.php',
-					'societe.class.php'
+					'societe.class.php' ,
+					'account.class.php'
 				))) {
 					// Must must not found $db->
 					$ok=true;