From 5b52dc9f0470d3ae64de8cc13ebb8ebdfb60350e Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Tue, 31 Jan 2023 10:43:58 +0100
Subject: [PATCH 001/300] Fix : stripe sepa payment process

---
 htdocs/core/class/commoninvoice.class.php | 137 +++-------------------
 htdocs/langs/en_US/bills.lang             |   2 +
 htdocs/public/stripe/ipn.php              | 101 +++++++++++++++-
 htdocs/stripe/class/stripe.class.php      |  24 ++--
 4 files changed, 129 insertions(+), 135 deletions(-)

diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index d1eb324cc7f..0f38b39e0af 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -92,6 +92,10 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	const STATUS_ABANDONED = 3;
 
+	/**
+	 * Classified processing because payment requested
+	 */
+	const STATUS_PROCESSING = 4;
 
 	public $totalpaid;			// duplicate with sumpayed
 	public $totaldeposits;		// duplicate with sumdeposit
@@ -610,6 +614,10 @@ abstract class CommonInvoice extends CommonObject
 				$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedPaidPartially');
 				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedPaidPartially');
 				$statusType = 'status9';
+			} elseif ($status == 4) {
+				$labelStatus = $langs->transnoentitiesnoconv('BillStatusRequestProcessing');
+				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusRequestProcessing');
+				$statusType = 'status3';
 			} elseif ($alreadypaid == 0) {
 				$labelStatus = $langs->transnoentitiesnoconv('BillStatusNotPaid');
 				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusNotPaid');
@@ -900,9 +908,9 @@ abstract class CommonInvoice extends CommonObject
 
 			$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn";
 			$sql .= " FROM ".$this->db->prefix()."prelevement_demande";
-			$sql .= " AND fk_facture = ".((int) $this->fk_facture);		// Add a protection to not pay another invoice than current one
-			$sql .= " AND traite = 0";	// Add a protection to not process twice
 			$sql .= " WHERE rowid = ".((int) $did);
+			$sql .= " AND fk_facture = ".((int) $this->id);		// Add a protection to not pay another invoice than current one
+			$sql .= " AND traite = 0";	// Add a protection to not process twice
 
 			dol_syslog(get_class($this)."::makeStripeSepaRequest 1", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -1186,126 +1194,11 @@ abstract class CommonInvoice extends CommonObject
 											// Default description used for label of event. Will be overwrite by another value later.
 											$description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
 
-
-											// @TODO LMR Save request to status pending instead of done. Done should be set with a webhook.
-
-
-											$db = $this->db;
-
-											$ipaddress = getUserRemoteIP();
-
-											$TRANSACTIONID = $charge->id;
-											$currency = $conf->currency;
-											$paymentmethod = 'stripe';
-											$emetteur_name = $charge->customer;
-
-											// Same code than into paymentok.php...
-
-											$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)) {
-												//erics
-												if ($sepaMode) {
-													$paymentType = 'PRE';
-												} else {
-													$paymentType = $_SESSION["paymentType"];
-													if (empty($paymentType)) {
-														$paymentType = 'CB';
-													}
-												}
-												$paymentTypeId = dol_getIdFromCode($this->db, $paymentType, 'c_paiement', 'code', 'id', 1);
-											}
-
-											$currencyCodeType = $currency;
-
-											$ispostactionok = 1;
-
-											// Creation of payment line
-											// TODO LMR This must be move into the stripe server listening hooks public/stripe/ipn.php
-											include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
-											$paiement = new Paiement($this->db);
-											$paiement->datepaye = $now;
-											$paiement->date = $now;
-											if ($currencyCodeType == $conf->currency) {
-												$paiement->amounts = [$this->id => $amounttopay];   // Array with all payments dispatching with invoice id
-											} else {
-												$paiement->multicurrency_amounts = [$this->id => $amounttopay];   // Array with all payments dispatching
-
-												$postactionmessages[] = 'Payment was done in a different currency than currency expected of company';
-												$ispostactionok = -1;
-												// Not yet supported, so error
+											$result =$this->setStatut($this::STATUS_PROCESSING);
+											if ($result < 0) {
 												$error++;
 												$errorforinvoice++;
-											}
-											$paiement->paiementid = $paymentTypeId;
-											$paiement->num_paiement = '';
-											$paiement->num_payment = '';
-											// Add a comment with keyword 'SellYourSaas' in text. Used by trigger.
-											$paiement->note_public = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using ' . $paymentmethod . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
-											$paiement->note_private = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using ' . $paymentmethod . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
-											$paiement->ext_payment_id = $charge->id . ':' . $customer->id . '@' . $stripearrayofkeys['publishable_key'];
-											$paiement->ext_payment_site = 'stripe';
-
-											if (!$errorforinvoice) {
-												dol_syslog('* Record payment for invoice id ' . $this->id . '. It includes closing of invoice and regenerating document');
-
-												// This include closing invoices to 'paid' (and trigger including unsuspending) and regenerating document
-												$paiement_id = $paiement->create($user, 1);
-												if ($paiement_id < 0) {
-													$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . join("<br>\n", $paiement->errors);
-													$ispostactionok = -1;
-													$error++;
-													$errorforinvoice++;
-												} else {
-													$postactionmessages[] = 'Payment created';
-												}
-
-												dol_syslog("The payment has been created for invoice id " . $this->id);
-											}
-
-											if (!$errorforinvoice && isModEnabled('banque')) {
-												dol_syslog('* Add payment to bank');
-
-												// The bank used is the one defined into Stripe setup
-												$bankaccountid = 0;
-												if ($paymentmethod == 'stripe') {
-													$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
-												}
-
-												if ($bankaccountid > 0) {
-													$label = '(CustomerInvoicePayment)';
-													if ($this->type == Facture::TYPE_CREDIT_NOTE) {
-														$label = '(CustomerInvoicePaymentBack)';
-													}  // Refund of a credit note
-													$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, $emetteur_name, '');
-													if ($result < 0) {
-														$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . join("<br>\n", $paiement->errors);
-														$ispostactionok = -1;
-														$error++;
-														$errorforinvoice++;
-													} else {
-														$postactionmessages[] = 'Bank transaction of payment created (by makeStripeSepaRequest)';
-													}
-												} else {
-													$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
-													$ispostactionok = -1;
-													$error++;
-													$errorforinvoice++;
-												}
-											}
-
-											if ($ispostactionok < 1) {
-												$description = 'Stripe payment OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') but post action KO from makeStripeSepaRequest: ' . $FULLTAG;
-											} else {
-												$description = 'Stripe payment+post action OK (' . $charge->id . ' - ' . $amounttopay . ' ' . $conf->currency . ') from makeStripeSepaRequest: ' . $FULLTAG;
+												$this->errors[] = 'Error on invoice status change to processing';
 											}
 										}
 
@@ -1563,13 +1456,13 @@ abstract class CommonInvoice extends CommonObject
 					$idtransferfile = 0;
 
 					// Update the direct debit payment request of the processed invoice to save the id of the prelevement_bon
-					$sql = "UPDATE".MAIN_DB_PREFIX."prelevement_demande SET";
+					$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";
 					$sql .= " traite = 1,";	// TODO Remove this
 					$sql .= " date_traite = '".$this->db->idate(dol_now())."'";	// TODO Remove this
 					if ($idtransferfile > 0) {
 						$sql .= " fk_prelevement_bons = ".((int) $idtransferfile);
 					}
-					$sql .= "WHERE rowid = ".((int) $did);
+					$sql .= " WHERE rowid = ".((int) $did);
 
 
 					dol_syslog(get_class($this)."::makeStripeSepaRequest", LOG_DEBUG);
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 183620c72da..40adce33c66 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -148,6 +148,8 @@ BillShortStatusNotPaid=Not paid
 BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
+BillStatusRequestProcessing=Payment request processing
+BillShortStatusRequestProcessing=Processing
 PaymentStatusToValidShort=To validate
 ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index dd5b1db148f..b41149a88f8 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -72,7 +72,9 @@ if (isset($_GET['connect'])) {
 		$servicestatus = 1;
 	}
 }
-
+$endpoint_secret = $conf->global->STRIPE_TEST_WEBHOOK_KEY;
+$service = 'StripeTest';
+$servicestatus = 0;
 if (empty($conf->stripe->enabled)) {
 	httponly_accessforbidden('Module Stripe not enabled');
 }
@@ -300,6 +302,103 @@ if ($event->type == 'payout.created') {
 } elseif ($event->type == 'payment_intent.succeeded') {		// Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
 	// TODO: create fees
 	// TODO: Redirect to paymentok.php
+	include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+	$object = $event->data->object;
+	$invoice_id = $object->metadata->dol_id;
+	$ipaddress = $object->metadata->ipaddress;
+	$invoice_amount = $object->amount / 100;
+	$TRANSACTIONID = $object->id;
+	$customer_id = $object->customer;
+	$errorforinvoice = 0;
+	$paymentmethod = 'stripe';
+	$now = dol_now();
+	$currencyCodeType = strtoupper($object->currency);
+	$paymentmethodstripeid = $object->payment_method;
+
+	global $stripearrayofkeysbyenv;
+	$stripeacc = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
+
+	dol_syslog("Try to create sepa_debit with data = ".json_encode($dataforcard));
+
+	$s = new \Stripe\StripeClient($stripeacc);
+
+	$paymentmethodstripe = $s->paymentMethods->retrieve($paymentmethodstripeid);
+
+	//$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+	$paymentTypeId =  $paymentmethodstripe->type;
+	if ($paymentTypeId == "sepa_debit") {
+		$paymentTypeId = "BANCON";
+	} elseif ($paymentTypeId == "card") {
+		$paymentTypeId = "CB";
+	}
+
+	$paiement = new Paiement($db);
+	$paiement->datepaye = $now;
+	$paiement->date = $now;
+	if ($currencyCodeType == $conf->currency) {
+		$paiement->amounts = [$invoice_id => $invoice_amount];   // Array with all payments dispatching with invoice id
+	} else {
+		$paiement->multicurrency_amounts = [$invoice_id => $invoice_amount];   // Array with all payments dispatching
+
+		$postactionmessages[] = 'Payment was done in a different currency than currency expected of company';
+		$ispostactionok = -1;
+		// Not yet supported, so error
+		$error++;
+		$errorforinvoice++;
+	}
+	$paiement->paiementid = $paymentTypeId;
+	$paiement->num_paiement = '';
+	$paiement->num_payment = '';
+	// Add a comment with keyword 'SellYourSaas' in text. Used by trigger.
+	$paiement->note_public = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using ' . $paymentmethod . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
+	$paiement->note_private = 'StripeSepa payment ' . dol_print_date($now, 'standard') . ' using ' . $paymentmethod . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
+	$paiement->ext_payment_id = $TRANSACTIONID . ':' . $customer_id . '@' . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'];
+	$paiement->ext_payment_site = 'stripe';
+
+	if (!$errorforinvoice) {
+		dol_syslog('* Record payment for invoice id ' . $invoice_id . '. It includes closing of invoice and regenerating document');
+
+		// This include closing invoices to 'paid' (and trigger including unsuspending) and regenerating document
+		$paiement_id = $paiement->create($user, 1);
+		if ($paiement_id < 0) {
+			$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . join("<br>\n", $paiement->errors);
+			$ispostactionok = -1;
+			$error++;
+			$errorforinvoice++;
+		} else {
+			$postactionmessages[] = 'Payment created';
+		}
+
+		dol_syslog("The payment has been created for invoice id " . $invoice_id);
+	}
+
+	if (!$errorforinvoice && isModEnabled('banque')) {
+		dol_syslog('* Add payment to bank');
+
+		// The bank used is the one defined into Stripe setup
+		$bankaccountid = 0;
+		if ($paymentmethod == 'stripe') {
+			$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
+		}
+
+		if ($bankaccountid > 0) {
+			$label = '(CustomerInvoicePayment)';
+			$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, $customer_id, '');
+			if ($result < 0) {
+				$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . join("<br>\n", $paiement->errors);
+				$ispostactionok = -1;
+				$error++;
+				$errorforinvoice++;
+			} else {
+				$postactionmessages[] = 'Bank transaction of payment created (by makeStripeSepaRequest)';
+			}
+		} else {
+			$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+			$ispostactionok = -1;
+			$error++;
+			$errorforinvoice++;
+		}
+	}
 } elseif ($event->type == 'payment_intent.payment_failed') {
 	// TODO: Redirect to paymentko.php
 } elseif ($event->type == 'checkout.session.completed') {		// Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index bc98a085d08..0684fb370b7 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -964,10 +964,9 @@ class Stripe extends CommonObject
 					$dataforcard = array(
 						'type'=>'sepa_debit',
 						"sepa_debit" => array('iban' => $iban),
-						'currency' => strtolower($conf->currency),
-						'usage' => 'reusable',
-						'owner' => array(
+						'billing_details' => array(
 							'name' => $soc->name,
+							'email' => !empty($soc->email) ? $soc->email : "",
 						),
 						"metadata" => array(
 							'dol_type'=>$object->element,
@@ -979,19 +978,19 @@ class Stripe extends CommonObject
 					);
 					// Complete owner name
 					if (!empty($soc->town)) {
-						$dataforcard['owner']['address']['city']=$soc->town;
+						$dataforcard['billing_details']['address']['city']=$soc->town;
 					}
 					if (!empty($soc->country_code)) {
-						$dataforcard['owner']['address']['country']=$soc->country_code;
+						$dataforcard['billing_details']['address']['country']=$soc->country_code;
 					}
 					if (!empty($soc->address)) {
-						$dataforcard['owner']['address']['line1']=$soc->address;
+						$dataforcard['billing_details']['address']['line1']=$soc->address;
 					}
 					if (!empty($soc->zip)) {
-						$dataforcard['owner']['address']['postal_code']=$soc->zip;
+						$dataforcard['billing_details']['address']['postal_code']=$soc->zip;
 					}
 					if (!empty($soc->state)) {
-						$dataforcard['owner']['address']['state']=$soc->state;
+						$dataforcard['billing_details']['address']['state']=$soc->state;
 					}
 
 					//$a = \Stripe\Stripe::getApiKey();
@@ -1013,14 +1012,14 @@ class Stripe extends CommonObject
 
 						$s = new \Stripe\StripeClient($stripeacc);
 
-						// TODO LMR Deprecated with the new Stripe API and SCA.
-						// TODO LMR Replace ->create() and ->createSource() and replace with ->getSetupIntent() to then, get the Payment mode with $payment_method = \Stripe\PaymentMethod::retrieve($setupintent->payment_method); ?
-						$sepa = $s->sources->create($dataforcard);
+						$sepa = $s->paymentMethods->create($dataforcard);
 						if (!$sepa) {
 							$this->error = 'Creation of sepa_debit on Stripe has failed';
 						} else {
 							// link customer and src
-							$cs = $cu->createSource($cu->id, array('source' => $sepa->id));
+							$cs = $s->setupIntents->create(['payment_method_types' => ['sepa_debit'], 'customer' => $cu->id]);
+							$cs = $s->setupIntents->update($cs->id, ['payment_method' => $sepa->id]);
+							$cs = $s->setupIntents->confirm($cs->id, ['mandate_data' => ['customer_acceptance' => ['type' => 'offline']]]);
 							if (!$cs) {
 								$this->error = 'Link SEPA <-> Customer failed';
 							} else {
@@ -1040,6 +1039,7 @@ class Stripe extends CommonObject
 							}
 						}
 					} catch (Exception $e) {
+						$sepa = null;
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 					}

From 1e53f87d518070479e71b0236d65e5d21320b7f9 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Wed, 8 Feb 2023 12:18:46 +0100
Subject: [PATCH 002/300] FIX: various PHP8 compatibility fixes

---
 htdocs/admin/agenda.php                       |  2 +-
 htdocs/admin/agenda_extsites.php              |  2 +-
 htdocs/admin/agenda_other.php                 |  4 +--
 htdocs/admin/agenda_xcal.php                  | 33 ++++++++++++++-----
 htdocs/admin/dav.php                          |  6 +++-
 htdocs/admin/facture.php                      |  8 +++--
 htdocs/admin/payment.php                      |  6 ++--
 .../core/class/commondocgenerator.class.php   | 10 ++++++
 .../modules/facture/mod_facture_mercure.php   | 23 ++++++-------
 .../core/modules/payment/mod_payment_ant.php  |  6 ++--
 .../doc/doc_generic_proposal_odt.modules.php  | 19 ++++++-----
 ..._generic_supplier_proposal_odt.modules.php | 19 ++++++-----
 .../mod_supplier_proposal_saphir.php          |  8 +++--
 .../user/doc/doc_generic_user_odt.modules.php | 17 ++++++----
 .../doc/doc_generic_usergroup_odt.modules.php | 17 ++++++----
 htdocs/dav/dav.lib.php                        |  2 +-
 htdocs/includes/tcpdi/tcpdi_parser.php        |  4 +--
 htdocs/main.inc.php                           |  2 ++
 18 files changed, 117 insertions(+), 71 deletions(-)

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 730983ad090..bd1bae40d19 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -197,7 +197,7 @@ if (!empty($triggers)) {
 				print '<td>'.$trigger['label'].'</td>';
 				print '<td class="right" width="40">';
 				$key = 'MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
-				$value = $conf->global->$key;
+				$value = getDolGlobalInt($key);
 				print '<input class="oddeven" type="checkbox" name="'.$key.'" value="1"'.((($action == 'selectall' || $value) && $action != "selectnone") ? ' checked' : '').'>';
 				print '</td></tr>'."\n";
 			}
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 5567e741272..d6cb112810a 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -202,7 +202,7 @@ print '<span class="opacitymedium">'.$langs->trans("AgendaExtSitesDesc")."</span
 print "<br>\n";
 
 
-$selectedvalue=$conf->global->AGENDA_DISABLE_EXT;
+$selectedvalue = getDolGlobalInt('AGENDA_DISABLE_EXT');
 if ($selectedvalue==1) $selectedvalue=0; else $selectedvalue=1;
 
 print "<table class=\"noborder\" width=\"100%\">";
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 8e50380e2ae..7a49d2def53 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -325,7 +325,7 @@ print '<td>'.$form->textwithpicto($langs->trans("AGENDA_DEFAULT_VIEW"), $htmltex
 print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right">'."\n";
 $tmplist = array(''=>'&nbsp;', 'show_list'=>$langs->trans("ViewList"), 'show_month'=>$langs->trans("ViewCal"), 'show_week'=>$langs->trans("ViewWeek"), 'show_day'=>$langs->trans("ViewDay"), 'show_peruser'=>$langs->trans("ViewPerUser"));
-print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, $conf->global->AGENDA_DEFAULT_VIEW);
+print $form->selectarray('AGENDA_DEFAULT_VIEW', $tmplist, getDolGlobalString('AGENDA_DEFAULT_VIEW'));
 print '</td></tr>'."\n";
 
 // Manual or automatic
@@ -387,7 +387,7 @@ print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans("AGENDA_DEFAULT_FILTER_STATUS").'</td>'."\n";
 print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right">'."\n";
-$formactions->form_select_status_action('agenda', $conf->global->AGENDA_DEFAULT_FILTER_STATUS, 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100');
+$formactions->form_select_status_action('agenda', getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS'), 1, 'AGENDA_DEFAULT_FILTER_STATUS', 1, 2, 'minwidth100');
 print '</td></tr>'."\n";
 
 print '</table>';
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index ce36d97d06a..fc75042146f 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -38,6 +38,23 @@ $langs->loadLangs(array("admin", "other", "agenda"));
 
 $def = array();
 $actionsave = GETPOST('save', 'alpha');
+$MAIN_AGENDA_XCAL_EXPORTKEY = getDolGlobalString('MAIN_AGENDA_XCAL_EXPORTKEY');
+$MAIN_AGENDA_EXPORT_PAST_DELAY = getDolGlobalInt('MAIN_AGENDA_EXPORT_PAST_DELAY');
+$MAIN_AGENDA_EXPORT_CACHE = getDolGlobalInt('MAIN_AGENDA_EXPORT_CACHE');
+$AGENDA_EXPORT_FIX_TZ = getDolGlobalString('AGENDA_EXPORT_FIX_TZ');
+
+if (GETPOSTISSET('MAIN_AGENDA_XCAL_EXPORTKEY')) {
+	$MAIN_AGENDA_XCAL_EXPORTKEY = trim(GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY', 'alpha'));
+}
+if (GETPOSTISSET('MAIN_AGENDA_EXPORT_PAST_DELAY')) {
+	$MAIN_AGENDA_EXPORT_PAST_DELAY = intval(GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY', 'int'));
+}
+if (GETPOSTISSET('MAIN_AGENDA_EXPORT_CACHE')) {
+	$MAIN_AGENDA_EXPORT_CACHE = intval(GETPOST('MAIN_AGENDA_EXPORT_CACHE', 'int'));
+}
+if (GETPOSTISSET('AGENDA_EXPORT_FIX_TZ')) {
+	$AGENDA_EXPORT_FIX_TZ = trim(GETPOST('AGENDA_EXPORT_FIX_TZ', 'alpha'));
+}
 
 // Sauvegardes parametres
 if ($actionsave) {
@@ -45,10 +62,10 @@ if ($actionsave) {
 
 	$db->begin();
 
-	$i += dolibarr_set_const($db, 'MAIN_AGENDA_XCAL_EXPORTKEY', trim(GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY', 'alpha')), 'chaine', 0, '', $conf->entity);
-	$i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_PAST_DELAY', trim(GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY', 'alpha')), 'chaine', 0, '', $conf->entity);
-	$i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_CACHE', trim(GETPOST('MAIN_AGENDA_EXPORT_CACHE', 'alpha')), 'chaine', 0, '', $conf->entity);
-	$i += dolibarr_set_const($db, 'AGENDA_EXPORT_FIX_TZ', trim(GETPOST('AGENDA_EXPORT_FIX_TZ', 'alpha')), 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'MAIN_AGENDA_XCAL_EXPORTKEY', $MAIN_AGENDA_XCAL_EXPORTKEY, 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_PAST_DELAY', $MAIN_AGENDA_EXPORT_PAST_DELAY, 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'MAIN_AGENDA_EXPORT_CACHE', $MAIN_AGENDA_EXPORT_CACHE, 'chaine', 0, '', $conf->entity);
+	$i += dolibarr_set_const($db, 'AGENDA_EXPORT_FIX_TZ', $AGENDA_EXPORT_FIX_TZ, 'chaine', 0, '', $conf->entity);
 
 	if ($i >= 4) {
 		$db->commit();
@@ -97,7 +114,7 @@ print "</tr>";
 
 print '<tr class="oddeven">';
 print '<td class="fieldrequired">'.$langs->trans("PasswordTogetVCalExport")."</td>";
-print '<td><input required="required" type="text" class="flat" id="MAIN_AGENDA_XCAL_EXPORTKEY" name="MAIN_AGENDA_XCAL_EXPORTKEY" value="'.(GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY', 'alpha') ?GETPOST('MAIN_AGENDA_XCAL_EXPORTKEY', 'alpha') : $conf->global->MAIN_AGENDA_XCAL_EXPORTKEY).'" size="40">';
+print '<td><input required="required" type="text" class="flat" id="MAIN_AGENDA_XCAL_EXPORTKEY" name="MAIN_AGENDA_XCAL_EXPORTKEY" value="'.dol_escape_htmltag($MAIN_AGENDA_XCAL_EXPORTKEY).'" size="40">';
 if (!empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 }
@@ -107,13 +124,13 @@ print "</tr>";
 
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("PastDelayVCalExport")."</td>";
-print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_EXPORT_PAST_DELAY\" value=\"".(GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY', 'alpha') ?GETPOST('MAIN_AGENDA_EXPORT_PAST_DELAY', 'alpha') : $conf->global->MAIN_AGENDA_EXPORT_PAST_DELAY)."\" size=\"10\"> ".$langs->trans("days")."</td>";
+print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_EXPORT_PAST_DELAY\" value=\"".$MAIN_AGENDA_EXPORT_PAST_DELAY."\" size=\"10\"> ".$langs->trans("days")."</td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("UseACacheDelay")."</td>";
-print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_EXPORT_CACHE\" value=\"".(GETPOST('MAIN_AGENDA_EXPORT_CACHE', 'alpha') ?GETPOST('MAIN_AGENDA_EXPORT_CACHE', 'alpha') : $conf->global->MAIN_AGENDA_EXPORT_CACHE)."\" size=\"10\"></td>";
+print "<td><input type=\"text\" class=\"flat\" name=\"MAIN_AGENDA_EXPORT_CACHE\" value=\"".$MAIN_AGENDA_EXPORT_CACHE."\" size=\"10\"></td>";
 print "<td>&nbsp;</td>";
 print "</tr>";
 
@@ -130,7 +147,7 @@ print "</tr>";
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("FixTZ")."</td>";
 print "<td>";
-print '<input class="flat" type="text" size="4" name="AGENDA_EXPORT_FIX_TZ" value="'.$conf->global->AGENDA_EXPORT_FIX_TZ.'">';
+print '<input class="flat" type="text" size="4" name="AGENDA_EXPORT_FIX_TZ" value="'.dol_escape_htmltag($AGENDA_EXPORT_FIX_TZ).'">';
 print ' &nbsp; '.$langs->trans("FillThisOnlyIfRequired");
 print "</td>";
 print "</tr>";
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index e12848e3de1..a19ffa17b49 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -42,7 +42,7 @@ $arrayofparameters = array(
 	'DAV_RESTICT_ON_IP'=>array('css'=>'minwidth200', 'enabled'=>1),
 	'DAV_ALLOW_PRIVATE_DIR'=>array('css'=>'minwidth200', 'enabled'=>2),
 	'DAV_ALLOW_PUBLIC_DIR'=>array('css'=>'minwidth200', 'enabled'=>1),
-	'DAV_ALLOW_ECM_DIR'=>array('css'=>'minwidth200', 'enabled'=>$conf->ecm->enabled)
+	'DAV_ALLOW_ECM_DIR'=>array('css'=>'minwidth200', 'enabled'=>! empty($conf->ecm->enabled))
 );
 
 // To fix when dire does not exists
@@ -123,6 +123,10 @@ if ($action == 'edit') {
 	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($arrayofparameters as $key => $val) {
+		if (isset($val['enabled']) && empty($val['enabled'])) {
+			continue;
+		}
+
 		print '<tr class="oddeven"><td class="titlefieldmiddle">';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		$label = $langs->trans($key);
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index ae269492ddf..756484289aa 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -323,7 +323,7 @@ foreach ($dirmodels as $reldir) {
 							if ($conf->global->FACTURE_ADDON == $file || $conf->global->FACTURE_ADDON.'.php' == $file) {
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
-								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
 
@@ -661,12 +661,14 @@ if (!empty($conf->banque->enabled)) {
 }
 print "</td></tr>";
 
+$FACTURE_CHQ_NUMBER = getDolGlobalInt('FACTURE_CHQ_NUMBER');
+
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("SuggestPaymentByChequeToAddress")."</td>";
 print "<td>";
 print '<select class="flat" name="chq" id="chq">';
 print '<option value="0">'.$langs->trans("DoNotSuggestPaymentMode").'</option>';
-print '<option value="-1"'.($conf->global->FACTURE_CHQ_NUMBER ? ' selected' : '').'>'.$langs->trans("MenuCompanySetup").' ('.($mysoc->name ? $mysoc->name : $langs->trans("NotDefined")).')</option>';
+print '<option value="-1"'.($FACTURE_CHQ_NUMBER == -1 ? ' selected' : '').'>'.$langs->trans("MenuCompanySetup").' ('.($mysoc->name ? $mysoc->name : $langs->trans("NotDefined")).')</option>';
 
 $sql = "SELECT rowid, label";
 $sql .= " FROM ".MAIN_DB_PREFIX."bank_account";
@@ -682,7 +684,7 @@ if ($resql) {
 		$row = $db->fetch_row($resql);
 
 		print '<option value="'.$row[0].'"';
-		print $conf->global->FACTURE_CHQ_NUMBER == $row[0] ? ' selected' : '';
+		print $FACTURE_CHQ_NUMBER == $row[0] ? ' selected' : '';
 		print '>'.$langs->trans("OwnerOfBankAccount", $row[1]).'</option>';
 
 		$i++;
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 089ddbafd23..a50abcd9ffe 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -189,7 +189,7 @@ foreach ($dirmodels as $reldir) {
 							if ($conf->global->PAYMENT_ADDON == $file || $conf->global->PAYMENT_ADDON.'.php' == $file) {
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
-								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							}
 							print '</td>';
 
@@ -256,7 +256,7 @@ print "</tr>\n";
 print '<tr class="oddeven"><td>';
 print $langs->trans("PaymentOnDifferentThirdBills");
 print '</td><td width="60" align="center">';
-print $form->selectyesno("FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", $conf->global->FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS, 1);
+print $form->selectyesno("FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS", getDolGlobalInt('FACTURE_PAYMENTS_ON_DIFFERENT_THIRDPARTIES_BILLS'), 1);
 print '</td><td class="right">';
 print "</td></tr>\n";
 
@@ -264,7 +264,7 @@ print "</td></tr>\n";
 print '<tr class="oddeven"><td>';
 print $langs->trans("GroupPaymentsByModOnReports");
 print '</td><td width="60" align="center">';
-print $form->selectyesno("PAYMENTS_REPORT_GROUP_BY_MOD", $conf->global->PAYMENTS_REPORT_GROUP_BY_MOD, 1);
+print $form->selectyesno("PAYMENTS_REPORT_GROUP_BY_MOD", getDolGlobalInt('PAYMENTS_REPORT_GROUP_BY_MOD'), 1);
 print '</td><td class="right">';
 print "</td></tr>\n";
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 21c1cce4cfd..b80c5e9ac8b 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -35,6 +35,16 @@
  */
 abstract class CommonDocGenerator
 {
+	/**
+	 * @var string Model name
+	 */
+	public $name = '';
+
+	/**
+	 * @var string Name of constant that is used to save list of directories to scan
+	 */
+	public $scandir = '';
+
 	/**
 	 * @var string Error code (or message)
 	 */
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 621bb8e6d2d..545fe0d6aff 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -52,7 +52,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
 	 */
 	public function info()
 	{
-		global $db, $conf, $langs;
+		global $db, $langs;
 
 		$langs->load("bills");
 
@@ -76,7 +76,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
 
 		// Setting the prefix
 		$texte .= '<tr><td><span class="opacitymedium">'.$langs->trans("Mask").' ('.$langs->trans("InvoiceStandard").'):</span></td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskinvoice" value="'.$conf->global->FACTURE_MERCURE_MASK_INVOICE.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskinvoice" value="'.getDolGlobalString('FACTURE_MERCURE_MASK_INVOICE').'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="3">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -84,17 +84,17 @@ class mod_facture_mercure extends ModeleNumRefFactures
 
 		// Prefix setting of replacement invoices
 		$texte .= '<tr><td><span class="opacitymedium">'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</span></td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreplacement" value="'.$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskreplacement" value="'.getDolGlobalString('FACTURE_MERCURE_MASK_REPLACEMENT').'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		// Prefix setting of credit note
 		$texte .= '<tr><td><span class="opacitymedium">'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</span></td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcredit" value="'.$conf->global->FACTURE_MERCURE_MASK_CREDIT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcredit" value="'.getDolGlobalString('FACTURE_MERCURE_MASK_CREDIT').'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		// Prefix setting of deposit
 		$texte .= '<tr><td><span class="opacitymedium">'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</span></td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskdeposit" value="'.$conf->global->FACTURE_MERCURE_MASK_DEPOSIT.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskdeposit" value="'.getDolGlobalString('FACTURE_MERCURE_MASK_DEPOSIT').'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
 		$texte .= '</table>';
@@ -136,23 +136,20 @@ class mod_facture_mercure extends ModeleNumRefFactures
 	 */
 	public function getNextValue($objsoc, $invoice, $mode = 'next')
 	{
-		global $db, $conf;
+		global $db;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// Get Mask value
 		$mask = '';
 		if (is_object($invoice) && $invoice->type == 1) {
-			$mask = $conf->global->FACTURE_MERCURE_MASK_REPLACEMENT;
-			if (!$mask) {
-				$mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
-			}
+			$mask = getDolGlobalString('FACTURE_MERCURE_MASK_REPLACEMENT', getDolGlobalString('FACTURE_MERCURE_MASK_INVOICE'));
 		} elseif (is_object($invoice) && $invoice->type == 2) {
-			$mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
+			$mask = getDolGlobalString('FACTURE_MERCURE_MASK_CREDIT');
 		} elseif (is_object($invoice) && $invoice->type == 3) {
-			$mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
+			$mask = getDolGlobalString('FACTURE_MERCURE_MASK_DEPOSIT');
 		} else {
-			$mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
+			$mask = getDolGlobalString('FACTURE_MERCURE_MASK_INVOICE');
 		}
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
index 958074202fe..d59d7c47f6f 100644
--- a/htdocs/core/modules/payment/mod_payment_ant.php
+++ b/htdocs/core/modules/payment/mod_payment_ant.php
@@ -61,7 +61,7 @@ class mod_payment_ant extends ModeleNumRefPayments
 	 */
 	public function info()
 	{
-		global $db, $conf, $langs;
+		global $db, $langs;
 
 		$langs->load("bills");
 
@@ -82,7 +82,7 @@ class mod_payment_ant extends ModeleNumRefPayments
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskpayment" value="'.$conf->global->PAYMENT_ANT_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskpayment" value="'.getDolGlobalString('PAYMENT_ANT_MASK').'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -128,7 +128,7 @@ class mod_payment_ant extends ModeleNumRefPayments
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->PAYMENT_ANT_MASK;
+		$mask = getDolGlobalString('PAYMENT_ANT_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index 66e2f3c8312..ab03b04b86e 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -117,13 +117,16 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 		$form = new Form($this->db);
 
+		$odtChosen = getDolGlobalInt('MAIN_PROPAL_CHOOSE_ODT_DOCUMENT') > 0;
+		$odtPath = trim(getDolGlobalString('PROPALE_ADDON_PDF_ODT_PATH'));
+
 		$texte = $this->description.".<br>\n";
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="PROPALE_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
+		if ($odtChosen) {
 			$texte .= '<input type="hidden" name="param2" value="PROPALE_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="PROPALE_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="PROPALE_ADDON_PDF_ODT_CLOSED">';
@@ -133,7 +136,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		// List of directories area
 		$texte .= '<tr><td>';
 		$texttitle = $langs->trans("ListOfDirectories");
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->PROPALE_ADDON_PDF_ODT_PATH)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', $odtPath));
 		$listoffiles = array();
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
@@ -159,7 +162,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
 		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
 		$texte .= '<textarea class="flat" cols="60" name="value1">';
-		$texte .= $conf->global->PROPALE_ADDON_PDF_ODT_PATH;
+		$texte .= $odtPath;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
 		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
@@ -167,7 +170,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->PROPALE_ADDON_PDF_ODT_PATH)) {
+		if (!empty($odtPath)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -184,26 +187,26 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			$texte .= '</div>';
 
 			// Set default template for different status of proposal
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
+			if ($odtChosen) {
 				// Model for creation
 				$list = ModelePDFPropales::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
 				$texte .= '<tr>';
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value2', $list, $conf->global->PROPALE_ADDON_PDF_ODT_DEFAULT);
+				$texte .= $form->selectarray('value2', $list, getDolGlobalString('PROPALE_ADDON_PDF_ODT_DEFAULT'));
 				$texte .= "</td></tr>";
 
 				$texte .= '<tr>';
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value3', $list, $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL);
+				$texte .= $form->selectarray('value3', $list, getDolGlobalString('PROPALE_ADDON_PDF_ODT_TOBILL'));
 				$texte .= "</td></tr>";
 				$texte .= '<tr>';
 
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value4', $list, $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED);
+				$texte .= $form->selectarray('value4', $list, getDolGlobalString('PROPALE_ADDON_PDF_ODT_CLOSED'));
 				$texte .= "</td></tr>";
 				$texte .= '</table>';
 			}
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index 04f6ed49012..0cfcd91a350 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -118,13 +118,16 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 		$form = new Form($this->db);
 
+		$odtChosen = getDolGlobalInt('MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT') > 0;
+		$odtPath = trim(getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH'));
+
 		$texte = $this->description.".<br>\n";
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0) {
+		if ($odtChosen) {
 			$texte .= '<input type="hidden" name="param2" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED">';
@@ -134,7 +137,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		// List of directories area
 		$texte .= '<tr><td>';
 		$texttitle = $langs->trans("ListOfDirectories");
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', $odtPath));
 		$listoffiles = array();
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
@@ -160,7 +163,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
 		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
 		$texte .= '<textarea class="flat" cols="60" name="value1">';
-		$texte .= $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH;
+		$texte .= $odtPath;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
 		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
@@ -168,7 +171,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH)) {
+		if (!empty($odtPath)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -184,26 +187,26 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 			}
 			$texte .= '</div>';
 
-			if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0) {
+			if ($odtChosen) {
 				// Model for creation
 				$list = ModelePDFSupplierProposal::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
 				$texte .= '<tr>';
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalCreate").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value2', $list, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT);
+				$texte .= $form->selectarray('value2', $list, getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT'));
 				$texte .= "</td></tr>";
 
 				$texte .= '<tr>';
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalToBill").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value3', $list, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL);
+				$texte .= $form->selectarray('value3', $list, getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL'));
 				$texte .= "</td></tr>";
 				$texte .= '<tr>';
 
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelSupplierProposalClosed").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value4', $list, $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED);
+				$texte .= $form->selectarray('value4', $list, getDolGlobalString('SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED'));
 				$texte .= "</td></tr>";
 				$texte .= '</table>';
 			}
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
index e7db54062cb..99a05e12e4d 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -64,7 +64,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 	 */
 	public function info()
 	{
-		global $conf, $langs, $db;
+		global $langs, $db;
 
 		$langs->load("bills");
 
@@ -83,9 +83,11 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("CommRequest"), $langs->transnoentities("CommRequest"));
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
+		$mask = dolGetGlobalString('SUPPLIER_PROPOSAL_SAPHIR_MASK');
+
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="masksupplier_proposal" value="'.$conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="masksupplier_proposal" value="'.$mask.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -131,7 +133,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask = $conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK;
+		$mask = empty($conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK) ? '' : $conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK;
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 656eb88ecaa..aa068a162e2 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -115,13 +115,16 @@ class doc_generic_user_odt extends ModelePDFUser
 
 		$form = new Form($this->db);
 
+		$odtChosen = getDolGlobalInt('MAIN_PROPAL_CHOOSE_ODT_DOCUMENT') > 0;
+		$odtPath = trim(getDolGlobalString('USER_ADDON_PDF_ODT_PATH'));
+
 		$texte = $this->description.".<br>\n";
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="USER_ADDON_PDF_ODT_PATH">';
-		if (!empty($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT)) {
+		if ($odtChosen) {
 			$texte .= '<input type="hidden" name="param2" value="USER_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="USER_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="USER_ADDON_PDF_ODT_CLOSED">';
@@ -131,7 +134,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		// List of directories area
 		$texte .= '<tr><td>';
 		$texttitle = $langs->trans("ListOfDirectories");
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->USER_ADDON_PDF_ODT_PATH)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', $odtPath));
 		$listoffiles = array();
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
@@ -157,7 +160,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
 		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
 		$texte .= '<textarea class="flat" cols="60" name="value1">';
-		$texte .= $conf->global->USER_ADDON_PDF_ODT_PATH;
+		$texte .= $odtPath;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
 		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
@@ -167,26 +170,26 @@ class doc_generic_user_odt extends ModelePDFUser
 		if (count($listofdir)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
-			if (!empty($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT)) {
+			if ($odtChosen) {
 				// Model for creation
 				$list = ModelePDFUser::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
 				$texte .= '<tr>';
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value2', $list, $conf->global->USER_ADDON_PDF_ODT_DEFAULT);
+				$texte .= $form->selectarray('value2', $list, getDolGlobalString('USER_ADDON_PDF_ODT_DEFAULT'));
 				$texte .= "</td></tr>";
 
 				$texte .= '<tr>';
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value3', $list, $conf->global->USER_ADDON_PDF_ODT_TOBILL);
+				$texte .= $form->selectarray('value3', $list, getDolGlobalString('USER_ADDON_PDF_ODT_TOBILL'));
 				$texte .= "</td></tr>";
 				$texte .= '<tr>';
 
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value4', $list, $conf->global->USER_ADDON_PDF_ODT_CLOSED);
+				$texte .= $form->selectarray('value4', $list, getDolGlobalString('USER_ADDON_PDF_ODT_CLOSED'));
 				$texte .= "</td></tr>";
 				$texte .= '</table>';
 			}
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index e1c83023df9..e1e5238cb89 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -118,13 +118,16 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 		$form = new Form($this->db);
 
+		$odtChosen = getDolGlobalInt('MAIN_PROPAL_CHOOSE_ODT_DOCUMENT') > 0;
+		$odtPath = trim(getDolGlobalString('USERGROUP_ADDON_PDF_ODT_PATH'));
+
 		$texte = $this->description.".<br>\n";
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="USERGROUP_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
+		if ($odtChosen) {
 			$texte .= '<input type="hidden" name="param2" value="USERGROUP_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="USERGROUP_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="USERGROUP_ADDON_PDF_ODT_CLOSED">';
@@ -134,7 +137,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		// List of directories area
 		$texte .= '<tr><td>';
 		$texttitle = $langs->trans("ListOfDirectories");
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->USERGROUP_ADDON_PDF_ODT_PATH)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', $odtPath));
 		$listoffiles = array();
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
@@ -160,7 +163,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
 		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
 		$texte .= '<textarea class="flat" cols="60" name="value1">';
-		$texte .= $conf->global->USERGROUP_ADDON_PDF_ODT_PATH;
+		$texte .= $odtPath;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
 		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
@@ -170,26 +173,26 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		if (count($listofdir)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
+			if ($odtChosen) {
 				// Model for creation
 				$list = ModelePDFUserGroup::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
 				$texte .= '<tr>';
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalCreate").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value2', $list, $conf->global->USERGROUP_ADDON_PDF_ODT_DEFAULT);
+				$texte .= $form->selectarray('value2', $list, getDolGlobalString('USERGROUP_ADDON_PDF_ODT_DEFAULT'));
 				$texte .= "</td></tr>";
 
 				$texte .= '<tr>';
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalToBill").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value3', $list, $conf->global->USERGROUP_ADDON_PDF_ODT_TOBILL);
+				$texte .= $form->selectarray('value3', $list, getDolGlobalString('USERGROUP_ADDON_PDF_ODT_TOBILL'));
 				$texte .= "</td></tr>";
 				$texte .= '<tr>';
 
 				$texte .= '<td width="60%;">'.$langs->trans("DefaultModelPropalClosed").'</td>';
 				$texte .= '<td colspan="">';
-				$texte .= $form->selectarray('value4', $list, $conf->global->USERGROUP_ADDON_PDF_ODT_CLOSED);
+				$texte .= $form->selectarray('value4', $list, getDolGlobalString('USERGROUP_ADDON_PDF_ODT_CLOSED'));
 				$texte .= "</td></tr>";
 				$texte .= '</table>';
 			}
diff --git a/htdocs/dav/dav.lib.php b/htdocs/dav/dav.lib.php
index 2861b8744bf..9babbabbe83 100644
--- a/htdocs/dav/dav.lib.php
+++ b/htdocs/dav/dav.lib.php
@@ -54,7 +54,7 @@ function dav_admin_prepare_head()
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/dav.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/dav.php';
 	$head[$h][1] = $langs->trans("WebDAV");
 	$head[$h][2] = 'webdav';
 	$h++;
diff --git a/htdocs/includes/tcpdi/tcpdi_parser.php b/htdocs/includes/tcpdi/tcpdi_parser.php
index 13e9839f2b4..174c496d4f4 100644
--- a/htdocs/includes/tcpdi/tcpdi_parser.php
+++ b/htdocs/includes/tcpdi/tcpdi_parser.php
@@ -1365,7 +1365,7 @@ class tcpdi_parser {
     	$obj = $this->getObjectVal($obj);
     	if (isset ($obj[1][1]['/Rotate'])) {
     		$res = $this->getObjectVal($obj[1][1]['/Rotate']);
-    		if ($res[0] == PDF_TYPE_OBJECT)
+    		if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT)
                 return $res[1];
             return $res;
     	} else {
@@ -1373,7 +1373,7 @@ class tcpdi_parser {
     			return false;
     		} else {
                 $res = $this->_getPageRotation($obj[1][1]['/Parent']);
-                if ($res[0] == PDF_TYPE_OBJECT)
+                if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT)
                     return $res[1];
                 return $res;
     		}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index b97312859b9..d541f3abce5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -754,6 +754,8 @@ if (!defined('NOLOGIN')) {
 				$login = '';
 			}
 
+			$dol_authmode = '';
+
 			if ($login) {
 				$dol_authmode = $conf->authmode; // This properties is defined only when logged, to say what mode was successfully used
 				$dol_tz = $_POST["tz"];

From da0daa49da8d0c64d05c832f07ae3d1cabd2d901 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 9 Feb 2023 18:01:59 +0100
Subject: [PATCH 003/300] FIX: some more PHP8 comptability fixes

---
 htdocs/core/class/html.formfile.class.php                 | 8 ++++----
 .../triggers/interface_50_modAgenda_ActionsAuto.class.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 4bcf742d461..1d6a2b10a04 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -496,6 +496,10 @@ class FormFile
 			$titletoshow = ($title == 'none' ? '' : $title);
 		}
 
+		$addcolumforpicto = ($delallowed || $printer || $morepicto);
+		$colspan = (4 + ($addcolumforpicto ? 1 : 0));
+		$colspanmore = 0;
+
 		// Show table
 		if ($genallowed) {
 			$modellist = array();
@@ -747,10 +751,6 @@ class FormFile
 
 			$out .= '<tr class="liste_titre">';
 
-			$addcolumforpicto = ($delallowed || $printer || $morepicto);
-			$colspan = (4 + ($addcolumforpicto ? 1 : 0));
-			$colspanmore = 0;
-
 			$out .= '<th colspan="'.$colspan.'" class="formdoc liste_titre maxwidthonsmartphone center">';
 
 			// Model
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index d441d364f4b..ba9cdba1493 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -1059,7 +1059,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		$ret = $actioncomm->create($user); // User creating action
 
 		if ($ret > 0 && !empty($conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)) {
-			if (is_array($object->attachedfiles) && array_key_exists('paths', $object->attachedfiles) && count($object->attachedfiles['paths']) > 0) {
+			if (property_exists($object, 'attachedfiles') && is_array($object->attachedfiles) && array_key_exists('paths', $object->attachedfiles) && count($object->attachedfiles['paths']) > 0) {
 				foreach ($object->attachedfiles['paths'] as $key => $filespath) {
 					$srcfile = $filespath;
 					$destdir = $conf->agenda->dir_output.'/'.$ret;

From b5ffe6204fe6df0d14215e32b6cb04f110c00873 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Fri, 10 Feb 2023 15:30:36 +0100
Subject: [PATCH 004/300] push with ipn not working

---
 .../class/bonprelevement.class.php            |  2 +-
 htdocs/core/class/commoninvoice.class.php     | 67 ++++++++++---------
 htdocs/langs/en_US/bills.lang                 |  2 -
 htdocs/public/stripe/ipn.php                  | 48 ++++++++++++-
 4 files changed, 83 insertions(+), 36 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index b9d1fd7c54a..bbfc694d414 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -106,7 +106,7 @@ class BonPrelevement extends CommonObject
 	 */
 	public function __construct($db)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $db;
 
 		$this->db = $db;
 
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 2063bb59bf9..41d76310779 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -92,10 +92,6 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	const STATUS_ABANDONED = 3;
 
-	/**
-	 * Classified processing because payment requested
-	 */
-	const STATUS_PROCESSING = 4;
 
 	public $totalpaid;			// duplicate with sumpayed
 	public $totaldeposits;		// duplicate with sumdeposit
@@ -618,10 +614,6 @@ abstract class CommonInvoice extends CommonObject
 				$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedPaidPartially');
 				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedPaidPartially');
 				$statusType = 'status9';
-			} elseif ($status == 4) {
-				$labelStatus = $langs->transnoentitiesnoconv('BillStatusRequestProcessing');
-				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusRequestProcessing');
-				$statusType = 'status3';
 			} elseif ($alreadypaid == 0) {
 				$labelStatus = $langs->transnoentitiesnoconv('BillStatusNotPaid');
 				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusNotPaid');
@@ -1197,13 +1189,6 @@ abstract class CommonInvoice extends CommonObject
 
 											// Default description used for label of event. Will be overwrite by another value later.
 											$description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
-
-											$result =$this->setStatut($this::STATUS_PROCESSING);
-											if ($result < 0) {
-												$error++;
-												$errorforinvoice++;
-												$this->errors[] = 'Error on invoice status change to processing';
-											}
 										}
 
 										$object = $this;
@@ -1457,24 +1442,42 @@ abstract class CommonInvoice extends CommonObject
 					}
 
 					// TODO Create a prelevement_bon and set its status to sent instead of this
-					$idtransferfile = 0;
-
-					// Update the direct debit payment request of the processed invoice to save the id of the prelevement_bon
-					$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";
-					$sql .= " traite = 1,";	// TODO Remove this
-					$sql .= " date_traite = '".$this->db->idate(dol_now())."'";	// TODO Remove this
-					if ($idtransferfile > 0) {
-						$sql .= " fk_prelevement_bons = ".((int) $idtransferfile);
-					}
-					$sql .= " WHERE rowid = ".((int) $did);
-
-
-					dol_syslog(get_class($this)."::makeStripeSepaRequest", LOG_DEBUG);
-					$resql = $this->db->query($sql);
-					if (!$resql) {
-						$this->error = $this->db->lasterror();
-						dol_syslog(get_class($this).'::makeStripeSepaRequest Erreur');
+					$bon = new BonPrelevement($db);
+					$nbinvoices = $bon->create();
+					if ($nbinvoices <= 0) {
 						$error++;
+						$errorforinvoice++;
+						dol_syslog("Error on BonPrelevement creation", LOG_ERR);
+						$this->errors[] = "Error on BonPrelevement creation";
+					}
+
+					$result = $bon->set_infotrans($user, $now, 'internet');
+					if ($result < 0) {
+						$error++;
+						$errorforinvoice++;
+						dol_syslog("Error on BonPrelevement creation", LOG_ERR);
+						$this->errors[] = "Error on BonPrelevement creation";
+					}
+
+					if (!$errorforinvoice) {
+						$idtransferfile = $bon->id;
+						// Update the direct debit payment request of the processed invoice to save the id of the prelevement_bon
+						$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";
+						$sql .= " traite = 1,";	// TODO Remove this
+						$sql .= " date_traite = '".$this->db->idate(dol_now())."',";	// TODO Remove this
+						if ($idtransferfile > 0) {
+							$sql .= " fk_prelevement_bons = ".((int) $idtransferfile);
+						}
+						$sql .= " WHERE rowid = ".((int) $did);
+
+
+						dol_syslog(get_class($this)."::makeStripeSepaRequest", LOG_DEBUG);
+						$resql = $this->db->query($sql);
+						if (!$resql) {
+							$this->error = $this->db->lasterror();
+							dol_syslog(get_class($this).'::makeStripeSepaRequest Erreur');
+							$error++;
+						}
 					}
 				} else {
 					$this->error = 'WithdrawRequestErrorNilAmount';
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 40adce33c66..183620c72da 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -148,8 +148,6 @@ BillShortStatusNotPaid=Not paid
 BillShortStatusNotRefunded=Not refunded
 BillShortStatusClosedUnpaid=Closed
 BillShortStatusClosedPaidPartially=Paid (partially)
-BillStatusRequestProcessing=Payment request processing
-BillShortStatusRequestProcessing=Processing
 PaymentStatusToValidShort=To validate
 ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment type defined. Go to Invoice module setup to fix this.
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index b41149a88f8..de4ed61f802 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -43,9 +43,9 @@ require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-
 require_once DOL_DOCUMENT_ROOT.'/includes/stripe/stripe-php/init.php';
 require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
@@ -399,6 +399,52 @@ if ($event->type == 'payout.created') {
 			$errorforinvoice++;
 		}
 	}
+
+	if (!$errorforinvoice && isModEnabled('prelevement')) { //TEST IPN
+		$bon = new BonPrelevement($db);
+		$idbon = 0;
+		$sql = "SELECT dp.fk_prelevement_bons as idbon";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as dp";
+		$sql .= " WHERE dp.fk_facture = '".$db->escape($invoice_id)."'";
+		$sql .= " AND dp.sourcetype = 'facture'";
+		$sql .= " AND dp.traite = 1";
+		$result = $db->query($sql);
+		if ($result) {
+			if ($db->num_rows($result)) {
+				$obj = $db->fetch_object($result);
+				$idbon = $obj->idbon;
+			}
+		} else {
+			$postactionmessages[] = $db->lasterror();
+			$ispostactionok = -1;
+			$error++;
+			$errorforinvoice++;
+		}
+
+		if (!empty($idbon)) {
+			$bon->fetch($idbon);
+			$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
+			$sql .= " SET fk_user_credit = ".$user->id;
+			$sql .= ", statut = ".$bon::STATUS_CREDITED;
+			$sql .= ", date_credit = '".$db->idate($now)."'";
+			$sql .= ", credite = 1";
+			$sql .= " WHERE rowid=".((int) $bon->id);
+			$sql .= " AND entity = ".((int) $bon->entity);
+			$sql .= " AND statut = ".$bon::STATUS_TRANSFERED;
+
+			$db->begin();
+			$result = $db->query($sql);
+			if (!$result) {
+				$db->rollback();
+				$postactionmessages[] = $db->lasterror();
+				$ispostactionok = -1;
+				$error++;
+				$errorforinvoice++;
+			} else {
+				$db->commit();
+			}
+		}
+	}
 } elseif ($event->type == 'payment_intent.payment_failed') {
 	// TODO: Redirect to paymentko.php
 } elseif ($event->type == 'checkout.session.completed') {		// Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).

From 89f3ba1a322c4949ab741a5bbf5d8736482460ae Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Fri, 10 Feb 2023 16:12:24 +0100
Subject: [PATCH 005/300] fix ipn

---
 htdocs/public/stripe/ipn.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index de4ed61f802..ad51e37c310 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -400,7 +400,7 @@ if ($event->type == 'payout.created') {
 		}
 	}
 
-	if (!$errorforinvoice && isModEnabled('prelevement')) { //TEST IPN
+	if (!$errorforinvoice && isModEnabled('prelevement')) {
 		$bon = new BonPrelevement($db);
 		$idbon = 0;
 		$sql = "SELECT dp.fk_prelevement_bons as idbon";
@@ -423,13 +423,12 @@ if ($event->type == 'payout.created') {
 
 		if (!empty($idbon)) {
 			$bon->fetch($idbon);
-			$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
 			$sql .= " SET fk_user_credit = ".$user->id;
 			$sql .= ", statut = ".$bon::STATUS_CREDITED;
 			$sql .= ", date_credit = '".$db->idate($now)."'";
 			$sql .= ", credite = 1";
 			$sql .= " WHERE rowid=".((int) $bon->id);
-			$sql .= " AND entity = ".((int) $bon->entity);
 			$sql .= " AND statut = ".$bon::STATUS_TRANSFERED;
 
 			$db->begin();

From bc0b0514bb4547885d1b27eb682f51d54b2a0a7d Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Fri, 10 Feb 2023 16:29:39 +0100
Subject: [PATCH 006/300] fix Ci

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

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index ad51e37c310..2c93654829b 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -425,11 +425,11 @@ if ($event->type == 'payout.created') {
 			$bon->fetch($idbon);
 			$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
 			$sql .= " SET fk_user_credit = ".$user->id;
-			$sql .= ", statut = ".$bon::STATUS_CREDITED;
+			$sql .= ", statut = '".$db->escape($bon::STATUS_CREDITED)."'";
 			$sql .= ", date_credit = '".$db->idate($now)."'";
 			$sql .= ", credite = 1";
 			$sql .= " WHERE rowid=".((int) $bon->id);
-			$sql .= " AND statut = ".$bon::STATUS_TRANSFERED;
+			$sql .= " AND statut = '".$db->escape($bon::STATUS_TRANSFERED)."'";
 
 			$db->begin();
 			$result = $db->query($sql);

From 74a0b5f211b9350d8c7a9c1d4c75e703ac081001 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 14 Feb 2023 09:21:31 +0100
Subject: [PATCH 007/300] FIX: php 8 warnings: use v17 code

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

diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index 8310308265d..1b615ddeed1 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -43,7 +43,7 @@ $arrayofparameters = array(
 	'DAV_RESTICT_ON_IP'=>array('css'=>'minwidth200', 'enabled'=>1),
 	'DAV_ALLOW_PRIVATE_DIR'=>array('css'=>'minwidth200', 'enabled'=>2),
 	'DAV_ALLOW_PUBLIC_DIR'=>array('css'=>'minwidth200', 'enabled'=>1),
-	'DAV_ALLOW_ECM_DIR'=>array('css'=>'minwidth200', 'enabled'=>! empty($conf->ecm->enabled))
+	'DAV_ALLOW_ECM_DIR'=>array('css'=>'minwidth200', 'enabled'=>isModEnabled('ecm'))
 );
 
 // To fix when dire does not exists

From 8b8ba10ae2e9a354d1471a1effacfc6258a2b7e9 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Tue, 14 Feb 2023 09:35:06 +0100
Subject: [PATCH 008/300] FIX: php 8 warnings: adapt to v17

---
 htdocs/core/class/commondocgenerator.class.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 7e07d7427bc..1b59d44bdde 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -40,11 +40,6 @@ abstract class CommonDocGenerator
 	 */
 	public $name = '';
 
-	/**
-	 * @var string Name of constant that is used to save list of directories to scan
-	 */
-	public $scandir = '';
-
 	/**
 	 * @var string Error code (or message)
 	 */

From 076ffaa15bb5631509912b4f82efe89525bb9e3e Mon Sep 17 00:00:00 2001
From: Anthony Berton <anthony.berton@bb2a.fr>
Date: Tue, 21 Feb 2023 09:43:35 +0100
Subject: [PATCH 009/300] FIX - error datamatrix

---
 .../includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php b/htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php
index 19b46fadaf1..783f99da4cd 100644
--- a/htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php
+++ b/htdocs/includes/tecnickcom/tcpdf/include/barcodes/datamatrix.php
@@ -629,7 +629,7 @@ class Datamatrix {
 					if ($numch[ENC_C40] == $numch[ENC_X12]) {
 						$k = ($pos + $charscount + 1);
 						while ($k < $data_length) {
-							$tmpchr = ord($data{$k});
+							$tmpchr = ord($data[$k]);
 							if ($this->isCharMode($tmpchr, ENC_X12)) {
 								return ENC_X12;
 							} elseif (!($this->isCharMode($tmpchr, ENC_X12) OR $this->isCharMode($tmpchr, ENC_C40))) {

From 50baadbe0ad0c5eb797c2dd7ad8b267ccf8cf42b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 13:27:21 +0100
Subject: [PATCH 010/300] Fix warning

---
 htdocs/comm/propal/class/propal.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index c9dff023034..9dca1b1051d 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1455,7 +1455,7 @@ class Propal extends CommonObject
 		if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) {
 			$object->ref_client = '';
 		}
-		if ($conf->global->MAIN_DONT_KEEP_NOTE_ON_CLONING == 1) {
+		if (getDolGlobalInt('MAIN_DONT_KEEP_NOTE_ON_CLONING') == 1) {
 			$object->note_private = '';
 			$object->note_public = '';
 		}

From 643c05116f6bf35065b749dcb321c2609fe759aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 13:37:27 +0100
Subject: [PATCH 011/300] Debug v17

---
 htdocs/admin/mailing.php                      |  6 +--
 htdocs/comm/action/class/actioncomm.class.php |  4 +-
 htdocs/comm/mailing/card.php                  | 39 ++++++++++++++++---
 3 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 19effcdfd2e..81f8210b23f 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -150,8 +150,8 @@ print '</tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("MailingEMailError").'</td><td>';
-print '<input class="minwidth100" type="text" name="MAILING_EMAIL_ERRORSTO" value="'.$conf->global->MAILING_EMAIL_ERRORSTO.'">';
-if (!empty($conf->global->MAILING_EMAIL_ERRORSTO) && !isValidEmail($conf->global->MAILING_EMAIL_ERRORSTO)) {
+print '<input class="minwidth100" type="text" name="MAILING_EMAIL_ERRORSTO" value="'.getDolGlobalString('MAILING_EMAIL_ERRORSTO').'">';
+if (getDolGlobalString('MAILING_EMAIL_ERRORSTO') && !isValidEmail(getDolGlobalString('MAILING_EMAIL_ERRORSTO'))) {
 	print ' '.img_warning($langs->trans("BadEMail"));
 }
 print '</td>';
@@ -160,7 +160,7 @@ print '</tr>';
 
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("MailingDelay"), $langs->trans("IfDefinedUseAValueBeetween", '0.001', '10')).'</td><td>';
-print '<input class="width75" type="text" name="MAILING_DELAY" value="'.$conf->global->MAILING_DELAY.'">';
+print '<input class="width75" type="text" name="MAILING_DELAY" value="'.getDolGlobalString('MAILING_DELAY').'">';
 print '</td>';
 print '<td class="hideonsmartphone"></td>';
 print '</tr>';
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index eae7136ac88..39c4fd50be9 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -2463,7 +2463,7 @@ class ActionComm extends CommonObject
 						}
 
 						// Sender
-						$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
+						$from = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
 						if (empty($from)) {
 							$errormesg = "Failed to get sender into global setup MAIN_MAIL_EMAIL_FROM";
 							$error++;
@@ -2471,7 +2471,7 @@ class ActionComm extends CommonObject
 
 						if (!$error) {
 							// Errors Recipient
-							$errors_to = $conf->global->MAIN_MAIL_ERRORS_TO;
+							$errors_to = getDolGlobalString('MAIN_MAIL_ERRORS_TO');
 
 							// Mail Creation
 							$cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, array(), array(), array(), '', "", 0, 1, $errors_to, '', '', '', '', '');
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 32207425d2a..63750d5d834 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -43,18 +43,19 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 $langs->load("mails");
 
 $id = (GETPOST('mailid', 'int') ? GETPOST('mailid', 'int') : GETPOST('id', 'int'));
+
 $action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel');
 $confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
 $urlfrom = GETPOST('urlfrom');
 
+// Initialize technical objects
 $object = new Mailing($db);
+$extrafields = new ExtraFields($db);
 
 $result = $object->fetch($id);
 
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
+// Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -98,6 +99,32 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$error = 0;
+
+	$backurlforlist = DOL_URL_ROOT.'/comm/mailing/list.php';
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT.'/comm/mailing/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
+	if ($cancel) {
+		/*var_dump($cancel);var_dump($backtopage);var_dump($backtopageforcancel);exit;*/
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action = '';
+	}
+
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes') {
 		if (!GETPOST("clone_content", 'alpha') && !GETPOST("clone_receivers", 'alpha')) {
@@ -736,9 +763,9 @@ if ($action == 'create') {
 
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTitle").'</td><td><input class="flat minwidth300" name="title" value="'.dol_escape_htmltag(GETPOST('title')).'" autofocus="autofocus"></td></tr>';
 
-	print '<tr><td class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat minwidth200" name="from" value="'.$conf->global->MAILING_EMAIL_FROM.'"></td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("MailFrom").'</td><td><input class="flat minwidth200" name="from" value="'.getDolGlobalString('MAILING_EMAIL_FROM').'"></td></tr>';
 
-	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.(!empty($conf->global->MAILING_EMAIL_ERRORSTO) ? $conf->global->MAILING_EMAIL_ERRORSTO : $conf->global->MAIN_MAIL_ERRORS_TO).'"></td></tr>';
+	print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td><input class="flat minwidth200" name="errorsto" value="'.getDolGlobalString('MAILING_EMAIL_ERRORSTO', getDolGlobalString('MAIN_MAIL_ERRORS_TO')).'"></td></tr>';
 
 	// Other attributes
 	$parameters = array();

From 9b6e0bab0004070575e4c653df295581cc51afad Mon Sep 17 00:00:00 2001
From: "yann.droniou" <yann.droniou@photospace.fr>
Date: Tue, 21 Feb 2023 14:26:29 +0100
Subject: [PATCH 012/300] Fix LDAP Authentification failure with error 500

---
 htdocs/core/class/ldap.class.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index b2b5e2c6e93..38220f7a17b 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -344,12 +344,7 @@ class Ldap
 	 */
 	public function close()
 	{
-		$r_type = get_resource_type($this->connection);
-		if ($this->connection && ($r_type === "Unknown" || !@ldap_close($this->connection))) {
-			return false;
-		} else {
-			return true;
-		}
+		return $this->unbind();
 	}
 
 	/**
@@ -401,7 +396,7 @@ class Ldap
 	public function unbind()
 	{
 		$this->result = true;
-		if ($this->connection) {
+		if (is_resource($this->connection)) {
 			$this->result = @ldap_unbind($this->connection);
 		}
 		if ($this->result) {

From 1f3aa24c8a27e6e851829057bbf668c4f68bbb4c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 16:56:16 +0100
Subject: [PATCH 013/300] Fix missing date delivery on invoice

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index fef33262a0f..86ed5fb107d 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -2386,6 +2386,7 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
 					if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
 					$linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
+					$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_delivery, 'day', '', $outputlangs);
 				} else {
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
 					if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');

From 3f0f9c0e70e548665d2b5b8f42ef4f40b1387b46 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Tue, 21 Feb 2023 17:21:01 +0100
Subject: [PATCH 014/300] FIX : Recursive management for showinh/hiding
 sube-BOM lines on the MO Page

---
 htdocs/bom/lib/bom.lib.php | 41 ++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
index 8d827ba09aa..2cf8fc61733 100644
--- a/htdocs/bom/lib/bom.lib.php
+++ b/htdocs/bom/lib/bom.lib.php
@@ -156,22 +156,33 @@ function mrpCollapseBomManagement()
 	<script type="text/javascript" language="javascript">
 
 		$(document).ready(function () {
-			// When clicking on collapse
-			$(".collapse_bom").click(function() {
-				console.log("We click on collapse");
-				var id_bom_line = $(this).attr('id').replace('collapse-', '');
-				console.log($(this).html().indexOf('folder-open'));
-				if($(this).html().indexOf('folder-open') <= 0) {
-					$('[parentid="'+ id_bom_line +'"]').show();
-					$(this).html('<?php echo dol_escape_js(img_picto('', 'folder-open')); ?>');
-				}
-				else {
-					$('[parentid="'+ id_bom_line +'"]').hide();
-					$(this).html('<?php echo dol_escape_js(img_picto('', 'folder')); ?>');
-				}
+            function folderManage(element, onClose = 0) {
+                let id_bom_line = element.attr('id').replace('collapse-', '');
+                let TSubLines = $('[parentid="'+ id_bom_line +'"]');
 
-				return false;
-			});
+                if(element.html().indexOf('folder-open') <= 0 && onClose < 1) {
+                    $('[parentid="'+ id_bom_line +'"]').show();
+                    element.html('<?php echo dol_escape_js(img_picto('', 'folder-open')); ?>');
+                }
+                else {
+                    for (let i = 0; i < TSubLines.length; i++) {
+                        let subBomFolder = $(TSubLines[i]).children('.linecoldescription').children('.collapse_bom');
+
+                        if (subBomFolder.length > 0) {
+                            onClose = 1
+                            folderManage(subBomFolder, onClose);
+                        }
+                    }
+                    TSubLines.hide();
+                    element.html('<?php echo dol_escape_js(img_picto('', 'folder')); ?>');
+                }
+            }
+
+            // When clicking on collapse
+            $(".collapse_bom").click(function() {
+                folderManage($(this));
+                return false;
+            });
 
 			// To Show all the sub bom lines
 			$("#show_all").click(function() {

From d4c48951eb4919900057074794c00e11624feac0 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Tue, 21 Feb 2023 16:30:38 +0000
Subject: [PATCH 015/300] Fixing style errors.

---
 htdocs/bom/lib/bom.lib.php | 48 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
index 2cf8fc61733..50532de6e36 100644
--- a/htdocs/bom/lib/bom.lib.php
+++ b/htdocs/bom/lib/bom.lib.php
@@ -156,33 +156,33 @@ function mrpCollapseBomManagement()
 	<script type="text/javascript" language="javascript">
 
 		$(document).ready(function () {
-            function folderManage(element, onClose = 0) {
-                let id_bom_line = element.attr('id').replace('collapse-', '');
-                let TSubLines = $('[parentid="'+ id_bom_line +'"]');
+			function folderManage(element, onClose = 0) {
+				let id_bom_line = element.attr('id').replace('collapse-', '');
+				let TSubLines = $('[parentid="'+ id_bom_line +'"]');
 
-                if(element.html().indexOf('folder-open') <= 0 && onClose < 1) {
-                    $('[parentid="'+ id_bom_line +'"]').show();
-                    element.html('<?php echo dol_escape_js(img_picto('', 'folder-open')); ?>');
-                }
-                else {
-                    for (let i = 0; i < TSubLines.length; i++) {
-                        let subBomFolder = $(TSubLines[i]).children('.linecoldescription').children('.collapse_bom');
+				if(element.html().indexOf('folder-open') <= 0 && onClose < 1) {
+					$('[parentid="'+ id_bom_line +'"]').show();
+					element.html('<?php echo dol_escape_js(img_picto('', 'folder-open')); ?>');
+				}
+				else {
+					for (let i = 0; i < TSubLines.length; i++) {
+						let subBomFolder = $(TSubLines[i]).children('.linecoldescription').children('.collapse_bom');
 
-                        if (subBomFolder.length > 0) {
-                            onClose = 1
-                            folderManage(subBomFolder, onClose);
-                        }
-                    }
-                    TSubLines.hide();
-                    element.html('<?php echo dol_escape_js(img_picto('', 'folder')); ?>');
-                }
-            }
+						if (subBomFolder.length > 0) {
+							onClose = 1
+							folderManage(subBomFolder, onClose);
+						}
+					}
+					TSubLines.hide();
+					element.html('<?php echo dol_escape_js(img_picto('', 'folder')); ?>');
+				}
+			}
 
-            // When clicking on collapse
-            $(".collapse_bom").click(function() {
-                folderManage($(this));
-                return false;
-            });
+			// When clicking on collapse
+			$(".collapse_bom").click(function() {
+				folderManage($(this));
+				return false;
+			});
 
 			// To Show all the sub bom lines
 			$("#show_all").click(function() {

From 70c99b1f7937ec8b73360e31999e03a85997b975 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 18:32:36 +0100
Subject: [PATCH 016/300] Fix pdf

---
 htdocs/core/lib/pdf.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 86ed5fb107d..7a80193b221 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -2386,11 +2386,12 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
 					if (! empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
 					$linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
-					$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_delivery, 'day', '', $outputlangs);
+					$linkedobjects[$objecttype]['date_value'] = dol_print_date(empty($elementobject->date_shipping) ? $elementobject->date_delivery : $elementobject->date_shipping, 'day', '', $outputlangs);
 				} else {
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
 					if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
 					$linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
+					$linkedobjects[$objecttype]['date_value'] = dol_print_date(empty($elementobject->date_shipping) ? $elementobject->date_delivery : $elementobject->date_shipping, 'day', '', $outputlangs);
 				}
 			}
 		}

From 772776075f536e9d25a976411d71cb31627515d9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 19:44:40 +0100
Subject: [PATCH 017/300] Doc

---
 htdocs/product/stock/class/entrepot.class.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 23e9334f91b..9e58fbb2f0f 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -150,15 +150,21 @@ class Entrepot extends CommonObject
 	const STATUS_CLOSED = 0;
 
 	/**
-	 * Warehouse open and operations for customer shipping, supplier dispatch, internal stock transfers/corrections allowed.
+	 * Warehouse open and any operations are allowed (customer shipping, supplier dispatch, internal stock transfers/corrections).
 	 */
 	const STATUS_OPEN_ALL = 1;
 
 	/**
-	 * Warehouse open and operations for stock transfers/corrections allowed (not for customer shipping and supplier dispatch).
+	 * Warehouse open and only operations for stock transfers/corrections allowed (not for customer shipping and supplier dispatch).
 	 */
 	const STATUS_OPEN_INTERNAL = 2;
 
+	/**
+	 * Warehouse open and any operations are allowed, but warehouse is not included into calculation of stock.
+	 */
+	const STATUS_OPENEXT_ALL = 3;	// TODO Implement this
+
+
 
 	/**
 	 *  Constructor

From 2770955620cc3d0a41517fc4fdff9370db32d0f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 19:48:16 +0100
Subject: [PATCH 018/300] Doc

---
 htdocs/product/stock/card.php                 | 4 ++--
 htdocs/product/stock/class/entrepot.class.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index bc69da4ffc4..586408d1e5e 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -364,7 +364,7 @@ if ($action == 'create') {
 
 	// Status
 	print '<tr><td>'.$langs->trans("Status").'</td><td>';
-	print '<select id="warehousestatus" name="statut" class="flat">';
+	print '<select id="warehousestatus" name="statut" class="flat minwidth100">';
 	foreach ($object->statuts as $key => $value) {
 		if ($key == 1) {
 			print '<option value="'.$key.'" selected>'.$langs->trans($value).'</option>';
@@ -839,7 +839,7 @@ if ($action == 'create') {
 
 
 		/*
-		 * Edition fiche
+		 * Edit
 		 */
 		if ($action == 'edit' || $action == 're-edit') {
 			$langs->trans("WarehouseEdit");
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 9e58fbb2f0f..8393b081a90 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -141,7 +141,7 @@ class Entrepot extends CommonObject
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>301),
 		//'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000),
 		//'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
-		'statut' =>array('type'=>'tinyint(4)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>500),
+		'statut' =>array('type'=>'tinyint(4)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>500, 'css'=>'minwidth50'),
 	);
 
 	/**

From 93fdefcd3ecb6728109507842b7524fbb7b0a3aa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 19:52:33 +0100
Subject: [PATCH 019/300] css

---
 htdocs/ticket/css/styles.css.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/ticket/css/styles.css.php b/htdocs/ticket/css/styles.css.php
index fb2a58f6fe0..81d7d21748f 100644
--- a/htdocs/ticket/css/styles.css.php
+++ b/htdocs/ticket/css/styles.css.php
@@ -82,15 +82,15 @@ div.ticketform {
 	box-shadow: 2px 2px 2px rgb(245, 245, 245);
 	border-radius: 10px 10px 10px 10px;
 	margin: 1.5em;
-*/
 	background : #ffffff;
+*/
 	text-align: center;
 }
 
 div.ticketform .index_create, div.ticketform .index_display {
 	display: inline-block;
 	width: 200px;
-	height: 45px;
+	height: 60px;
 	text-align: center;
 	vertical-align: middle;
 	margin: 20px;

From ac3f9e3830e58c92c40c7bd9590aa0778fef3b91 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 20:42:46 +0100
Subject: [PATCH 020/300] Disable a public ajax page

---
 htdocs/admin/ticket_public.php              |  5 ++++-
 htdocs/core/class/html.formticket.class.php |  4 ++--
 htdocs/public/ticket/ajax/ajax.php          | 22 ++++++++++++++++++---
 htdocs/ticket/class/ticket.class.php        |  4 ++--
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 05938e27d49..a1bf95d819f 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -329,7 +329,9 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print '</td>';
 	print '</tr>';
 
-	// Create third-party with contact if email not linked to a contact
+	// Auto fill the contact found from email
+	// This option is a serious security hole. it allowe to any non looged perso, to get the database of contacts
+	/*
 	print '<tr class="oddeven"><td>'.$langs->trans("TicketCreateThirdPartyWithContactIfNotExist").'</td>';
 	print '<td class="left">';
 	if (empty(getDolGlobalInt('TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST'))) {
@@ -342,6 +344,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print $form->textwithpicto('', $langs->trans("TicketCreateThirdPartyWithContactIfNotExistHelp"), 1, 'help');
 	print '</td>';
 	print '</tr>';
+	*/
 
 	/*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 2e1773ddfa7..48c9dfe31a9 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -145,7 +145,7 @@ class FormTicket
 	 * @param  	int	 			$withdolfichehead		With dol_get_fiche_head() and dol_get_fiche_end()
 	 * @param	string			$mode					Mode ('create' or 'edit')
 	 * @param	int				$public					1=If we show the form for the public interface
-	 * @param	Contact|null	$with_contact			[=NULL] Contact to link to this ticket if exists
+	 * @param	Contact|null	$with_contact			[=NULL] Contact to link to this ticket if it exists
 	 * @param	string			$action					[=''] Action in card
 	 * @return 	void
 	 */
@@ -450,7 +450,7 @@ class FormTicket
 			if (count($cate_arbo)) {
 				// Categories
 				print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
-				print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 		}
diff --git a/htdocs/public/ticket/ajax/ajax.php b/htdocs/public/ticket/ajax/ajax.php
index 2b637ce3647..8ae653643b8 100644
--- a/htdocs/public/ticket/ajax/ajax.php
+++ b/htdocs/public/ticket/ajax/ajax.php
@@ -19,6 +19,9 @@
 /**
  *	\file       htdocs/public/ticket/ajax/ajax.php
  *	\brief      Ajax component for Ticket.
+ *
+ *  This ajax component is called only by the create ticket public page. And only if TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST is set.
+ *  This option TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST has been removed because it is a security hole.
  */
 
 if (!defined('NOTOKENRENEWAL')) {
@@ -54,6 +57,10 @@ $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $email = GETPOST('email', 'alphanohtml');
 
+if (empty($conf->global->TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST)) {
+	httponly_accessforbidden('Option TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST of module ticket is not enabled');
+}
+
 
 /*
  * View
@@ -71,9 +78,18 @@ if ($action == 'getContacts') {
 		require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 
 		$ticket = new Ticket($db);
-		$contacts = $ticket->searchContactByEmail($email);
-		if (is_array($contacts)) {
-			$return['contacts'] = $contacts;
+		$arrayofcontacts = $ticket->searchContactByEmail($email);
+		if (is_array($arrayofcontacts)) {
+			$arrayofminimalcontacts = array();
+			foreach ($arrayofcontacts as $tmpval) {
+				$tmpresult = new stdClass();
+				$tmpresult->id = $tmpval->id;
+				$tmpresult->firstname = $tmpval->firstname;
+				$tmpresult->lastname = $tmpval->lastname;
+				$arrayofminimalcontacts[] = $tmpresult;
+			}
+
+			$return['contacts'] = $arrayofminimalcontacts;
 		} else {
 			$return['error'] = $ticket->errorsToString();
 		}
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index f65b6f07a33..284f2ee63b8 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1872,10 +1872,10 @@ class Ticket extends CommonObject
 
 		$res = $this->db->query($sql);
 		if ($res) {
-			while ($rec = $this->db->fetch_array($res)) {
+			while ($rec = $this->db->fetch_object($res)) {
 				include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 				$contactstatic = new Contact($this->db);
-				$contactstatic->fetch($rec['rowid']);
+				$contactstatic->fetch($rec->rowid);
 				$contacts[] = $contactstatic;
 			}
 

From 1231604d146229329dd766453f30483d70b1bd29 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 20:45:15 +0100
Subject: [PATCH 021/300] Disable a public ajax page

---
 htdocs/public/stripe/ipn.php       | 2 +-
 htdocs/public/ticket/ajax/ajax.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index dd5b1db148f..0b4cbe9dd5b 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -73,7 +73,7 @@ if (isset($_GET['connect'])) {
 	}
 }
 
-if (empty($conf->stripe->enabled)) {
+if (!isModEnabled('stripe')) {
 	httponly_accessforbidden('Module Stripe not enabled');
 }
 
diff --git a/htdocs/public/ticket/ajax/ajax.php b/htdocs/public/ticket/ajax/ajax.php
index 8ae653643b8..19361320ced 100644
--- a/htdocs/public/ticket/ajax/ajax.php
+++ b/htdocs/public/ticket/ajax/ajax.php
@@ -57,6 +57,10 @@ $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $email = GETPOST('email', 'alphanohtml');
 
+if (!isModEnabled('ticket')) {
+	httponly_accessforbidden('Module Ticket not enabled');
+}
+
 if (empty($conf->global->TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST)) {
 	httponly_accessforbidden('Option TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST of module ticket is not enabled');
 }

From 07036453044f66811ad92b44f6c98284aecc9134 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 20:47:35 +0100
Subject: [PATCH 022/300] Fix missing protection on ajax public ticket page

---
 htdocs/public/ticket/ajax/ajax.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/public/ticket/ajax/ajax.php b/htdocs/public/ticket/ajax/ajax.php
index a75c796539c..0ddc6529996 100644
--- a/htdocs/public/ticket/ajax/ajax.php
+++ b/htdocs/public/ticket/ajax/ajax.php
@@ -57,6 +57,14 @@ $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $email = GETPOST('email', 'alphanohtml');
 
+if (!isModEnabled('ticket')) {
+	httponly_accessforbidden('Module Ticket not enabled');
+}
+
+if (empty($conf->global->TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST)) {
+	httponly_accessforbidden('Option TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST of module ticket is not enabled');
+}
+
 
 /*
  * View

From be82f51f68d738cce205f4ce5b469ef42ed82d9e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 20:50:26 +0100
Subject: [PATCH 023/300] Fix regression

---
 htdocs/public/ticket/ajax/ajax.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/ticket/ajax/ajax.php b/htdocs/public/ticket/ajax/ajax.php
index 0ddc6529996..e125b0122e7 100644
--- a/htdocs/public/ticket/ajax/ajax.php
+++ b/htdocs/public/ticket/ajax/ajax.php
@@ -57,12 +57,13 @@ $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $email = GETPOST('email', 'alphanohtml');
 
+
 if (!isModEnabled('ticket')) {
-	httponly_accessforbidden('Module Ticket not enabled');
+	accessforbidden('', 0, 0, 1);
 }
 
 if (empty($conf->global->TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST)) {
-	httponly_accessforbidden('Option TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST of module ticket is not enabled');
+	accessforbidden('', 0, 0, 1);
 }
 
 

From 4df225a8e4e52bee6d98b286565b94af7ab5cb82 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 20:51:26 +0100
Subject: [PATCH 024/300] Debug v17

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

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0093eda7d5e..6f85d0e6f3e 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11276,6 +11276,22 @@ function currentToken()
 	return isset($_SESSION['token']) ? $_SESSION['token'] : '';
 }
 
+/**
+ * Return a random string to be used as a nonce value for js
+ *
+ * @return  string
+ */
+function getNonce()
+{
+	global $conf;
+
+	if (empty($conf->cache['nonce'])) {
+		$conf->cache['nonce'] = dolGetRandomBytes(8);
+	}
+
+	return $conf->cache['nonce'];
+}
+
 /**
  * Start a table with headers and a optinal clickable number (don't forget to use "finishSimpleTable()" after the last table row)
  *

From aa9f6f562e6da436539ad91560e79495fc936f8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 21 Feb 2023 20:52:54 +0100
Subject: [PATCH 025/300] Merge branch '16.0' of
 git@github.com:Dolibarr/dolibarr.git into 17.0

---
 htdocs/public/ticket/ajax/ajax.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/htdocs/public/ticket/ajax/ajax.php b/htdocs/public/ticket/ajax/ajax.php
index 21fd13019e8..19361320ced 100644
--- a/htdocs/public/ticket/ajax/ajax.php
+++ b/htdocs/public/ticket/ajax/ajax.php
@@ -66,15 +66,6 @@ if (empty($conf->global->TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST)) {
 }
 
 
-if (!isModEnabled('ticket')) {
-	accessforbidden('', 0, 0, 1);
-}
-
-if (empty($conf->global->TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST)) {
-	accessforbidden('', 0, 0, 1);
-}
-
-
 /*
  * View
  */

From 6c3ddc15f29b2211f68d1cf420d6ef2f2991b7c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 00:54:13 +0100
Subject: [PATCH 026/300] Clean code

---
 htdocs/core/class/dolgraph.class.php | 2 +-
 htdocs/mrp/class/api_mos.class.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 6ef5b69ba3e..cfce9449f87 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1417,7 +1417,7 @@ class DolGraph
 
 					//var_dump($iinstack);
 					if ($iinstack) {
-						// Change color with offset of $$iinstack
+						// Change color with offset of $iinstack
 						//var_dump($newcolor);
 						if ($iinstack % 2) {	// We increase agressiveness of reference color for color 2, 4, 6, ...
 							$ratio = min(95, 10 + 10 * $iinstack); // step of 20
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index 794ab3d5378..b747e5eafce 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -366,7 +366,7 @@ class Mos extends DolibarrApi
 			$pos = 0;
 			$arrayofarrayname = array("arraytoconsume","arraytoproduce");
 			foreach ($arrayofarrayname as $arrayname) {
-				foreach ($$arrayname as $value) {
+				foreach ($arrayname as $value) {
 					$tmpproduct = new Product($this->db);
 					if (empty($value["objectid"])) {
 						throw new RestException(500, "Field objectid required in ".$arrayname);

From 00032ac970831f0cffa1e7189158ec1c60da8fc3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 01:35:15 +0100
Subject: [PATCH 027/300] Fix set a max length for UMR

---
 htdocs/compta/prelevement/class/bonprelevement.class.php | 5 ++++-
 htdocs/core/lib/functions.lib.php                        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 373615ecdfb..cc455c625bd 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1719,8 +1719,11 @@ class BonPrelevement extends CommonObject
 	public static function buildRumNumber($row_code_client, $row_datec, $row_drum)
 	{
 		global $langs;
+
 		$pre = substr(dol_string_nospecial(dol_string_unaccent($langs->transnoentitiesnoconv('RUM'))), 0, 3); // Must always be on 3 char ('RUM' or 'UMR'. This is a protection against bad translation)
-		return $pre.($row_code_client ? '-'.$row_code_client : '').'-'.$row_drum.'-'.date('U', $row_datec);
+
+		// 3 char + '-' + 12 + '-' + id + '-' + code 		Must be lower than 32.
+		return $pre.'-'.dol_print_date($row_datec, 'dayhourlogsmall').'-'.dol_trunc($row_drum.($row_code_client ? '-'.$row_code_client : ''), 15, 'right', 'UTF-8', 1);
 	}
 
 
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 6f85d0e6f3e..35436f9d2be 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2632,7 +2632,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		$format = '%Y%m%d%H%M%S';
 	} elseif ($format == 'dayhourlogsmall') {
 		// Format not sensitive to language
-		$format = '%Y%m%d%H%M';
+		$format = '%y%m%d%H%M';
 	} elseif ($format == 'dayhourldap') {
 		$format = '%Y%m%d%H%M%SZ';
 	} elseif ($format == 'dayhourxcard') {

From d705d71bf791470a4acfa39eb66b0adffa2aedfc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 01:39:12 +0100
Subject: [PATCH 028/300] Lower length

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

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index cc455c625bd..7bf8f87d0f0 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1723,7 +1723,7 @@ class BonPrelevement extends CommonObject
 		$pre = substr(dol_string_nospecial(dol_string_unaccent($langs->transnoentitiesnoconv('RUM'))), 0, 3); // Must always be on 3 char ('RUM' or 'UMR'. This is a protection against bad translation)
 
 		// 3 char + '-' + 12 + '-' + id + '-' + code 		Must be lower than 32.
-		return $pre.'-'.dol_print_date($row_datec, 'dayhourlogsmall').'-'.dol_trunc($row_drum.($row_code_client ? '-'.$row_code_client : ''), 15, 'right', 'UTF-8', 1);
+		return $pre.'-'.dol_print_date($row_datec, 'dayhourlogsmall').'-'.dol_trunc($row_drum.($row_code_client ? '-'.$row_code_client : ''), 13, 'right', 'UTF-8', 1);
 	}
 
 

From 7c316229db8060781ee50f4465b1133b5aeef156 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 02:21:48 +0100
Subject: [PATCH 029/300] Debug v17

---
 htdocs/public/ticket/create_ticket.php | 4 +---
 htdocs/public/ticket/index.php         | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 75111725df0..80ea664292b 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2013-2016    Jean-François FERRY <hello@librethic.io>
  * Copyright (C) 2016         Christophe Battarel <christophe@altairis.fr>
+ * Copyright (C) 2023         Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * 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,9 +27,6 @@
 if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }*/
-if (!defined('NOTOKENRENEWAL')) {
-	define('NOTOKENRENEWAL', '1');
-}
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 84652017b37..e4e46938122 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -86,7 +86,7 @@ print '<p style="text-align: center">'.(getDolGlobalString("TICKET_PUBLIC_TEXT_H
 print '<br>';
 
 print '<div class="ticketform">';
-print '<a href="create_ticket.php?action=create'.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15 fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
+print '<a href="'.DOL_URL_ROOT.'/public/ticket/create_ticket.php?action=create'.(!empty($entity) && isModEnabled('multicompany')?'&entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_create bigrounded"><span class="fa fa-15 fa-plus-circle valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("CreateTicket")).'</div></a>';
 print '<a href="list.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded"><span class="fa fa-15 fa-list-alt valignmiddle btnTitle-icon"></span><br>'.dol_escape_htmltag($langs->trans("ViewMyTicketList")).'</div></a>';
 print '<a href="view.php'.(!empty($entity) && isModEnabled('multicompany')?'?entity='.$entity:'').'" rel="nofollow noopener" class="butAction marginbottomonly"><div class="index_display bigrounded">'.img_picto('', 'ticket', 'class="fa-15"').'<br>'.dol_escape_htmltag($langs->trans("ShowTicketWithTrackId")).'</div></a>';
 print '<div style="clear:both;"></div>';

From dca143087bdcd9e8af8220ab10a27978da0b1b61 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 02:35:04 +0100
Subject: [PATCH 030/300] CSS

---
 htdocs/societe/paymentmodes.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index de2c45381cb..7714c02630e 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1116,14 +1116,14 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 								}
 								print '<a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe').' - Customer and Publishable key = '.$companypaymentmodetemp->stripe_account, 'globe').'</a> ';
 							}
-							print $companypaymentmodetemp->stripe_card_ref;
+							print dol_escape_htmltag($companypaymentmodetemp->stripe_card_ref);
 							print '</td>';
 							// Type
 							print '<td>';
 							print img_credit_card($companypaymentmodetemp->type);
 							print '</td>';
 							// Information (Owner, ...)
-							print '<td>';
+							print '<td class="minwidth100">';
 							if ($companypaymentmodetemp->proprio) {
 								print '<span class="opacitymedium">'.$companypaymentmodetemp->proprio.'</span><br>';
 							}
@@ -1133,7 +1133,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							if ($companypaymentmodetemp->exp_date_month || $companypaymentmodetemp->exp_date_year) {
 								print ' - '.sprintf("%02d", $companypaymentmodetemp->exp_date_month).'/'.$companypaymentmodetemp->exp_date_year.'';
 							}
-							print '</td><td>';
+							print '</td>';
+							// Country
+							print '<td class="tdoverflowmax100">';
 							if ($companypaymentmodetemp->country_code) {
 								$img = picto_from_langcode($companypaymentmodetemp->country_code);
 								print $img ? $img.' ' : '';
@@ -1152,12 +1154,13 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 								print img_picto($langs->trans("Default"), 'on');
 							}
 							print '</td>';
-							print '<td>';
 							if (empty($companypaymentmodetemp->stripe_card_ref)) {
-								print $langs->trans("Local");
+								$s = $langs->trans("Local");
 							} else {
-								print $langs->trans("LocalAndRemote");
+								$s = $langs->trans("LocalAndRemote");
 							}
+							print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
+							print $s;
 							print '</td>';
 							print '<td>';
 							print dol_print_date($companypaymentmodetemp->tms, 'dayhour');
@@ -1167,7 +1170,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 							print $hookmanager->resPrint;
 							// Action column
-							print '<td class="right nowraponall">';
+							print '<td class="right minwidth50 nowraponall">';
 							if ($permissiontoaddupdatepaymentinformation) {
 								if ($stripecu && empty($companypaymentmodetemp->stripe_card_ref)) {
 									print '<a href="'.$_SERVER['PHP_SELF'].'?action=synccardtostripe&socid='.$object->id.'&id='.$companypaymentmodetemp->id.'" class="paddingrightonly marginrightonly">'.$langs->trans("CreateCardOnStripe").'</a>';
@@ -1452,7 +1455,6 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			// Bank name
 			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($rib->bank).'">'.dol_escape_htmltag($rib->bank).'</td>';
 			// Account number
-			print '<td>';
 			$string = '';
 			foreach ($rib->getFieldsToShow() as $val) {
 				if ($val == 'BankCode') {
@@ -1478,7 +1480,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					$string .= ' '.img_picto($langs->trans("ValueIsValid"), 'info');
 				}
 			}
-
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($string).'">';
 			print $string;
 			print '</td>';
 			// IBAN

From cf323002af71f09195ac783af058e7ee750fa5d7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 03:40:39 +0100
Subject: [PATCH 031/300] css

---
 htdocs/core/customreports.php    | 2 +-
 htdocs/theme/eldy/global.inc.php | 6 +++---
 htdocs/theme/md/style.css.php    | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 7a1f68e5c6c..17ed8fcefe6 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -420,7 +420,7 @@ $viewmode = '';
 $viewmode .= '<div class="divadvancedsearchfield">';
 $arrayofgraphs = array('bars' => 'Bars', 'lines' => 'Lines'); // also 'pies'
 $viewmode .= '<div class="inline-block opacitymedium"><span class="fas fa-chart-area paddingright" title="'.$langs->trans("Graph").'"></span>'.$langs->trans("Graph").'</div> ';
-$viewmode .= $form->selectarray('search_graph', $arrayofgraphs, $search_graph, 0, 0, 0, 'minwidth100', 1);
+$viewmode .= $form->selectarray('search_graph', $arrayofgraphs, $search_graph, 0, 0, 0, '', 1, 0, 0, '', 'graphtype width100');
 $viewmode .= '</div>';
 
 $num = 0;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fc718c21509..1750cf00c7f 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -6566,11 +6566,11 @@ select.multiselectononeline {
 @media only screen and (min-width: 767px)
 {
 	/* CSS to have the dropdown boxes larger that the input search area */
-	.select2-container.select2-container--open .select2-dropdown.ui-dialog {
+	.select2-container.select2-container--open:not(.graphtype) .select2-dropdown.ui-dialog {
 		min-width: 220px !important;
 	}
-	.select2-container.select2-container--open .select2-dropdown--below:not(.onrightofpage),
-	.select2-container.select2-container--open .select2-dropdown--above:not(.onrightofpage) {
+	.select2-container.select2-container--open:not(.graphtype) .select2-dropdown--below:not(.onrightofpage),
+	.select2-container.select2-container--open:not(.graphtype) .select2-dropdown--above:not(.onrightofpage) {
 		min-width: 220px !important;
 	}
 	.onrightofpage span.select2-dropdown.ui-dialog.select2-dropdown--below,
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 509986d1e61..24078c3ca8f 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -6462,12 +6462,11 @@ select.multiselectononeline {
 @media only screen and (min-width: 767px)
 {
 	/* CSS to have the dropdown boxes larger that the input search area */
-	.select2-container.select2-container--open .select2-dropdown.ui-dialog {
+	.select2-container.select2-container--open:not(.graphtype) .select2-dropdown.ui-dialog {
 		min-width: 220px !important;
 	}
-	
-	.select2-container.select2-container--open .select2-dropdown--below:not(.onrightofpage),
-	.select2-container.select2-container--open .select2-dropdown--above:not(.onrightofpage) {
+	.select2-container.select2-container--open:not(.graphtype) .select2-dropdown--below:not(.onrightofpage),
+	.select2-container.select2-container--open:not(.graphtype) .select2-dropdown--above:not(.onrightofpage) {
 		min-width: 220px !important;
 	}
 	.onrightofpage span.select2-dropdown.ui-dialog.select2-dropdown--below,

From 1555e0242b64ada57d1573fa8343fce1a2093d41 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 22 Feb 2023 10:28:30 +0100
Subject: [PATCH 032/300] FIX label dictionary is used by barcode and member
 module

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index ed5e4c06b3d..e6af95d77cb 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -512,7 +512,7 @@ $tabcond[25] = !empty($conf->website->enabled);
 $tabcond[27] = !empty($conf->societe->enabled);
 $tabcond[28] = !empty($conf->holiday->enabled);
 $tabcond[29] = !empty($conf->project->enabled);
-$tabcond[30] = !empty($conf->label->enabled);
+$tabcond[30] = (isModEnabled('barcode') || isModEnabled('adherent'));
 //$tabcond[31]= !empty($conf->accounting->enabled);
 $tabcond[32] = (!empty($conf->holiday->enabled) || !empty($conf->hrm->enabled));
 $tabcond[33] = !empty($conf->hrm->enabled);

From 646c1b15022afe398d3b2fcf6f7f61f57b1b1cf0 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Wed, 22 Feb 2023 10:39:19 +0100
Subject: [PATCH 033/300] remove $db

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

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index bbfc694d414..b9d1fd7c54a 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -106,7 +106,7 @@ class BonPrelevement extends CommonObject
 	 */
 	public function __construct($db)
 	{
-		global $conf, $langs, $db;
+		global $conf, $langs;
 
 		$this->db = $db;
 

From 08bcd4af319548bcd874c4e12339e3aa54f5541d Mon Sep 17 00:00:00 2001
From: Quentin VIAL-GOUTEYRON <quentin.vial-gouteyron@atm-consulting.fr>
Date: Wed, 22 Feb 2023 12:19:36 +0100
Subject: [PATCH 034/300] FIX : mandatory date for service didnt work for
 invoice

---
 htdocs/core/tpl/objectline_view.tpl.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index c4ddc7d0c4c..7489d99a765 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -182,10 +182,11 @@ if (($line->info_bits & 2) == 2) {
 		if ($line->date_start || $line->date_end) {
 			print '<div class="clearboth nowraponall opacitymedium daterangeofline">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
 		}
+
 		if (!$line->date_start || !$line->date_end) {
 			// show warning under line
 			// we need to fetch product associated to line for some test
-			if ($object->element == 'propal'  || $object->element == 'order' || $object->element == 'propal_supplier' || $object->element == 'supplier_proposal' || $object->element == 'commande') {
+			if ($object->element == 'propal' || $object->element == 'order' || $object->element == 'facture' || $object->element == 'propal_supplier' || $object->element == 'supplier_proposal' || $object->element == 'commande') {
 				$res = $line->fetch_product();
 				if ($res  > 0  ) {
 					if ($line->product->isService() && $line->product->isMandatoryPeriod()) {

From 087af4f300c417b9f6b1777b8f606fef4d3439d8 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Wed, 22 Feb 2023 12:26:56 +0100
Subject: [PATCH 035/300] FIX: banner: status was not displayed if status field
 is not called 'status' + error if getLibStatut method not implemented

---
 htdocs/core/lib/functions.lib.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 35436f9d2be..d503026a868 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2308,14 +2308,12 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		}
 		$tmptxt = $object->getLibStatut(5);
 		$morehtmlstatus .= $tmptxt; // No status on task
-	} else { // Generic case
-		if (isset($object->status)) {
-			$tmptxt = $object->getLibStatut(6);
-			if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
-				$tmptxt = $object->getLibStatut(5);
-			}
-			$morehtmlstatus .= $tmptxt;
+	} elseif (method_exists($object, 'getLibStatut')) { // Generic case
+		$tmptxt = $object->getLibStatut(6);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
+			$tmptxt = $object->getLibStatut(5);
 		}
+		$morehtmlstatus .= $tmptxt;
 	}
 
 	// Add if object was dispatched "into accountancy"

From 7260dcb7399083be911a98efcd6374a83775ef81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 13:50:04 +0100
Subject: [PATCH 036/300] Fix edit

---
 htdocs/admin/const.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 895ce8c1b08..51de87d054e 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -64,9 +64,9 @@ if ($action == 'add' && GETPOST('update')) {	// Click on button update must be u
 if ($action == 'add' && GETPOST('delete')) {	// Click on button update must be used in priority before param $action
 	$action = 'delete';
 }
-if ($action == 'update' && GETPOST('add')) {	// Click on button add must be used in priority before param $action
+/*if ($action == 'update' && GETPOST('add')) {	// 'add' button is always clicked as it is the first in form.
 	$action = 'add';
-}
+}*/
 if ($action == 'delete' && GETPOST('add')) {	// Click on button add must be used in priority before param $action
 	$action = 'add';
 }
@@ -234,7 +234,7 @@ if (isModEnabled('multicompany') && !$user->entity) {
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="' . $conf->entity . '">';
 }
-print '<input type="submit" class="button button-add small" name="add" value="'.$langs->trans("Add").'">';
+print '<input type="submit" class="button button-add small" id="add" name="add" value="'.$langs->trans("Add").'">';
 print "</td>\n";
 print '</tr>';
 

From f1a7b5b0b4766b2b33ada22ff2ead165bbef1868 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 13:53:46 +0100
Subject: [PATCH 037/300] Update dict.php

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index e6af95d77cb..774ade233bd 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -512,7 +512,7 @@ $tabcond[25] = !empty($conf->website->enabled);
 $tabcond[27] = !empty($conf->societe->enabled);
 $tabcond[28] = !empty($conf->holiday->enabled);
 $tabcond[29] = !empty($conf->project->enabled);
-$tabcond[30] = (isModEnabled('barcode') || isModEnabled('adherent'));
+$tabcond[30] = (isModEnabled('label') || isModEnabled('barcode') || isModEnabled('adherent'));	// stickers format dictionary
 //$tabcond[31]= !empty($conf->accounting->enabled);
 $tabcond[32] = (!empty($conf->holiday->enabled) || !empty($conf->hrm->enabled));
 $tabcond[33] = !empty($conf->hrm->enabled);

From e7546e6da1baf5f71f5f31845ff64048c53e0d74 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 14:29:36 +0100
Subject: [PATCH 038/300] FIX #23804

---
 htdocs/core/class/html.formticket.class.php | 1 +
 htdocs/ticket/card.php                      | 3 ++-
 htdocs/ticket/class/ticket.class.php        | 7 ++++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index cd6b9ecd7fc..6b54ee86c33 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -164,6 +164,7 @@ class FormTicket
 		print '<form method="POST" '.($withdolfichehead ? '' : 'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="'.$this->action.'">';
+		print '<input type="hidden" name="trackid" value="'.$this->trackid.'">';
 		foreach ($this->param as $key => $value) {
 			print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 		}
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 1b3dd4c8e37..334dcdf6aa4 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -266,7 +266,7 @@ if (empty($reshook)) {
 
 			if (!$error) {
 				// File transfer
-				$object->copyFilesForTicket();
+				$object->copyFilesForTicket('');		// trackid is forced to '' because files were uploaded when no id for ticket exists yet and trackid was ''
 			}
 
 			if (!$error) {
@@ -689,6 +689,7 @@ if ($action == 'create' || $action == 'presend') {
 
 	print load_fiche_titre($langs->trans('NewTicket'), '', 'ticket');
 
+	$formticket->trackid = '';		// TODO Use a unique key to avoid conflict in upload file feature
 	$formticket->withfromsocid = $socid ? $socid : $user->socid;
 	$formticket->withfromcontactid = $contactid ? $contactid : '';
 	$formticket->withtitletopic = 1;
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 122c5ae35ab..7e3d17dc32d 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2437,9 +2437,10 @@ class Ticket extends CommonObject
 	 * Used for files linked into messages.
 	 * Files may be renamed during copy to avoid overwriting existing files.
 	 *
-	 * @return	array		Array with final path/name/mime of files.
+	 * @param	string	$forcetrackid	Force trackid
+	 * @return	array					Array with final path/name/mime of files.
 	 */
-	public function copyFilesForTicket()
+	public function copyFilesForTicket($forcetrackid = null)
 	{
 		global $conf;
 
@@ -2454,7 +2455,7 @@ class Ticket extends CommonObject
 		$maxheightmini = 72;
 
 		$formmail = new FormMail($this->db);
-		$formmail->trackid = 'tic'.$this->id;
+		$formmail->trackid = (is_null($forcetrackid) ? 'tic'.$this->id : '');
 		$attachedfiles = $formmail->get_attached_files();
 
 		$filepath = $attachedfiles['paths'];

From be2ee21462f9e0cc545f5af4431e115afdcc4792 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Wed, 22 Feb 2023 15:09:37 +0100
Subject: [PATCH 039/300] creation of prelevement_bon only for 1 demande

---
 .../prelevement/class/bonprelevement.class.php |  7 +++++--
 htdocs/core/class/commoninvoice.class.php      | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index b9d1fd7c54a..7e183f7795d 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -747,9 +747,10 @@ class BonPrelevement extends CommonObject
 	 *  @param  string  $executiondate	Date to execute the transfer
 	 *  @param	int	    $notrigger		Disable triggers
 	 *  @param	string	$type			'direct-debit' or 'bank-transfer'
+	 *  @param	int		$did			ID of payment request
 	 *	@return	int						<0 if KO, No of invoice included into file if OK
 	 */
-	public function create($banque = 0, $agence = 0, $mode = 'real', $format = 'ALL', $executiondate = '', $notrigger = 0, $type = 'direct-debit')
+	public function create($banque = 0, $agence = 0, $mode = 'real', $format = 'ALL', $executiondate = '', $notrigger = 0, $type = 'direct-debit', $did = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs, $user;
@@ -811,7 +812,9 @@ class BonPrelevement extends CommonObject
 			$sql .= " AND pfd.traite = 0";
 			$sql .= " AND f.total_ttc > 0";
 			$sql .= " AND pfd.ext_payment_id IS NULL";
-
+			if ($did > 0) {
+				$sql .= " AND pfd.rowid = '".$this->db->escape($did)."'";
+			}
 			dol_syslog(__METHOD__."::Read invoices,", LOG_DEBUG);
 
 			$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 41d76310779..55824f118aa 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -1442,8 +1442,8 @@ abstract class CommonInvoice extends CommonObject
 					}
 
 					// TODO Create a prelevement_bon and set its status to sent instead of this
-					$bon = new BonPrelevement($db);
-					$nbinvoices = $bon->create();
+					$bon = new BonPrelevement($this->db);
+					$nbinvoices = $bon->create(0, 0, 'real', 'ALL', '', 0, 'direct-debit', $did);
 					if ($nbinvoices <= 0) {
 						$error++;
 						$errorforinvoice++;
@@ -1451,12 +1451,14 @@ abstract class CommonInvoice extends CommonObject
 						$this->errors[] = "Error on BonPrelevement creation";
 					}
 
-					$result = $bon->set_infotrans($user, $now, 'internet');
-					if ($result < 0) {
-						$error++;
-						$errorforinvoice++;
-						dol_syslog("Error on BonPrelevement creation", LOG_ERR);
-						$this->errors[] = "Error on BonPrelevement creation";
+					if (!$errorforinvoice) {
+						$result = $bon->set_infotrans($user, $now, 'internet');
+						if ($result < 0) {
+							$error++;
+							$errorforinvoice++;
+							dol_syslog("Error on BonPrelevement creation", LOG_ERR);
+							$this->errors[] = "Error on BonPrelevement creation";
+						}
 					}
 
 					if (!$errorforinvoice) {

From a03a708b847fecbf3ac16c74f9d9b6e900b0a030 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Wed, 22 Feb 2023 15:15:58 +0100
Subject: [PATCH 040/300] FIX : llxHeader() must be after header location of
 MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE

---
 htdocs/comm/propal/list.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ad7b704dea6..386ed4fc134 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -550,10 +550,6 @@ $formcompany = new FormCompany($db);
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-$title = $langs->trans('ListOfProposals');
-$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
-llxHeader('', $title, $help_url);
-
 $sql = 'SELECT';
 if ($sall || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
@@ -857,6 +853,9 @@ if ($resql) {
 		exit;
 	}
 
+	$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
+	llxHeader('', $langs->trans('ListOfProposals'), $help_url);
+
 	$param = '&search_status='.urlencode($search_status);
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);

From fb4e3ec123bbf8d7b9b5be21ee4aa32387d08d21 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 15:46:20 +0100
Subject: [PATCH 041/300] Debug v17

---
 htdocs/admin/dict.php                         |  3 +-
 htdocs/core/ajax/fetchKnowledgeRecord.php     | 14 ++++--
 htdocs/core/class/html.formticket.class.php   | 47 +++++++++++--------
 ...terface_50_modTicket_TicketEmail.class.php |  4 +-
 htdocs/langs/en_US/ticket.lang                |  2 +-
 htdocs/theme/eldy/global.inc.php              |  2 +-
 htdocs/theme/md/style.css.php                 |  2 +-
 htdocs/ticket/card.php                        |  3 +-
 8 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 0a812f5d6e2..224d321a0cf 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1571,7 +1571,6 @@ if ($id > 0) {
 			unset($fieldlist[2]); // Remove field ??? if dictionary Regions
 		}
 
-
 		if (empty($reshook)) {
 			fieldList($fieldlist, $obj, $tabname[$id], 'add');
 		}
@@ -2531,7 +2530,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 				$classtd = 'right'; $class = 'maxwidth50 right';
 			}
 			if (in_array($fieldlist[$field], array('pos', 'position'))) {
-				$classtd = 'center'; $class = 'maxwidth50 center';
+				$classtd = 'right'; $class = 'maxwidth50 right';
 			}
 			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'use_default', 'affect', 'delay', 'public', 'sortorder', 'sens', 'category_type', 'fk_parent'))) {
 				$class = 'maxwidth50 center';
diff --git a/htdocs/core/ajax/fetchKnowledgeRecord.php b/htdocs/core/ajax/fetchKnowledgeRecord.php
index 1816217cdef..61ed0f6f98e 100644
--- a/htdocs/core/ajax/fetchKnowledgeRecord.php
+++ b/htdocs/core/ajax/fetchKnowledgeRecord.php
@@ -36,8 +36,10 @@ if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
 // If there is no need to load and show top and left menu
-if (!defined("NOLOGIN")) {
-	define("NOLOGIN", '1');
+if (!empty($_GET['public'])) {
+	if (!defined("NOLOGIN")) {
+		define("NOLOGIN", '1');
+	}
 }
 if (!defined('NOIPCHECK')) {
 	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
@@ -52,6 +54,7 @@ $idticketgroup = GETPOST('idticketgroup', 'aZ09');
 $idticketgroup = GETPOST('idticketgroup', 'aZ09');
 $lang = GETPOST('lang', 'aZ09');
 
+
 /*
  * Actions
  */
@@ -71,8 +74,13 @@ if ($action == "getKnowledgeRecord") {
 	$sql .= " FROM ".MAIN_DB_PREFIX."knowledgemanagement_knowledgerecord as kr ";
 	$sql .= " JOIN ".MAIN_DB_PREFIX."c_ticket_category as ctc ON ctc.rowid = kr.fk_c_ticket_category";
 	$sql .= " WHERE ctc.code = '".$db->escape($idticketgroup)."'";
-	$sql .= " AND ctc.active = 1 AND ctc.public = 1 AND (kr.lang = '".$db->escape($lang)."' OR kr.lang = 0 OR kr.lang IS NULL)";
+	$sql .= " AND ctc.active = 1";
+	if (defined("NOLOGIN")) {
+		$sql .= " AND ctc.public = 1";
+	}
+	$sql .= " AND (kr.lang = '".$db->escape($lang)."' OR kr.lang = 0 OR kr.lang IS NULL)";
 	$sql .= " AND kr.status = 1 AND (kr.answer IS NOT NULL AND kr.answer <> '')";
+
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index fd83d4fbd45..4f3ae4bc5e6 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -340,26 +340,9 @@ class FormTicket
 		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 1);
 		print '</td></tr>';
 
-		// Subject
-		if ($this->withtitletopic) {
-			print '<tr><td><label for="subject"><span class="fieldrequired">'.$langs->trans("Subject").'</span></label></td><td>';
-			// Answer to a ticket : display of the thread title in readonly
-			if ($this->withtopicreadonly) {
-				print $langs->trans('SubjectAnswerToTicket').' '.$this->topic_title;
-			} else {
-				if (isset($this->withreadid) && $this->withreadid > 0) {
-					$subject = $langs->trans('SubjectAnswerToTicket').' '.$this->withreadid.' : '.$this->topic_title.'';
-				} else {
-					$subject = GETPOST('subject', 'alpha');
-				}
-				print '<input class="text minwidth500" id="subject" name="subject" value="'.$subject.'" autofocus />';
-			}
-			print '</td></tr>';
-		}
-
 		if (!empty($conf->knowledgemanagement->enabled)) {
 			// KM Articles
-			print '<tr id="KWwithajax"></tr>';
+			print '<tr id="KWwithajax" class="hidden"><td></td></tr>';
 			print '<!-- Script to manage change of ticket group -->
 			<script>
 			jQuery(document).ready(function() {
@@ -372,12 +355,17 @@ class FormTicket
 
 					if (idgroupticket != "") {
 						$.ajax({ url: \''.DOL_URL_ROOT.'/core/ajax/fetchKnowledgeRecord.php\',
-							 data: { action: \'getKnowledgeRecord\', idticketgroup: idgroupticket, token: \''.newToken().'\', lang:\''.$langs->defaultlang.'\'},
+							 data: { action: \'getKnowledgeRecord\', idticketgroup: idgroupticket, token: \''.newToken().'\', lang:\''.$langs->defaultlang.'\', public:'.($public).' },
 							 type: \'GET\',
 							 success: function(response) {
 								var urllist = \'\';
 								console.log("We received response "+response);
-								response = JSON.parse(response)
+								if (typeof response == "object") {
+									console.log("response is already type object, no need to parse it");
+								} else {
+									console.log("response is type "+(typeof response));
+									response = JSON.parse(response);
+								}
 								for (key in response) {
 									answer = response[key].answer;
 									urllist += \'<li><a href="#" title="\'+response[key].title+\'" class="button_KMpopup" data-html="\'+answer+\'">\' +response[key].title+\'</a></li>\';
@@ -414,6 +402,23 @@ class FormTicket
 			</script>'."\n";
 		}
 
+		// Subject
+		if ($this->withtitletopic) {
+			print '<tr><td><label for="subject"><span class="fieldrequired">'.$langs->trans("Subject").'</span></label></td><td>';
+			// Answer to a ticket : display of the thread title in readonly
+			if ($this->withtopicreadonly) {
+				print $langs->trans('SubjectAnswerToTicket').' '.$this->topic_title;
+			} else {
+				if (isset($this->withreadid) && $this->withreadid > 0) {
+					$subject = $langs->trans('SubjectAnswerToTicket').' '.$this->withreadid.' : '.$this->topic_title.'';
+				} else {
+					$subject = GETPOST('subject', 'alpha');
+				}
+				print '<input class="text minwidth500" id="subject" name="subject" value="'.$subject.'"'.(empty($this->withemail)?' autofocus':'').' />';
+			}
+			print '</td></tr>';
+		}
+
 		// MESSAGE
 		$msg = GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : '';
 		print '<tr><td><label for="message"><span class="fieldrequired">'.$langs->trans("Message").'</span></label></td><td>';
@@ -846,6 +851,8 @@ class FormTicket
 						print ' selected="selected"';
 					} elseif ($arraycategories['use_default'] == "1" && !$selected && !$empty) {
 						print ' selected="selected"';
+					} elseif (count($ticketstat->cache_category_tickets) == 1) {
+						print ' selected="selected"';
 					}
 
 					print '>';
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 089629234d6..99b8210644c 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -274,7 +274,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		$message_admin = $langs->transnoentities($body, $object->track_id).'<br>';
 		$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
 		$message_admin .= '<li>'.$langs->trans('Type').' : '.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code).'</li>';
-		$message_admin .= '<li>'.$langs->trans('Category').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
+		$message_admin .= '<li>'.$langs->trans('TicketCategory').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
 		$message_admin .= '<li>'.$langs->trans('Severity').' : '.$langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code).'</li>';
 		$message_admin .= '<li>'.$langs->trans('From').' : '.($object->email_from ? $object->email_from : ($object->fk_user_create > 0 ? $langs->trans('Internal') : '')).'</li>';
 		// Extrafields
@@ -343,7 +343,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		$message_customer = $langs->transnoentities($body, $object->track_id).'<br>';
 		$message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
 		$message_customer .= '<li>'.$langs->trans('Type').' : '.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code).'</li>';
-		$message_customer .= '<li>'.$langs->trans('Category').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
+		$message_customer .= '<li>'.$langs->trans('TicketCategory').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
 		$message_customer .= '<li>'.$langs->trans('Severity').' : '.$langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code).'</li>';
 
 		// Extrafields
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index ea560012afc..7cb36b3bd0c 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -183,7 +183,7 @@ CreatedBy=Created by
 NewTicket=New Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Ticket categorization
+TicketCategory=Ticket group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index aca2828da3b..5c99c56c1d0 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5215,7 +5215,7 @@ div.visible {
 	display: block;
 }
 
-div.hidden, header.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
+div.hidden, header.hidden, tr.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
 	display: none;
 }
 .unvisible {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 7a0f9749be8..93b501885fe 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -5211,7 +5211,7 @@ div.visible {
 	display: block;
 }
 
-div.hidden, header.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
+div.hidden, header.hidden, tr.hidden, td.hidden, img.hidden, span.hidden, div.showifmore {
 	display: none;
 }
 
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 7cbb23c75c4..d46a787f983 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -726,7 +726,7 @@ if ($action == 'create' || $action == 'presend') {
 
 	print load_fiche_titre($langs->trans('NewTicket'), '', 'ticket');
 
-	$formticket->trackid = '';		// TODO Use a unique key to avoid conflict in upload file feature
+	$formticket->trackid = '';		// TODO Use a unique key 'tic' to avoid conflict in upload file feature
 	$formticket->withfromsocid = $socid ? $socid : $user->socid;
 	$formticket->withfromcontactid = $contactid ? $contactid : '';
 	$formticket->withtitletopic = 1;
@@ -737,7 +737,6 @@ if ($action == 'create' || $action == 'presend') {
 	$formticket->withfile = 2;
 	$formticket->withextrafields = 1;
 	$formticket->param = array('origin' => GETPOST('origin'), 'originid' => GETPOST('originid'));
-	$formticket->trackid = 'tic'.$object->id;
 
 	$formticket->withcancel = 1;
 

From 5713ca8a4329907f9b8a35d2673a4a28bacb81c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 16:01:48 +0100
Subject: [PATCH 042/300] Regression

---
 htdocs/comm/propal/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 386ed4fc134..f361c0d7028 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -854,7 +854,7 @@ if ($resql) {
 	}
 
 	$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
-	llxHeader('', $langs->trans('ListOfProposals'), $help_url);
+	llxHeader('', $title, $help_url);
 
 	$param = '&search_status='.urlencode($search_status);
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {

From 04a6a0a0435e8273baf2195fb086007c6dc9fd2f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 16:27:10 +0100
Subject: [PATCH 043/300] Fix qodana

---
 .../canvas/actions_contactcard_common.class.php  |  6 ++++--
 htdocs/core/class/validate.class.php             | 16 ++++++++--------
 .../societe/canvas/actions_card_common.class.php |  2 ++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 4a3fc28c9de..7e73d264480 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -74,8 +74,10 @@ abstract class ActionsContactCardCommon
 		if (!empty($id)) {
 			$object->fetch($id);
 		}
-			$this->object = $object;
-		//}
+
+		$this->object = $object;
+
+		return $object;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/core/class/validate.class.php b/htdocs/core/class/validate.class.php
index 31cf6300aff..37bb37aec4f 100644
--- a/htdocs/core/class/validate.class.php
+++ b/htdocs/core/class/validate.class.php
@@ -27,7 +27,6 @@
  */
 class Validate
 {
-
 	/**
 	 * @var DoliDb		Database handler (result of a new DoliDB)
 	 */
@@ -62,7 +61,7 @@ class Validate
 		}
 
 		if (!is_object($this->outputLang) || !method_exists($this->outputLang, 'load')) {
-			return false;
+			return;
 		}
 
 		$this->outputLang->loadLangs(array('validate', 'errors'));
@@ -72,7 +71,8 @@ class Validate
 
 	/**
 	 * Use to clear errors msg or other ghost vars
-	 * @return null
+	 *
+	 * @return 	void
 	 */
 	protected function clear()
 	{
@@ -82,8 +82,8 @@ class Validate
 	/**
 	 * Use to clear errors msg or other ghost vars
 	 *
-	 * @param string $errMsg your error message
-	 * @return null
+	 * @param 	string $errMsg your error message
+	 * @return 	void
 	 */
 	protected function setError($errMsg)
 	{
@@ -93,9 +93,9 @@ class Validate
 	/**
 	 * Check for e-mail validity
 	 *
-	 * @param string $email e-mail address to validate
-	 * @param int   $maxLength string max length
-	 * @return boolean Validity is ok or not
+	 * @param 	string 	$email 		e-mail address to validate
+	 * @param 	int   	$maxLength 	string max length
+	 * @return 	boolean 			Validity is ok or not
 	 */
 	public function isEmail($email, $maxLength = false)
 	{
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index fc8794aa1a8..a2b320e50db 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -70,6 +70,8 @@ abstract class ActionsCardCommon
 			$object->fetch($id, $ref);
 		}
 		$this->object = $object;
+
+		return $object;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

From 837f89c19fc0872e66ce7d1e685bc20cdc263c72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 17:17:34 +0100
Subject: [PATCH 044/300] Fix warning

---
 htdocs/core/class/smtps.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 135d9d9e8de..46193e1efea 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1862,6 +1862,7 @@ class SMTPs
 		} elseif ($type == 'alternative') {
 			return $this->_smtpsAlternativeBoundary;
 		}
+		return '';
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps

From 53014290cfe115b872d3fd9eaa1f3fd98d8b3ea4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 17:18:42 +0100
Subject: [PATCH 045/300] Fix unbind

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

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 3dc45c753bc..68464524621 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -401,7 +401,7 @@ class Ldap
 	public function unbind()
 	{
 		$this->result = true;
-		if ($this->connection) {
+		if (is_resource($this->connection) || is_object($this->connection)) {
 			$this->result = @ldap_unbind($this->connection);
 		}
 		if ($this->result) {

From f6f420d19aebe61c78ae8cc2dfbae10b882c530d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 22 Feb 2023 17:26:22 +0100
Subject: [PATCH 046/300] Doc

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

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 68464524621..b3d5766daff 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -339,7 +339,7 @@ class Ldap
 	 * This method seems a duplicate/alias of unbind().
 	 *
 	 * @return	boolean			true or false
-	 * @deprecated ldap_close is an alias of ldap_unbind
+	 * @deprecated ldap_close is an alias of ldap_unbind, so use unbind() instead.
 	 * @see unbind()
 	 */
 	public function close()

From f7348d21d366ebf579bc52f533aa0113abb39b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 20:20:04 +0100
Subject: [PATCH 047/300] doc

---
 htdocs/core/menus/standard/eldy_menu.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 596e1e4cc3f..de33b209383 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -36,6 +36,11 @@ class MenuManager
 	public $atarget = ""; // To store default target to use onto links
 	public $name = "eldy";
 
+	/**
+	 * @var Menu
+	 */
+	public $menu;
+
 	public $menu_array;
 	public $menu_array_after;
 

From 873a0266eef558b32e8018d50fd576aeead936f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 20:20:53 +0100
Subject: [PATCH 048/300] Update auguria_menu.php

---
 htdocs/core/menus/standard/auguria_menu.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index ae40ec170fc..168effd964d 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -37,6 +37,11 @@ class MenuManager
 	public $atarget = ""; // To store default target to use onto links
 	public $name = "auguria";
 
+	/**
+	 * @var Menu
+	 */
+	public $menu;
+
 	public $menu_array;
 	public $menu_array_after;
 

From 53d89bb068a40d25e32b78fdf350dbfb3b05d282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 20:24:40 +0100
Subject: [PATCH 049/300] Update menubase.class.php

---
 htdocs/core/class/menubase.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 9544e11e075..3630d137136 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -152,6 +152,10 @@ class Menubase
 	 */
 	public $tms;
 
+	/**
+	 * @var Menu menu
+	 */
+	public $newmenu;
 
 	/**
 	 *  Constructor

From fc8ae34dd34f34286b84d3dfe06996f7f4b52d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 20:32:13 +0100
Subject: [PATCH 050/300] Update conf.class.php

---
 htdocs/core/class/conf.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 12457a41339..2b3ddba9881 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -79,6 +79,10 @@ class Conf
 	// An array to store cache results ->cache['nameofcache']=...
 	public $cache;
 
+	/**
+	 * @var int To tell header was output
+	 */
+	public $headerdone;
 
 	/**
 	 * @var string[]

From a20c511ee934d5996f603016e36d850933e58c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 20:58:55 +0100
Subject: [PATCH 051/300] doc

---
 htdocs/datapolicy/class/datapolicycron.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index fb76767bf1e..7383d303a7c 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2018       Nicolas ZABOURI     <info@inovea-conseil.com>
- * Copyright (C) 2018-2020  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023  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
@@ -27,6 +27,11 @@
  */
 class DataPolicyCron
 {
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
+
 	/**
 	 *	Constructor
 	 *

From f1bcaf60850c006c51ad9dbb43482d13357c9aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 21:16:16 +0100
Subject: [PATCH 052/300] doc

---
 htdocs/don/class/paymentdonation.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 657a1d32d1a..1aceca10c16 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -92,6 +92,10 @@ class PaymentDonation extends CommonObject
 
 	public $type_code;
 	public $type_label;
+	public $chid;
+	public $datepaid;
+	public $bank_account;
+	public $bank_line;
 
 	/**
 	 * @var string Id of external payment mode

From 66a56a36e40c1ae827109af227462edcb7c54831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 21:19:55 +0100
Subject: [PATCH 053/300] Update commonsocialnetworks.class.php

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

diff --git a/htdocs/core/class/commonsocialnetworks.class.php b/htdocs/core/class/commonsocialnetworks.class.php
index 04dc17e26f0..19928eb1dbb 100644
--- a/htdocs/core/class/commonsocialnetworks.class.php
+++ b/htdocs/core/class/commonsocialnetworks.class.php
@@ -16,9 +16,9 @@
  */
 
 /**
- *       \file       htdocs/core/class/commonincoterm.class.php
+ *       \file       htdocs/core/class/commonsocialnetworks.class.php
  *       \ingroup    core
- *       \brief      File of the superclass of object classes that support incoterm (customer and supplier)
+ *       \brief      File of the superclass of object classes that support socialnetworks
  */
 
 

From 3306565ba8a2f510364bf3cabd829d7a2703eb02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 21:26:59 +0100
Subject: [PATCH 054/300] doc

---
 htdocs/core/class/doleditor.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index dad1f572406..bb63c1dd927 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -43,6 +43,7 @@ class DolEditor
 	public $cols;
 	public $height;
 	public $width;
+	public $uselocalbrowser;
 	public $readonly;
 	public $posx;
 	public $posy;

From f8b75f33126d851ad4f9bfe2b70260234d3aa880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 21:29:07 +0100
Subject: [PATCH 055/300] Update cstate.class.php

---
 htdocs/core/class/cstate.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index e098de93bd4..46e60b2f7fd 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -49,6 +49,11 @@ class Cstate // extends CommonObject
 	 */
 	public $id;
 
+	/**
+	 * @var int ID
+	 */
+	public $rowid;
+
 	public $code_departement;
 	public $code;
 

From 1ce9da8026a7234d96869bf32acf83512748cb06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 21:38:26 +0100
Subject: [PATCH 056/300] doc

---
 htdocs/core/class/CMailFile.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 9e8593e6d1b..c54b527eff2 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -128,6 +128,7 @@ class CMailFile
 
 	// Image
 	public $html;
+	public $msgishtml;
 	public $image_boundary;
 	public $atleastoneimage = 0; // at least one image file with file=xxx.ext into content (TODO Debug this. How can this case be tested. Remove if not used).
 	public $html_images = array();

From b74e7e8de4b0ab12650164bb7796268666a51206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Wed, 22 Feb 2023 22:47:19 +0100
Subject: [PATCH 057/300] translation

---
 htdocs/contrat/class/contrat.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 0007bc334b9..48a3e4053a4 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -1992,6 +1992,8 @@ class Contrat extends CommonObject
 	{
 		global $conf, $langs, $user;
 
+		$langs->load('contracts');
+
 		$datas = [];
 
 		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

From d326e59beba5e5d997384f323f6f22c57c55a17e Mon Sep 17 00:00:00 2001
From: pratushraj <p.raj@alsoft.org>
Date: Thu, 23 Feb 2023 13:00:31 +0530
Subject: [PATCH 058/300] issue #24014

---
 htdocs/projet/class/task.class.php |  9 ++++++---
 htdocs/projet/tasks.php            | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 87ab0afdc47..3c58a147d39 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -813,7 +813,7 @@ class Task extends CommonObjectLine
 	 * @param	int		$loadRoleMode		1= will test Roles on task;  0 used in delete project action
 	 * @return 	array						Array of tasks
 	 */
-	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = array(), $includebilltime = 0, $search_array_options = array(), $loadextras = 0, $loadRoleMode = 1)
+	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = array(), $includebilltime = 0, $search_array_options = array(), $loadextras = 0, $loadRoleMode = 1, $sortfield = '', $sortorder = '')
 	{
 		global $conf, $hookmanager;
 
@@ -953,8 +953,11 @@ class Task extends CommonObjectLine
 			}
 		}
 
-
-		$sql .= " ORDER BY p.ref, t.rang, t.dateo";
+		if($sortfield && $sortorder) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		} else {
+			$sql .= " ORDER BY p.ref, t.rang, t.dateo";
+		}
 
 		//print $sql;exit;
 		dol_syslog(get_class($this)."::getTasksArray", LOG_DEBUG);
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index ffba37abb7d..22258bd3b18 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -124,12 +124,12 @@ $search_array_options = $extrafields->getOptionalsFromPost($taskstatic->table_el
 
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (!$sortfield) {
+/* if (!$sortfield) {
 	reset($object->fields); $sortfield="t.".key($object->fields);
 }   // Set here default search field. By default 1st field in definition. Reset is required to avoid key() to return null.
 if (!$sortorder) {
 	$sortorder = "ASC";
-}
+} */
 
 
 // Security check
@@ -848,7 +848,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	// Get list of tasks in tasksarray and taskarrayfiltered
 	// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
 	$filteronthirdpartyid = $socid;
-	$tasksarray = $taskstatic->getTasksArray(0, 0, $object->id, $filteronthirdpartyid, 0, '', -1, $morewherefilter, 0, 0, $extrafields, 1, $search_array_options);
+	$tasksarray = $taskstatic->getTasksArray(0, 0, $object->id, $filteronthirdpartyid, 0, '', -1, $morewherefilter, 0, 0, $extrafields, 1, $search_array_options, 0, 1, $sortfield, $sortorder);
 
 	// We load also tasks limited to a particular user
 	$tmpuser = new User($db);
@@ -998,41 +998,41 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '<tr class="liste_titre nodrag nodrop">';
 	// print '<td>'.$langs->trans("Project").'</td>';
 	if (!empty($arrayfields['t.ref']['checked'])) {
-		print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, '');
+		print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], 't.ref', '', $param, '', $sortfield, $sortorder, '');
 	}
 	if (!empty($arrayfields['t.label']['checked'])) {
-		print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, '');
+		print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "t.label", '', $param, '', $sortfield, $sortorder, '');
 	}
 	if (!empty($arrayfields['t.description']['checked'])) {
 		print_liste_field_titre($arrayfields['t.description']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, '');
 	}
 	if (!empty($arrayfields['t.dateo']['checked'])) {
-		print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "t.dateo", '', $param, '', $sortfield, $sortorder, 'center ');
 	}
 	if (!empty($arrayfields['t.datee']['checked'])) {
-		print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", '', $param, '', $sortfield, $sortorder, 'center ');
 	}
 	if (!empty($arrayfields['t.planned_workload']['checked'])) {
-		print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+		print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "t.planned_workload", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
 	}
 	if (!empty($arrayfields['t.duration_effective']['checked'])) {
-		print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+		print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
 	}
 	if (!empty($arrayfields['t.progress_calculated']['checked'])) {
 		print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
 	}
 	if (!empty($arrayfields['t.progress']['checked'])) {
-		print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
+		print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", '', $param, '', $sortfield, $sortorder, 'right ', '', 1);
 	}
 	if (!empty($arrayfields['t.progress_summary']['checked'])) {
 		print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '', 1);
 	}
 	if ($object->usage_bill_time) {
 		if (!empty($arrayfields['t.tobill']['checked'])) {
-			print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
+			print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "t.tobill", '', $param, '', $sortfield, $sortorder, 'right ');
 		}
 		if (!empty($arrayfields['t.billed']['checked'])) {
-			print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'right ');
+			print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "t.billed", '', $param, '', $sortfield, $sortorder, 'right ');
 		}
 	}
 	// Contacts of task, disabled because available by default jsut after
@@ -1043,7 +1043,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	*/
 
 	if (!empty($arrayfields['t.budget_amount']['checked'])) {
-		print_liste_field_titre($arrayfields['t.budget_amount']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre($arrayfields['t.budget_amount']['label'], $_SERVER["PHP_SELF"], "t.budget_amount", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
 
 	if (!empty($arrayfields['c.assigned']['checked'])) {

From af4228064d95a44e62ac9b4342e0d6955d4f87a4 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 23 Feb 2023 07:33:16 +0000
Subject: [PATCH 059/300] Fixing style errors.

---
 htdocs/projet/class/task.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 3c58a147d39..fea80f6d13a 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -953,7 +953,7 @@ class Task extends CommonObjectLine
 			}
 		}
 
-		if($sortfield && $sortorder) {
+		if ($sortfield && $sortorder) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		} else {
 			$sql .= " ORDER BY p.ref, t.rang, t.dateo";

From 30c76623e12de38b67f8518a44701011cf7fa8a2 Mon Sep 17 00:00:00 2001
From: Gauthier PC portable 024 <gauthier.verdol@atm-consulting.fr>
Date: Thu, 23 Feb 2023 10:46:20 +0100
Subject: [PATCH 060/300] FIX : missing w option in dol_print_date

---
 htdocs/core/lib/functions.lib.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d503026a868..053bbfe98ca 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -2696,8 +2696,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 			$dtts->setTimestamp($time);
 			$dtts->setTimezone($tzo);
 			$newformat = str_replace(
-				array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
-				array('Y', 'y', 'm', 'd', 'H', 'h', 'i', 's', 'A', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
+				array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', '%w', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
+				array('Y', 'y', 'm', 'd', 'H', 'h', 'i', 's', 'A', 'w', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
 				$format);
 			$ret = $dtts->format($newformat);
 			$ret = str_replace(
@@ -2722,8 +2722,8 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 				$dtts->setTimestamp($timetouse);
 				$dtts->setTimezone($tzo);
 				$newformat = str_replace(
-					array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
-					array('Y', 'y', 'm', 'd', 'H', 'h', 'i', 's', 'A', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
+					array('%Y', '%y', '%m', '%d', '%H', '%I', '%M', '%S', '%p', '%w', 'T', 'Z', '__a__', '__A__', '__b__', '__B__'),
+					array('Y', 'y', 'm', 'd', 'H', 'h', 'i', 's', 'A', 'w', '__£__', '__$__', '__{__', '__}__', '__[__', '__]__'),
 					$format);
 				$ret = $dtts->format($newformat);
 				$ret = str_replace(

From 763001625bdf7ad32b09bf8dcd9ec68bfc4f1e07 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Thu, 23 Feb 2023 11:20:19 +0100
Subject: [PATCH 061/300] New : test of big upload on test_forms

---
 htdocs/core/ajax/flowjs-server.php |  7 +++-
 htdocs/public/test/test_forms.php  | 64 ++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/ajax/flowjs-server.php b/htdocs/core/ajax/flowjs-server.php
index e1f5feaaf10..480dba39195 100644
--- a/htdocs/core/ajax/flowjs-server.php
+++ b/htdocs/core/ajax/flowjs-server.php
@@ -35,6 +35,9 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
 // If there is no need to load and show top and left menu
 if (!defined("NOLOGIN")) {
 	define("NOLOGIN", '1');
@@ -68,7 +71,7 @@ if (!empty($upload_dir)) {
 	$temp_dir = $upload_dir.'/'.$flowIdentifier;
 } else {
 	$temp_dir = DOL_DATA_ROOT.'/'.$module.'/temp/'.$flowIdentifier;
-	$upload_dir = $temp_dir;
+	$upload_dir = DOL_DATA_ROOT.'/'.$module.'/temp/';
 }
 
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
@@ -133,7 +136,7 @@ function createFileFromChunks($temp_dir, $upload_dir, $fileName, $chunkSize, $to
 	$total_files = 0;
 	$files = dol_dir_list($temp_dir, 'files');
 	foreach ($files as $file) {
-		if (stripos($file, $fileName) !== false) {
+		if (stripos($file["name"], $fileName) !== false) {
 			$total_files++;
 		}
 	}
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index acc9151798f..e041e1d98fa 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -105,6 +105,70 @@ $array = array(1=>'Value 1', 2=>'Value 2', 3=>'Value 3');
 $arrayselected = array(1, 3);
 print $form->multiselectarray('testmulti', $array, $arrayselected, '', 0, 'minwidth100');
 
+print '<br><br>'."\n";
+
+// Test6a: Upload of big files
+print "Test 6a: Upload of big files<br>\n";
+print "The file will be uploaded in the directory: documents/test_form/temp/<br>\n";
+
+if (is_file(DOL_DOCUMENT_ROOT.'/includes/flowjs/flow.js')) {
+	print '<button id="buttonbigupload" type="button">Browse...</button>';
+	print '&nbsp;<span id="filespan">No file selected.</span>';
+	print '<br><div class="progress-bar filepgbar taligncenter" role="progressbar" style="width:1%;display:none"><span class="small valigntop">0%</span></div>';
+	print '<br><button type="button" style="display:none;" data-fileidentifier="" class="btn green-haze btn-circle cancelfileinput" id="filecancel">Cancel</button>';
+	print '<script src="'.DOL_URL_ROOT.'/includes/flowjs/flow.js"></script>';
+	print '<script>
+	jQuery(document).ready(function() {
+		var flow = new Flow({
+			target:"'.DOL_URL_ROOT.'/core/ajax/flowjs-server.php", 
+			query:{module:"test_form"},
+			testChunks:false
+		});
+		';
+		print 'if(flow.support){
+			flow.assignBrowse(document.getElementById("buttonbigupload"));
+			flow.on("fileAdded", function(file, event){
+				console.log("Trigger event file added", file, event);
+				$("#filespan").text(file.name);
+				$("#filecancel").data("fileidentifier", file.uniqueIdentifier)
+				$("#filecancel").show()
+				$(".filepgbar").show();
+				$(".filepgbar").attr("id",file.uniqueIdentifier+"pgbar")
+			});
+			flow.on("filesSubmitted", function(array,message){
+				console.log("Trigger event file submitted");
+				flow.upload()
+			});
+			flow.on("progress", function(){
+				console.log("progress",flow.files);
+				flow.files.forEach(function(element){
+					console.log(element.progress());
+					width = Math.round(element.progress()*100)
+					width = width.toString()
+					$("#"+element.uniqueIdentifier+"pgbar").width(width+"%")
+					$("#"+element.uniqueIdentifier+"pgbar").children("span").text(width+"%")
+				});
+			});
+			flow.on("fileSuccess", function(file,message){
+				console.log("The file has been uploaded successfully",file,message);
+			});
+			$(".cancelfileinput").on("click", function(){
+				filename = $(this).data("fileidentifier");
+				file = flow.getFromUniqueIdentifier(filename);
+				file.cancel();
+				$("#"+file.uniqueIdentifier+"pgbar").hide();
+				console.log("We remove file "+filename);
+				$("#filespan").text("No file selected.");
+				$(this).hide();
+			})
+		}
+	})
+	';
+	print '</script>';
+} else {
+	print "If this message displays, please add flow.js file which can be found here :https://github.com/flowjs/flow.js and place the js lib in htdocs/includes/flowjs/<br>\n";
+}
+
 print '</div>';
 
 // End of page

From 5d5634cc505a7b2ce990d645e785ca5faee77281 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Thu, 23 Feb 2023 11:41:46 +0100
Subject: [PATCH 062/300] fix : Warning: Undefined property: Conf:: in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/contrat/card.php on
 line 1652

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

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 6b3937df76a..b41d913a92e 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1649,9 +1649,9 @@ if ($action == 'create') {
 					if ($objp->subprice >= 0) {
 						$colspan = 6;
 
-						if ($conf->margin->enabled && getDolGlobalString('PRODUCT_USE_UNITS')) {
+						if (isModEnabled('margin') && getDolGlobalString('PRODUCT_USE_UNITS')) {
 							$colspan = 8;
-						} elseif ($conf->margin->enabled || getDolGlobalString('PRODUCT_USE_UNITS')) {
+						} elseif (isModEnabled('margin') || getDolGlobalString('PRODUCT_USE_UNITS')) {
 							$colspan = 7;
 						}
 

From d86ab00950d9c7592ba8ab8c55f5ed7dc681e038 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 12:08:43 +0100
Subject: [PATCH 063/300] Look and feel v18

---
 htdocs/comm/mailing/card.php          | 10 +++++++++-
 htdocs/comm/mailing/cibles.php        | 10 ++++++++--
 htdocs/comm/mailing/info.php          |  8 +++++++-
 htdocs/core/class/html.form.class.php |  8 ++++++--
 htdocs/theme/eldy/global.inc.php      |  7 +++++--
 htdocs/theme/md/style.css.php         |  8 ++++++++
 6 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 634047cdad6..a0d8ec640d0 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -899,6 +899,12 @@ if ($action == 'create') {
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
+			$morehtmlref = '<div class="refidno">';
+			// Ref customer
+			$morehtmlref .= $form->editfieldkey("", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string', '', 0, 1);
+			$morehtmlref .= $form->editfieldval("", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string', '', null, null, '', 1);
+			$morehtmlref .= '</div>';
+
 			$morehtmlright = '';
 			$nbtry = $nbok = 0;
 			if ($object->statut == 2 || $object->statut == 3) {
@@ -912,7 +918,7 @@ if ($action == 'create') {
 				$morehtmlright .= ') &nbsp; ';
 			}
 
-			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
+			dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
 			print '<div class="fichecenter">';
 			print '<div class="underbanner clearboth"></div>';
@@ -920,11 +926,13 @@ if ($action == 'create') {
 			print '<table class="border centpercent tableforfield">';
 
 			// Description
+			/*
 			print '<tr><td class="titlefield">';
 			print $form->editfieldkey("MailTitle", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string');
 			print '</td><td>';
 			print $form->editfieldval("MailTitle", 'title', $object->title, $object, $user->hasRight('mailing', 'creer'), 'string');
 			print '</td></tr>';
+			*/
 
 			// From
 			print '<tr><td>';
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 758172b4d5f..71e8617f927 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -212,6 +212,12 @@ if ($object->fetch($id) >= 0) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
+	$morehtmlref = '<div class="refidno">';
+	// Ref customer
+	$morehtmlref .= $form->editfieldkey("", 'title', $object->title, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("", 'title', $object->title, $object, 0, 'string', '', null, null, '', 1);
+	$morehtmlref .= '</div>';
+
 	$morehtmlright = '';
 	$nbtry = $nbok = 0;
 	if ($object->statut == 2 || $object->statut == 3) {
@@ -226,14 +232,14 @@ if ($object->fetch($id) >= 0) {
 		$morehtmlright .= ') &nbsp; ';
 	}
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 
 	print '<table class="border centpercent tableforfield">';
 
-	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
+	//print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">';
 	$emailarray = CMailFile::getArrayAddress($object->email_from);
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 86ce2eb70b2..b2f051bc3a6 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -58,6 +58,12 @@ if ($object->fetch($id) >= 0) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
+	$morehtmlref = '<div class="refidno">';
+	// Ref customer
+	$morehtmlref .= $form->editfieldkey("", 'title', $object->title, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("", 'title', $object->title, $object, 0, 'string', '', null, null, '', 1);
+	$morehtmlref .= '</div>';
+
 	$morehtmlright = '';
 	$nbtry = $nbok = 0;
 	if ($object->statut == 2 || $object->statut == 3) {
@@ -71,7 +77,7 @@ if ($object->fetch($id) >= 0) {
 		$morehtmlright .= ') &nbsp; ';
 	}
 
-	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', '', '', 0, '', $morehtmlright);
+	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
 	print '<div class="underbanner clearboth"></div><br>';
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index c0e1ee67660..855fb711a86 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -168,7 +168,11 @@ class Form
 				$ret .= '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&token='.newToken().'&'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
 			}
 			if (!empty($notabletag) && $notabletag == 1) {
-				$ret .= ' : ';
+				if ($text) {
+					$ret .= ' : ';
+				} else {
+					$ret .= ' ';
+				}
 			}
 			if (!empty($notabletag) && $notabletag == 3) {
 				$ret .= ' ';
@@ -9350,7 +9354,7 @@ class Form
 		// Left part of banner
 		if ($morehtmlleft) {
 			if ($conf->browser->layout == 'phone') {
-				$ret .= '<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>'; // class="center" to have photo in middle
+				$ret .= '<!-- morehtmlleft --><div class="floatleft">'.$morehtmlleft.'</div>';
 			} else {
 				$ret .= '<!-- morehtmlleft --><div class="inline-block floatleft">'.$morehtmlleft.'</div>';
 			}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 1750cf00c7f..ad88ea06e1c 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -249,7 +249,7 @@ input {
 	padding: 4px;
 	padding-left: 5px;
 }
-.tableforfield input {
+.tableforfield input, .refidno input {
 	padding: 2px;
 }
 select {
@@ -624,7 +624,7 @@ table.tableforfield .buttonDelete:not(.bordertransp):not(.buttonpayment) {
 	text-transform: uppercase;
 	color: #444;
 }
-.valuefield .button, .valuefieldcreate .button, .refidno .button {
+.valuefield .button, .valuefieldcreate .button, .refidno .button:not(.smallpaddingimp) {
 	margin-top: 0 !important;
 	margin-bottom: 0 !important;
 	font-size: 0.85em !important;
@@ -2954,9 +2954,12 @@ if (!empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
 .login_table .tdinputlogin input#securitycode {
 	font-size: 1em;
 }
+/* For the static info message */
 .login_main_home {
 	word-break: break-word;
+	width: fit-content;
 }
+/* For the result or error message */
 .login_main_message {
 	text-align: center;
 	max-width: 570px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 24078c3ca8f..2e0809ec311 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -456,6 +456,10 @@ a.commonlink { color: var(--colortextlink) !important; text-decoration: none; }
 input {
 	font-size: unset;
 }
+.tableforfield input, .refidno input {
+	padding: 2px;
+}
+
 /*
 input, input.flat, textarea, textarea.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	background-color: #FDFDFD;
@@ -875,6 +879,9 @@ table.tableforfield .buttonDelete:not(.bordertransp):not(.buttonpayment) {
 	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 }
+.refidno .button.smallpaddingimp {
+	font-size: 0.85em !important;
+}
 .button:focus, .buttonDelete:focus  {
 	-webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
 	box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
@@ -3066,6 +3073,7 @@ form#login {
 
 .login_main_home {
 	word-break: break-word;
+	width: fit-content;
 }
 .login_main_message {
 	text-align: center;

From 790a28f4577df845150ddc213e453c9f40e56979 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 12:17:35 +0100
Subject: [PATCH 064/300] Look and feel v18

---
 htdocs/theme/md/style.css.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2e0809ec311..9a06b361f66 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -547,8 +547,8 @@ input, select {
 	border: none;
 	text-shadow: none;
 	text-transform: uppercase;
-	font-weight: bold;
-	margin: 0em 0.9em;
+	/* font-weight: bold; */
+	margin: 0em 0.8em;
 	padding: 0.6em 0.7em;
 	line-height: 17px;
 }

From 45cdbd8a600cd60bff7c3b3c511613b7279d92ab Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 12:18:02 +0100
Subject: [PATCH 065/300] Fix checkbox

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

diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 273e7285273..64747c1bbf6 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -366,7 +366,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<tr>';
 		print '<td>'.$langs->trans("DefaultSkin").'</td>';
 		print '<td>'.$conf->global->MAIN_THEME.'</td>';
-		print '<td class="nowrap left"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit ? '' : ' disabled').' type="checkbox" '.($selected_theme ? " checked" : "").'> '.$langs->trans("UsePersonalValue").'</td>';
+		print '<td class="nowrap left"><input id="check_MAIN_THEME" name="check_MAIN_THEME"'.($edit ? '' : ' disabled').' type="checkbox" '.($selected_theme ? " checked" : "").'> <label for="check_MAIN_THEME">'.$langs->trans("UsePersonalValue").'</label></td>';
 		print '<td>&nbsp;</td>';
 		print '</tr>';
 	} else {

From 6da5df45b22177ea758c94c459fdba66e22a68ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 13:21:45 +0100
Subject: [PATCH 066/300] FIX Bad value for phone in substitutions keys

---
 htdocs/core/lib/functions.lib.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index e6ac7f2d9f2..40fcbfbf12b 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3575,15 +3575,15 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 				$picto = '';
 			}
 		}
-		if ($adddivfloat) {
+		if ($adddivfloat == 1) {
 			$rep .= '<div class="nospan float" style="margin-right: 10px">';
-		} else {
+		} elseif (empty($adddivfloat)) {
 			$rep .= '<span style="margin-right: 10px;">';
 		}
 		$rep .= ($withpicto ?img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;
-		if ($adddivfloat) {
+		if ($adddivfloat == 1) {
 			$rep .= '</div>';
-		} else {
+		} elseif (empty($adddivfloat)) {
 			$rep .= '</span>';
 		}
 	}
@@ -7638,9 +7638,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				'__USER_ID__' => (string) $user->id,
 				'__USER_LOGIN__' => (string) $user->login,
 				'__USER_EMAIL__' => (string) $user->email,
-				'__USER_PHONE__' => (string) dol_print_phone($user->office_phone),
-				'__USER_PHONEPRO__' => (string) dol_print_phone($user->user_mobile),
-				'__USER_PHONEMOBILE__' => (string) dol_print_phone($user->personal_mobile),
+				'__USER_PHONE__' => (string) dol_print_phone($user->office_phone, '', 0, 0, '', " ", '', '', -1),
+				'__USER_PHONEPRO__' => (string) dol_print_phone($user->user_mobile, '', 0, 0, '', " ", '', '', -1),
+				'__USER_PHONEMOBILE__' => (string) dol_print_phone($user->personal_mobile, '', 0, 0, '', " ", '', '', -1),
 				'__USER_FAX__' => (string) $user->office_fax,
 				'__USER_LASTNAME__' => (string) $user->lastname,
 				'__USER_FIRSTNAME__' => (string) $user->firstname,
@@ -7655,8 +7655,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$substitutionarray = array_merge($substitutionarray, array(
 			'__MYCOMPANY_NAME__'    => $mysoc->name,
 			'__MYCOMPANY_EMAIL__'   => $mysoc->email,
-			'__MYCOMPANY_PHONE__'   => dol_print_phone($mysoc->phone),
-			'__MYCOMPANY_FAX__'     => dol_print_phone($mysoc->fax),
+			'__MYCOMPANY_PHONE__'   => dol_print_phone($mysoc->phone, '', 0, 0, '', " ", '', '', -1),
+			'__MYCOMPANY_FAX__'     => dol_print_phone($mysoc->fax, '', 0, 0, '', " ", '', '', -1),
 			'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
 			'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
 			'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,

From dbf3df52106fd13d47cd9c6733fe3832d191bf69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 13:50:25 +0100
Subject: [PATCH 067/300] Fix emailing in test mode use correct user or sender
 signature

---
 htdocs/comm/mailing/card.php                  | 21 ++++++++++++-------
 htdocs/comm/mailing/cibles.php                |  4 ++--
 htdocs/core/class/html.formmail.class.php     | 10 +++++----
 .../core/modules/mailings/fraise.modules.php  |  6 +++---
 .../core/modules/mailings/pomme.modules.php   |  4 ++--
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index a0d8ec640d0..d46ea99c213 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -223,7 +223,6 @@ if (empty($reshook)) {
 
 						$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
 
-						$targetobject = null; // Not defined with mass emailing
 						$parameters = array('mode'=>'emailing');
 						$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
 
@@ -468,19 +467,25 @@ if (empty($reshook)) {
 
 		if (!$error) {
 			// Is the message in html
-			$msgishtml = -1; // Unknow by default
+			$msgishtml = -1; // Unknow = autodetect by default
 			if (preg_match('/[\s\t]*<html>/i', $object->body)) {
 				$msgishtml = 1;
 			}
 
+			$signature = ((!empty($user->signature) && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $user->signature : '');
+
+			$parameters = array('mode'=>'emailing');
+			$substitutionarray = getCommonSubstitutionArray($langs, 0, array('object', 'objectamount'), $targetobject); // Note: On mass emailing, this is null because be don't know object
+
 			// other are set at begin of page
-			$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
-			$object->substitutionarrayfortest['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
+			$substitutionarray['__EMAIL__'] = $object->sendto;
+			$substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
 
 			// Subject and message substitutions
-			complete_substitutions_array($object->substitutionarrayfortest, $langs);
-			$tmpsujet = make_substitutions($object->sujet, $object->substitutionarrayfortest);
-			$tmpbody = make_substitutions($object->body, $object->substitutionarrayfortest);
+			complete_substitutions_array($substitutionarray, $langs, $targetobject);
+
+			$tmpsujet = make_substitutions($object->sujet, $substitutionarray);
+			$tmpbody = make_substitutions($object->body, $substitutionarray);
 
 			$arr_file = array();
 			$arr_mime = array();
@@ -935,7 +940,7 @@ if ($action == 'create') {
 			*/
 
 			// From
-			print '<tr><td>';
+			print '<tr><td class="titlefield">';
 			print $form->editfieldkey("MailFrom", 'email_from', $object->email_from, $object, $user->hasRight('mailing', 'creer') && $object->statut < 3, 'string');
 			print '</td><td>';
 			print $form->editfieldval("MailFrom", 'email_from', $object->email_from, $object, $user->hasRight('mailing', 'creer') && $object->statut < 3, 'string');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 71e8617f927..79905182ee3 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -241,7 +241,7 @@ if ($object->fetch($id) >= 0) {
 
 	//print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 
-	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">';
+	print '<tr><td class="titlefield">'.$langs->trans("MailFrom").'</td><td colspan="3">';
 	$emailarray = CMailFile::getArrayAddress($object->email_from);
 	foreach ($emailarray as $email => $name) {
 		if ($name && $name != $email) {
@@ -291,7 +291,7 @@ if ($object->fetch($id) >= 0) {
 			}
 		}
 		if (empty($nbemail)) {
-			$nbemail .= ' '.img_warning('').' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
+			$nbemail .= ' '.img_warning('');//.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
 		}
 		if ($text) {
 			print $form->textwithpicto($nbemail, $text, 1, 'warning');
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 137e5f7d779..96d6d4c0d89 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -540,11 +540,15 @@ class FormMail extends Form
 			// Substitution array/string
 			$helpforsubstitution = '';
 			if (is_array($this->substit) && count($this->substit)) {
-				$helpforsubstitution .= $langs->trans('AvailableVariables').' :<br>'."\n";
+				$helpforsubstitution .= $langs->trans('AvailableVariables').' :<br><br><span class="small">'."\n";
 			}
 			foreach ($this->substit as $key => $val) {
 				$helpforsubstitution .= $key.' -> '.$langs->trans(dol_string_nohtmltag(dolGetFirstLineOfText($val))).'<br>';
 			}
+			if (is_array($this->substit) && count($this->substit)) {
+				$helpforsubstitution .= '</span>';
+			}
+
 			if (!empty($this->withsubstit)) {	// Unset or set ->withsubstit=0 to disable this.
 				$out .= '<tr><td colspan="2" class="right">';
 				//$out.='<div class="floatright">';
@@ -1599,7 +1603,7 @@ class FormMail extends Form
 			$tmparray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount'), $object); // Note: On email templated edition, this is null because it is related to all type of objects
 			complete_substitutions_array($tmparray, $langs, null, $parameters);
 
-			// For mass emailing, we have different keys
+			// For mass emailing, we have different keys specific to the data into tagerts list
 			$tmparray['__ID__'] = 'IdRecord';
 			$tmparray['__THIRDPARTY_CUSTOMER_CODE__'] = 'CustomerCode';
 			$tmparray['__EMAIL__'] = 'EMailRecipient';
@@ -1611,8 +1615,6 @@ class FormMail extends Form
 			$tmparray['__OTHER3__'] = 'Other3';
 			$tmparray['__OTHER4__'] = 'Other4';
 			$tmparray['__OTHER5__'] = 'Other5';
-			$tmparray['__USER_SIGNATURE__'] = 'TagUserSignature';
-			$tmparray['__SENDEREMAIL_SIGNATURE__'] = 'TagEmailSenderSignature';
 			$tmparray['__CHECK_READ__'] = 'TagCheckMail';
 			$tmparray['__UNSUBSCRIBE__'] = 'TagUnsubscribe';
 			//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 9fe6a615f5d..8d55ac65864 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -201,11 +201,11 @@ class mailing_fraise extends MailingTargets
 		$s .= '</select>';
 
 
-		$s .= '<br>';
+		$s .= '<br><span class="opacitymedium">';
 		$s .= $langs->trans("DateEndSubscription").': &nbsp;';
-		$s .= $langs->trans("After").' > '.$form->selectDate(-1, 'subscriptionafter', 0, 0, 1, 'fraise', 1, 0, 0);
+		$s .= $langs->trans("After").' > </span>'.$form->selectDate(-1, 'subscriptionafter', 0, 0, 1, 'fraise', 1, 0, 0);
 		$s .= ' &nbsp; ';
-		$s .= $langs->trans("Before").' < '.$form->selectDate(-1, 'subscriptionbefore', 0, 0, 1, 'fraise', 1, 0, 0);
+		$s .= '<span class="opacitymedium">'.$langs->trans("Before").' < </span>'.$form->selectDate(-1, 'subscriptionbefore', 0, 0, 1, 'fraise', 1, 0, 0);
 
 		return $s;
 	}
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 7fdcdeb0c60..907028ca881 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -118,7 +118,7 @@ class mailing_pomme extends MailingTargets
 		$langs->load("users");
 
 		$s = '';
-		$s .= '<select id="filter_pomme"" name="filter" class="flat">';
+		$s .= '<select id="filter_pomme"" name="filter" class="flat minwidth100">';
 		$s .= '<option value="-1">'.$langs->trans("Status").'</option>';
 		$s .= '<option value="1">'.$langs->trans("Enabled").'</option>';
 		$s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
@@ -126,7 +126,7 @@ class mailing_pomme extends MailingTargets
 		$s .= ajax_combobox("filter_pomme");
 
 		$s .= ' ';
-		$s .= '<select id="filteremployee_pomme" name="filteremployee" class="flat">';
+		$s .= '<select id="filteremployee_pomme" name="filteremployee" class="flat minwidth100">';
 		$s .= '<option value="-1">'.$langs->trans("Employee").'</option>';
 		$s .= '<option value="1">'.$langs->trans("Yes").'</option>';
 		$s .= '<option value="0">'.$langs->trans("No").'</option>';

From 9216a6f8708c6866d52f3203933be9529a4059b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 13:21:45 +0100
Subject: [PATCH 068/300] FIX Bad value for phone in substitutions keys

---
 htdocs/core/lib/functions.lib.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index d503026a868..c06630e96a2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3572,15 +3572,15 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 				$picto = '';
 			}
 		}
-		if ($adddivfloat) {
+		if ($adddivfloat == 1) {
 			$rep .= '<div class="nospan float" style="margin-right: 10px">';
-		} else {
+		} elseif (empty($adddivfloat)) {
 			$rep .= '<span style="margin-right: 10px;">';
 		}
 		$rep .= ($withpicto ?img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;
-		if ($adddivfloat) {
+		if ($adddivfloat == 1) {
 			$rep .= '</div>';
-		} else {
+		} elseif (empty($adddivfloat)) {
 			$rep .= '</span>';
 		}
 	}
@@ -7586,9 +7586,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				'__USER_ID__' => (string) $user->id,
 				'__USER_LOGIN__' => (string) $user->login,
 				'__USER_EMAIL__' => (string) $user->email,
-				'__USER_PHONE__' => (string) dol_print_phone($user->office_phone),
-				'__USER_PHONEPRO__' => (string) dol_print_phone($user->user_mobile),
-				'__USER_PHONEMOBILE__' => (string) dol_print_phone($user->personal_mobile),
+				'__USER_PHONE__' => (string) dol_print_phone($user->office_phone, '', 0, 0, '', " ", '', '', -1),
+				'__USER_PHONEPRO__' => (string) dol_print_phone($user->user_mobile, '', 0, 0, '', " ", '', '', -1),
+				'__USER_PHONEMOBILE__' => (string) dol_print_phone($user->personal_mobile, '', 0, 0, '', " ", '', '', -1),
 				'__USER_FAX__' => (string) $user->office_fax,
 				'__USER_LASTNAME__' => (string) $user->lastname,
 				'__USER_FIRSTNAME__' => (string) $user->firstname,
@@ -7603,8 +7603,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$substitutionarray = array_merge($substitutionarray, array(
 			'__MYCOMPANY_NAME__'    => $mysoc->name,
 			'__MYCOMPANY_EMAIL__'   => $mysoc->email,
-			'__MYCOMPANY_PHONE__'   => dol_print_phone($mysoc->phone),
-			'__MYCOMPANY_FAX__'     => dol_print_phone($mysoc->fax),
+			'__MYCOMPANY_PHONE__'   => dol_print_phone($mysoc->phone, '', 0, 0, '', " ", '', '', -1),
+			'__MYCOMPANY_FAX__'     => dol_print_phone($mysoc->fax, '', 0, 0, '', " ", '', '', -1),
 			'__MYCOMPANY_PROFID1__' => $mysoc->idprof1,
 			'__MYCOMPANY_PROFID2__' => $mysoc->idprof2,
 			'__MYCOMPANY_PROFID3__' => $mysoc->idprof3,

From 6afb899f0540da6dab0568beb1a9e23fdebcef76 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 15:50:57 +0100
Subject: [PATCH 069/300] Fix tags

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index d46ea99c213..06d72826101 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -373,7 +373,7 @@ if (empty($reshook)) {
 							if (!$resql2) {
 								dol_print_error($db);
 							} else {
-								//if cheack read is use then update prospect contact status
+								//if check read is use then update prospect contact status
 								if (strpos($message, '__CHECK_READ__') !== false) {
 									//Update status communication of thirdparty prospect
 									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".((int) $obj->rowid).")";
@@ -480,6 +480,9 @@ if (empty($reshook)) {
 			// other are set at begin of page
 			$substitutionarray['__EMAIL__'] = $object->sendto;
 			$substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
+			$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefinedintestmode&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->sendto).'&mtid=0" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+			$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag=undefinedintestmode&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->sendto).'&mtid=0" target="_blank" rel="noopener noreferrer">'.$langs->trans("MailUnsubcribe").'</a>';
+			$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag=undefinedintestmode&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->sendto).'&mtid=0';
 
 			// Subject and message substitutions
 			complete_substitutions_array($substitutionarray, $langs, $targetobject);

From 4252db1c7938d691c452e816624ee96dfa7737e8 Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Thu, 23 Feb 2023 15:51:52 +0100
Subject: [PATCH 070/300] FIX : Impossible to create value for product
 attribute (variant)

---
 htdocs/variants/card.php                           |  4 +---
 .../tpl/productattributevalueline_create.tpl.php   | 14 --------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index 5f1065f5171..8daf1239deb 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -330,9 +330,7 @@ if ($action == 'create') {
 			print '<table id="tablelines" class="noborder centpercent">';
 		}
 
-		if (!empty($object->lines)) {
-			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/variants/tpl', ($permissiontoedit ? 1 : 0));
-		}
+		$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1, '/variants/tpl', ($permissiontoedit ? 1 : 0));
 
 		if (!empty($object->lines) || ($permissiontoedit && $action != 'selectlines' && $action != 'editline')) {
 			print '</table>';
diff --git a/htdocs/variants/tpl/productattributevalueline_create.tpl.php b/htdocs/variants/tpl/productattributevalueline_create.tpl.php
index f23e7175f58..21ea651f3ef 100644
--- a/htdocs/variants/tpl/productattributevalueline_create.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_create.tpl.php
@@ -40,20 +40,6 @@ $objectline = null;
 
 print "<!-- BEGIN PHP TEMPLATE productattributevalueline_create.tpl.php -->\n";
 $nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
-if ($nolinesbefore) {
-	?>
-	<tr class="liste_titre<?php echo ($nolinesbefore ? '' : ' liste_titre_add_') ?> nodrag nodrop">
-		<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
-			<td class="linecolnum center"></td>
-		<?php } ?>
-		<td class="linecolref">
-			<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span>
-		</td>
-		<td class="linecolvalue"><span id="title_vat"><?php echo $langs->trans('Value'); ?></span></td>
-		<td class="linecoledit" colspan="<?php echo $colspan; ?>">&nbsp;</td>
-	</tr>
-	<?php
-}
 ?>
 <tr class="pair nodrag nodrop nohoverpair<?php echo $nolinesbefore ? '' : ' liste_titre_create'; ?>">
 	<?php

From 81f694b8f291c8ede0bfa5a3afa44dfdd438e5fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 18:29:58 +0100
Subject: [PATCH 071/300] FIx duplicate image file from src data

---
 htdocs/core/class/CMailFile.class.php | 30 ++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 9e8593e6d1b..92c657f257f 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -273,10 +273,16 @@ class CMailFile
 					if ($this->html_images[$i]) {
 						$this->atleastoneimage = 1;
 						if ($this->html_images[$i]['type'] == 'cidfromdata') {
-							$posindice = count($filename_list);
-							$filename_list[$posindice] = $this->html_images[$i]['fullpath'];
-							$mimetype_list[$posindice] = $this->html_images[$i]['content_type'];
-							$mimefilename_list[$posindice] = $this->html_images[$i]['name'];
+							if (!in_array($this->html_images[$i]['fullpath'], $filename_list)) {
+								// If this file path is not already into the $filename_list, we add it.
+								$posindice = count($filename_list);
+								$filename_list[$posindice] = $this->html_images[$i]['fullpath'];
+								$mimetype_list[$posindice] = $this->html_images[$i]['content_type'];
+								$mimefilename_list[$posindice] = $this->html_images[$i]['name'];
+							} else {
+								$posindice = array_search($this->html_images[$i]['fullpath'], $filename_list);
+							}
+							// We complete the array of cid_list
 							$cid_list[$posindice] = $this->html_images[$i]['cid'];
 						}
 						dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
@@ -284,6 +290,8 @@ class CMailFile
 				}
 			}
 		}
+		//var_dump($filename_list);
+		//var_dump($cid_list);exit;
 
 		// Set atleastoneimage if there is at least one file (into $filename_list array)
 		if (is_array($filename_list)) {
@@ -1130,6 +1138,13 @@ class CMailFile
 				return 'Bad value for sendmode';
 			}
 
+			// Now we delete image files that were created dynamically to manage data inline files
+			foreach ($this->html_images as $val) {
+				if (!empty($val['type']) && $val['type'] == 'cidfromdata') {
+					//dol_delete($val['fullpath']);
+				}
+			}
+
 			$parameters = array('sent' => $res);
 			$action = '';
 			$reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
@@ -1659,7 +1674,7 @@ class CMailFile
 	}
 
 	/**
-	 * Seearch images into html message and init array this->images_encoded if found
+	 * Search images into html message and init array this->images_encoded if found
 	 *
 	 * @param	string	$images_dir		Location of physical images files. For example $dolibarr_main_data_root.'/medias'
 	 * @return	int 		        	>0 if OK, <0 if KO
@@ -1746,7 +1761,8 @@ class CMailFile
 	}
 
 	/**
-	 * Seearch images with data:image format into html message
+	 * Seearch images with data:image format into html message.
+	 * If we find some, we create it on disk.
 	 *
 	 * @param	string	$images_dir		Location of where to store physicaly images files. For example $dolibarr_main_data_root.'/medias'
 	 * @return	int 		        	>0 if OK, <0 if KO
@@ -1788,7 +1804,7 @@ class CMailFile
 			foreach ($matches[1] as $key => $ext) {
 				// We save the image to send in disk
 				$filecontent = $matches[2][$key];
-				$cid = 'cid000'.dol_hash($this->html, 'md5');
+				$cid = 'cid000'.dol_hash($this->html, 'md5');		// The id must not change if image is same
 				$destfiletmp = $images_dir.'/'.$cid.'.'.$ext;
 
 				$fhandle = @fopen($destfiletmp, 'w');

From 1573ab5f383df1fd68852d0134661989b9aab9c7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 18:42:15 +0100
Subject: [PATCH 072/300] Fix position of quickadd button

---
 htdocs/theme/md/dropdown.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 64bebc67f79..eb1fd668361 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -447,18 +447,23 @@ a.dropdown-item {
 		max-width: 360px;
 	}
 
+	#topmenu-quickadd-dropdown a.login-dropdown-a,
 	#topmenu-bookmark-dropdown a.login-dropdown-a {
 		color: #000;
 	}
+	#topmenu-quickadd-dropdown .dropdown-menu,
 	#topmenu-bookmark-dropdown .dropdown-menu {
 		width: 230px;
 	}
 
+	div#topmenu-quickadd-dropdown,
 	div#topmenu-bookmark-dropdown {
 		position: unset;
 	}
 
-	div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown {
+	div#topmenu-global-search-dropdown,
+	div#topmenu-quickadd-dropdown,
+	div#topmenu-bookmark-dropdown {
 		line-height: unset;
 	}
 

From 56afa676c011eba86f439d7b6c27193de04e9f64 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 15:50:57 +0100
Subject: [PATCH 073/300] Fix tags

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

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 63750d5d834..80b808524c8 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -374,7 +374,7 @@ if (empty($reshook)) {
 							if (!$resql2) {
 								dol_print_error($db);
 							} else {
-								//if cheack read is use then update prospect contact status
+								//if check read is use then update prospect contact status
 								if (strpos($message, '__CHECK_READ__') !== false) {
 									//Update status communication of thirdparty prospect
 									$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=2 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".((int) $obj->rowid).")";
@@ -476,6 +476,9 @@ if (empty($reshook)) {
 			// other are set at begin of page
 			$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
 			$object->substitutionarrayfortest['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
+			$object->substitutionarrayfortest['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefinedintestmode&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->sendto).'&mtid=0" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+			$object->substitutionarrayfortest['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag=undefinedintestmode&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->sendto).'&mtid=0" target="_blank" rel="noopener noreferrer">'.$langs->trans("MailUnsubcribe").'</a>';
+			$object->substitutionarrayfortest['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag=undefinedintestmode&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->sendto).'&mtid=0';
 
 			// Subject and message substitutions
 			complete_substitutions_array($object->substitutionarrayfortest, $langs);

From ba59e4eb3de9bdf7d2123a68f48996d11b6f448b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 18:29:58 +0100
Subject: [PATCH 074/300] FIx duplicate image file from src data

---
 htdocs/core/class/CMailFile.class.php | 32 ++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 46de8d8e7af..ecfe968bd02 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -273,10 +273,16 @@ class CMailFile
 					if ($this->html_images[$i]) {
 						$this->atleastoneimage = 1;
 						if ($this->html_images[$i]['type'] == 'cidfromdata') {
-							$posindice = count($filename_list);
-							$filename_list[$posindice] = $this->html_images[$i]['fullpath'];
-							$mimetype_list[$posindice] = $this->html_images[$i]['content_type'];
-							$mimefilename_list[$posindice] = $this->html_images[$i]['name'];
+							if (!in_array($this->html_images[$i]['fullpath'], $filename_list)) {
+								// If this file path is not already into the $filename_list, we add it.
+								$posindice = count($filename_list);
+								$filename_list[$posindice] = $this->html_images[$i]['fullpath'];
+								$mimetype_list[$posindice] = $this->html_images[$i]['content_type'];
+								$mimefilename_list[$posindice] = $this->html_images[$i]['name'];
+							} else {
+								$posindice = array_search($this->html_images[$i]['fullpath'], $filename_list);
+							}
+							// We complete the array of cid_list
 							$cid_list[$posindice] = $this->html_images[$i]['cid'];
 						}
 						dol_syslog("CMailFile::CMailfile: html_images[$i]['name']=".$this->html_images[$i]['name'], LOG_DEBUG);
@@ -284,6 +290,8 @@ class CMailFile
 				}
 			}
 		}
+		//var_dump($filename_list);
+		//var_dump($cid_list);exit;
 
 		// Set atleastoneimage if there is at least one file (into $filename_list array)
 		if (is_array($filename_list)) {
@@ -1124,7 +1132,14 @@ class CMailFile
 				return 'Bad value for sendmode';
 			}
 
-			$parameters = array();
+			// Now we delete image files that were created dynamically to manage data inline files
+			foreach ($this->html_images as $val) {
+				if (!empty($val['type']) && $val['type'] == 'cidfromdata') {
+					//dol_delete($val['fullpath']);
+				}
+			}
+
+			$parameters = array('sent' => $res);
 			$action = '';
 			$reshook = $hookmanager->executeHooks('sendMailAfter', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
@@ -1655,7 +1670,7 @@ class CMailFile
 	}
 
 	/**
-	 * Seearch images into html message and init array this->images_encoded if found
+	 * Search images into html message and init array this->images_encoded if found
 	 *
 	 * @param	string	$images_dir		Location of physical images files. For example $dolibarr_main_data_root.'/medias'
 	 * @return	int 		        	>0 if OK, <0 if KO
@@ -1742,7 +1757,8 @@ class CMailFile
 	}
 
 	/**
-	 * Seearch images with data:image format into html message
+	 * Seearch images with data:image format into html message.
+	 * If we find some, we create it on disk.
 	 *
 	 * @param	string	$images_dir		Location of where to store physicaly images files. For example $dolibarr_main_data_root.'/medias'
 	 * @return	int 		        	>0 if OK, <0 if KO
@@ -1784,7 +1800,7 @@ class CMailFile
 			foreach ($matches[1] as $key => $ext) {
 				// We save the image to send in disk
 				$filecontent = $matches[2][$key];
-				$cid = 'cid000'.dol_hash($this->html, 'md5');
+				$cid = 'cid000'.dol_hash($this->html, 'md5');		// The id must not change if image is same
 				$destfiletmp = $images_dir.'/'.$cid.'.'.$ext;
 
 				$fhandle = @fopen($destfiletmp, 'w');

From 0fbb197231b461885e6479d95d89077bba505dc6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 18:42:15 +0100
Subject: [PATCH 075/300] Fix position of quickadd button

---
 htdocs/theme/md/dropdown.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 64bebc67f79..eb1fd668361 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -447,18 +447,23 @@ a.dropdown-item {
 		max-width: 360px;
 	}
 
+	#topmenu-quickadd-dropdown a.login-dropdown-a,
 	#topmenu-bookmark-dropdown a.login-dropdown-a {
 		color: #000;
 	}
+	#topmenu-quickadd-dropdown .dropdown-menu,
 	#topmenu-bookmark-dropdown .dropdown-menu {
 		width: 230px;
 	}
 
+	div#topmenu-quickadd-dropdown,
 	div#topmenu-bookmark-dropdown {
 		position: unset;
 	}
 
-	div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown {
+	div#topmenu-global-search-dropdown,
+	div#topmenu-quickadd-dropdown,
+	div#topmenu-bookmark-dropdown {
 		line-height: unset;
 	}
 

From f034b12ec1e2bc56e7637b438ddd88d314b90666 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 20:07:53 +0100
Subject: [PATCH 076/300] Clean code

---
 htdocs/mrp/js/lib_dispatch.js.php | 2 +-
 htdocs/mrp/mo_production.php      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/mrp/js/lib_dispatch.js.php b/htdocs/mrp/js/lib_dispatch.js.php
index 8470716ce8f..1dd2d9d164c 100644
--- a/htdocs/mrp/js/lib_dispatch.js.php
+++ b/htdocs/mrp/js/lib_dispatch.js.php
@@ -69,7 +69,7 @@ function addDispatchLine(index, type, mode)
 {
 	mode = mode || 'qtymissing'
 
-	console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
+	console.log("mrp/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
 	if(mode == 'qtymissingconsume' || mode == 'allmissingconsume') {
 		var inputId = 'qtytoconsume';
 		var warehouseId = 'idwarehouse';
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index c4353bd264b..a4225a0a14a 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -432,7 +432,8 @@ $tmpbatch = new Productlot($db);
 $tmpstockmovement = new MouvementStock($db);
 
 $help_url = 'EN:Module_Manufacturing_Orders|FR:Module_Ordres_de_Fabrication|DE:Modul_Fertigungsauftrag';
-llxHeader('', $langs->trans('Mo'), $help_url, '', 0, 0, array('/mrp/js/lib_dispatch.js.php'));
+$morejs = array('/mrp/js/lib_dispatch.js.php');
+llxHeader('', $langs->trans('Mo'), $help_url, '', 0, 0, $morejs);
 
 $newToken = newToken();
 

From 4d44e6853348f874c19bac3c707a41c142e4964b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 20:40:46 +0100
Subject: [PATCH 077/300] Fix substitution for emailing test

---
 htdocs/comm/mailing/card.php              | 2 +-
 htdocs/core/class/html.formmail.class.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 06d72826101..1fec22ea979 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -323,7 +323,7 @@ if (empty($reshook)) {
 						$newmessage = make_substitutions($message, $substitutionarray, null, 0);
 
 						$moreinheader = '';
-						if (preg_match('/__UNSUBSCRIBE__/', $message)) {
+						if (preg_match('/__UNSUBSCRIBE_(_|URL_)/', $message)) {
 							$moreinheader = "List-Unsubscribe: <__UNSUBSCRIBE_URL__>\n";
 							$moreinheader = make_substitutions($moreinheader, $substitutionarray);
 						}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 96d6d4c0d89..e3a60fbf6ab 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1615,8 +1615,6 @@ class FormMail extends Form
 			$tmparray['__OTHER3__'] = 'Other3';
 			$tmparray['__OTHER4__'] = 'Other4';
 			$tmparray['__OTHER5__'] = 'Other5';
-			$tmparray['__CHECK_READ__'] = 'TagCheckMail';
-			$tmparray['__UNSUBSCRIBE__'] = 'TagUnsubscribe';
 			//,'__PERSONALIZED__' => 'Personalized'	// Hidden because not used yet in mass emailing
 
 			$onlinepaymentenabled = 0;

From a0446ee1196cdcff9e9e05aab5416c5d5ad4d6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 23 Feb 2023 21:16:25 +0100
Subject: [PATCH 078/300] doc

---
 htdocs/delivery/class/delivery.class.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 9a11302e5bd..975ee6cbfb6 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2011-2023 Philippe Grand	     <philippe.grand@atoo-net.com>
  * Copyright (C) 2013      Florian Henry	     <florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2023      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
@@ -113,6 +114,9 @@ class Delivery extends CommonObject
 	 */
 	public $statuts;
 
+	/**
+	 * @var DeliveryLine[] lines
+	 */
 	public $lines = array();
 
 
@@ -1150,7 +1154,6 @@ class Delivery extends CommonObject
 }
 
 
-
 /**
  *  Management class of delivery note lines
  */
@@ -1203,13 +1206,23 @@ class DeliveryLine extends CommonObjectLine
 	public $product_ref;
 	public $product_label;
 
+	public $price;
+
 	public $fk_origin_line;
 	public $origin_id;
 
-	public $price;
-
+	/**
+	 * @var int origin line ID
+	 */
 	public $origin_line_id;
 
+	/**
+	 * @var int origin line ID
+	 * @deprecated
+	 * @see $origin_line_id
+	 */
+	public $commande_ligne_id;
+
 
 	/**
 	 *	Constructor

From 4068b1db87f0439180b96c37f82fef23ba524376 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 21:19:01 +0100
Subject: [PATCH 079/300] Fix link for read or unsubscribe must use a unique
 hash

---
 htdocs/admin/mailing.php                             |  2 +-
 htdocs/admin/mails.php                               |  3 ++-
 htdocs/admin/mails_emailing.php                      |  8 +++++---
 htdocs/comm/mailing/card.php                         | 12 ++++++------
 htdocs/core/actions_massactions.inc.php              |  2 +-
 htdocs/core/actions_sendmails.inc.php                |  2 +-
 htdocs/core/tpl/massactions_pre.tpl.php              |  2 +-
 .../core/actions_massactions_mail.inc.php            |  1 -
 htdocs/public/emailing/mailing-read.php              |  6 +++---
 htdocs/public/emailing/mailing-unsubscribe.php       |  6 ++++--
 scripts/emailings/mailing-send.php                   |  6 +++---
 11 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 19effcdfd2e..8a6f6522606 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -155,7 +155,7 @@ if (!empty($conf->global->MAILING_EMAIL_ERRORSTO) && !isValidEmail($conf->global
 	print ' '.img_warning($langs->trans("BadEMail"));
 }
 print '</td>';
-print '<td class="hideonsmartphone"><span class="opacitymedium">webmaster@example.com></span></td>';
+print '<td class="hideonsmartphone"><span class="opacitymedium">'.dol_escape_htmltag('<webmaster@example.com>').'</span></td>';
 print '</tr>';
 
 print '<tr class="oddeven"><td>';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index e9a8132188c..06f4dfdea85 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -48,13 +48,14 @@ if ($action == 'test' || ($action == 'send' && $trackid = 'test')) {
 
 $substitutionarrayfortest = array(
 	'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-	'__CHECK_READ__' => (!empty($object) && is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '',
+	'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefinedtag&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-undefinedtag", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0" />',
 	'__USER_LOGIN__' => $user->login,
 	'__USER_EMAIL__' => $user->email,
 	'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
 	'__SENDEREMAIL_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
 	'__ID__' => 'RecipientIdRecord',
 	//'__EMAIL__' => 'RecipientEMail',				// Done into actions_sendmails
+	'__LOGIN__' => $user->login,
 	'__LASTNAME__' => 'RecipientLastname',
 	'__FIRSTNAME__' => 'RecipientFirstname',
 	'__ADDRESS__'=> 'RecipientAddress',
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index b9cb57e0d80..1f638be3286 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -42,11 +42,13 @@ if ($action == 'test' || $action == 'send') {
 
 $substitutionarrayfortest = array(
 	'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
-	'__ID__' => 'RecipientIdRecord',
-	//'__EMAIL__' => 'RecipientEMail',				// Done into actions_sendmails
-	'__CHECK_READ__' => (!empty($object) && is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '',
+	'__CHECK_READ__' => '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefinedtag&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-undefinedtag", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0"/>',
+	'__USER_LOGIN__' => $user->login,
+	'__USER_EMAIL__' => $user->email,
 	'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
 	'__SENDEREMAIL_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
+	'__ID__' => 'RecipientIdRecord',
+	//'__EMAIL__' => 'RecipientEMail',				// Done into actions_sendmails
 	'__LOGIN__' => $user->login,
 	'__LASTNAME__' => 'RecipientLastname',
 	'__FIRSTNAME__' => 'RecipientFirstname',
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 1fec22ea979..066fbedef51 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -248,9 +248,9 @@ if (empty($reshook)) {
 						$substitutionarray['__OTHER5__'] = $other5;
 						$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
 						$substitutionarray['__SENDEREMAIL_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
-						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" target="_blank" rel="noopener noreferrer">'.$langs->trans("MailUnsubcribe").'</a>';
-						$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid;
+						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY.'-'.$obj->tag.'-'.$obj->email.'-'.$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY.'-'.$obj->tag.'-'.$obj->email.'-'.$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid).'" target="_blank" rel="noopener noreferrer">'.$langs->trans("MailUnsubcribe").'</a>';
+						$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY.'-'.$obj->tag.'-'.$obj->email.'-'.$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid);
 
 						$onlinepaymentenabled = 0;
 						if (isModEnabled('paypal')) {
@@ -480,9 +480,9 @@ if (empty($reshook)) {
 			// other are set at begin of page
 			$substitutionarray['__EMAIL__'] = $object->sendto;
 			$substitutionarray['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
-			$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefinedintestmode&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->sendto).'&mtid=0" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-			$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag=undefinedintestmode&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->sendto).'&mtid=0" target="_blank" rel="noopener noreferrer">'.$langs->trans("MailUnsubcribe").'</a>';
-			$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag=undefinedintestmode&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->sendto).'&mtid=0';
+			$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefinedintestmode&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-undefinedintestmode-".$obj->sendto."-0", 'md5').'&email='.urlencode($obj->sendto).'&mtid=0" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+			$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag=undefinedintestmode&unsuscrib=1&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-undefinedintestmode-".$obj->sendto."-0", 'md5').'&email='.urlencode($obj->sendto).'&mtid=0" target="_blank" rel="noopener noreferrer">'.$langs->trans("MailUnsubcribe").'</a>';
+			$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag=undefinedintestmode&unsuscrib=1&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-undefinedintestmode-".$obj->sendto."-0", 'md5').'&email='.urlencode($obj->sendto).'&mtid=0';
 
 			// Subject and message substitutions
 			complete_substitutions_array($substitutionarray, $langs, $targetobject);
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index c526f9312a0..460b6407789 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -469,7 +469,7 @@ if (!$error && $massaction == 'confirm_presend') {
 					$substitutionarray['__ID__']    = ($oneemailperrecipient ? join(', ', array_keys($listofqualifiedobj)) : $objecttmp->id);
 					$substitutionarray['__REF__']   = ($oneemailperrecipient ? join(', ', $listofqualifiedref) : $objecttmp->ref);
 					$substitutionarray['__EMAIL__'] = $thirdparty->email;
-					$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+					$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefined&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-undefined", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 
 					$parameters = array('mode'=>'formemail');
 
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 4f7580bb8ca..ab8a30455ff 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -346,7 +346,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 			// Make substitution in email content
 			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 			$substitutionarray['__EMAIL__'] = $sendto;
-			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($object->thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefined&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-undefined", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
 
 			$parameters = array('mode'=>'formemail');
 			complete_substitutions_array($substitutionarray, $langs, $object, $parameters);
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index ce36d2bb899..817ec534b4b 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -282,7 +282,7 @@ if ($massaction == 'presend') {
 	$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 
 	$substitutionarray['__EMAIL__'] = $sendto;
-	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($object->thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+	$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag=undefined&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-undefined", 'md5').'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 	$substitutionarray['__PERSONALIZED__'] = ''; // deprecated
 	$substitutionarray['__CONTACTCIVNAME__'] = '';
 
diff --git a/htdocs/eventorganization/core/actions_massactions_mail.inc.php b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
index 5398291e69f..2e03777c572 100644
--- a/htdocs/eventorganization/core/actions_massactions_mail.inc.php
+++ b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
@@ -191,7 +191,6 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 			}
 			$substitutionarray['__EVENTORGANIZATION_ICS_LINK__'] = $html_link;
 			$substitutionarray['__EVENTORGANIZATION_URL_LINK__'] = $url_link;
-			$substitutionarray['__CHECK_READ__'] = '<img src="' . DOL_MAIN_URL_ROOT . '/public/emailing/mailing-read.php?tag=' . urlencode($attendees->thirdparty->tag) . '&securitykey=' . urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) . '" width="1" height="1" style="width:1px;height:1px" border="0"/>';
 
 			$parameters = array('mode' => 'formemail');
 
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index 5829c62dbd7..2382639ab6e 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -85,17 +85,17 @@ $securitykey = GETPOST('securitykey');
 
 dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
 
-if ($securitykey != $conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) {
+if ($securitykey != dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-".$tag."-".$email."-".$mtid, 'md5')) {
 	print 'Bad security key value.';
 	exit;
 }
 
-if (!empty($tag)) {
+if (!empty($tag) && $tag != 'undefined') {
 	dol_syslog("public/emailing/mailing-read.php : Update status of email target and thirdparty for tag ".$tag, LOG_DEBUG);
 
 	$sql = "SELECT mc.rowid, mc.email, mc.statut, mc.source_type, mc.source_id, m.entity";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."mailing as m";
-	$sql .= " WHERE mc.fk_mailing = m.rowid AND mc.tag='".$db->escape($tag)."'";
+	$sql .= " WHERE mc.fk_mailing = m.rowid AND mc.tag = '".$db->escape($tag)."'";
 
 	$resql = $db->query($sql);
 	if (!$resql) dol_print_error($db);
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index a5291d06b7f..f4ca2b10031 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -61,6 +61,8 @@ global $user, $conf, $langs;
 
 $langs->loadLangs(array("main", "mails"));
 
+$mtid = GETPOST('mtid');
+$email = GETPOST('email');
 $tag = GETPOST('tag');	// To retreive the emailing, and recipient
 $unsuscrib = GETPOST('unsuscrib');
 $securitykey = GETPOST('securitykey');
@@ -70,9 +72,9 @@ $securitykey = GETPOST('securitykey');
  * Actions
  */
 
-dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
+dol_syslog("public/emailing/mailing-unsubscribe.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
 
-if ($securitykey != getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')) {
+if ($securitykey != dol_hash(getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')."-".$tag."-".$email."-".$mtid, 'md5')) {
 	print 'Bad security key value.';
 	exit;
 }
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 3e79be8472c..f2aeecec444 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -229,9 +229,9 @@ if ($resql) {
 						$substitutionarray['__OTHER5__'] = $other5;
 						$substitutionarray['__USER_SIGNATURE__'] = $signature; // Signature is empty when ran from command line or taken from user in parameter)
 						$substitutionarray['__SIGNATURE__'] = $signature; // For backward compatibility
-						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
-						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid.'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
-						$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'&email='.urlencode($obj->email).'&mtid='.$obj->rowid;
+						$substitutionarray['__CHECK_READ__'] = '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($obj->tag).'&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid).'" width="1" height="1" style="width:1px;height:1px" border="0"/>';
+						$substitutionarray['__UNSUBSCRIBE__'] = '<a href="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid).'" target="_blank">'.$langs->trans("MailUnsubcribe").'</a>';
+						$substitutionarray['__UNSUBSCRIBE_URL__'] = DOL_MAIN_URL_ROOT.'/public/emailing/mailing-unsubscribe.php?tag='.urlencode($obj->tag).'&unsuscrib=1&securitykey='.dol_hash($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY."-".$obj->tag."-".$obj->email."-".$obj->rowid, "md5").'&email='.urlencode($obj->email).'&mtid='.((int) $obj->rowid);
 
 						$onlinepaymentenabled = 0;
 						if (!empty($conf->paypal->enabled)) {

From 7ec32d2458807731446be5c0f8cc214c9cbd23cb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 21:28:58 +0100
Subject: [PATCH 080/300] Fix phpunit

---
 htdocs/projet/class/task.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index fea80f6d13a..7ff5d651fed 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -811,6 +811,8 @@ class Task extends CommonObjectLine
 	 * @param   array   $search_array_options Array of search
 	 * @param   int     $loadextras         Fetch all Extrafields on each task
 	 * @param	int		$loadRoleMode		1= will test Roles on task;  0 used in delete project action
+	 * @param	string	$sortfield			Sort field
+	 * @param	string	$sortorder			Sort order
 	 * @return 	array						Array of tasks
 	 */
 	public function getTasksArray($usert = null, $userp = null, $projectid = 0, $socid = 0, $mode = 0, $filteronproj = '', $filteronprojstatus = '-1', $morewherefilter = '', $filteronprojuser = 0, $filterontaskuser = 0, $extrafields = array(), $includebilltime = 0, $search_array_options = array(), $loadextras = 0, $loadRoleMode = 1, $sortfield = '', $sortorder = '')

From 52f325c74eaab83172f2d1d4d2fb4b4a7e6207f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Feb 2023 21:34:54 +0100
Subject: [PATCH 081/300] clean code

---
 htdocs/loan/card.php                     | 14 +++++++-------
 htdocs/loan/class/loan.class.php         |  6 ++++--
 htdocs/loan/class/loanschedule.class.php |  2 +-
 htdocs/loan/schedule.php                 |  4 ++--
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 921784e4c21..661a727268f 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -350,22 +350,22 @@ if ($action == 'create') {
 		// Accountancy_account_capital
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
 		print '<td>';
-		print $formaccounting->select_account(GETPOST('accountancy_account_capital') ?GETPOST('accountancy_account_capital') : $conf->global->LOAN_ACCOUNTING_ACCOUNT_CAPITAL, 'accountancy_account_capital', 1, '', 1, 1);
+		print $formaccounting->select_account(GETPOST('accountancy_account_capital') ?GETPOST('accountancy_account_capital') : getDolGlobalString('LOAN_ACCOUNTING_ACCOUNT_CAPITAL'), 'accountancy_account_capital', 1, '', 1, 1);
 		print '</td></tr>';
 
 		// Accountancy_account_insurance
 		print '<tr><td class="fieldrequired">'.$langs->trans("LoanAccountancyInsuranceCode").'</td>';
 		print '<td>';
-		print $formaccounting->select_account(GETPOST('accountancy_account_insurance') ?GETPOST('accountancy_account_insurance') : $conf->global->LOAN_ACCOUNTING_ACCOUNT_INSURANCE, 'accountancy_account_insurance', 1, '', 1, 1);
+		print $formaccounting->select_account(GETPOST('accountancy_account_insurance') ?GETPOST('accountancy_account_insurance') : getDolGlobalString('LOAN_ACCOUNTING_ACCOUNT_INSURANCE'), 'accountancy_account_insurance', 1, '', 1, 1);
 		print '</td></tr>';
 
 		// Accountancy_account_interest
 		print '<tr><td class="fieldrequired">'.$langs->trans("LoanAccountancyInterestCode").'</td>';
 		print '<td>';
-		print $formaccounting->select_account(GETPOST('accountancy_account_interest') ?GETPOST('accountancy_account_interest') : $conf->global->LOAN_ACCOUNTING_ACCOUNT_INTEREST, 'accountancy_account_interest', 1, '', 1, 1);
+		print $formaccounting->select_account(GETPOST('accountancy_account_interest') ?GETPOST('accountancy_account_interest') : getDolGlobalString('LOAN_ACCOUNTING_ACCOUNT_INTEREST'), 'accountancy_account_interest', 1, '', 1, 1);
 		print '</td></tr>';
-	} else // For external software
-	{
+	} else {
+		// For external software
 		// Accountancy_account_capital
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("LoanAccountancyCapitalCode").'</td>';
 		print '<td><input name="accountancy_account_capital" size="16" value="'.$object->accountancy_account_capital.'">';
@@ -441,11 +441,11 @@ if ($id > 0) {
 					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= $formproject->select_projects(-1, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
 					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 					$morehtmlref .= '</form>';
 				} else {
-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, -1, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 				}
 			} else {
 				if (!empty($object->fk_project)) {
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 54ad6dfb92b..951d430e96f 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2014-2018  Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2018  Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2023  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
@@ -66,6 +66,9 @@ class Loan extends CommonObject
 	public $account_capital;
 	public $account_insurance;
 	public $account_interest;
+	public $accountancy_account_capital;
+	public $accountancy_account_insurance;
+	public $accountancy_account_interest;
 
 	/**
 	 * @var integer|string date_creation
@@ -641,7 +644,6 @@ class Loan extends CommonObject
 		$this->fk_bank = 1;
 		$this->label = 'SPECIMEN';
 		$this->specimen = 1;
-		$this->socid = 1;
 		$this->account_capital = 16;
 		$this->account_insurance = 616;
 		$this->account_interest = 518;
diff --git a/htdocs/loan/class/loanschedule.class.php b/htdocs/loan/class/loanschedule.class.php
index 50314ce99fc..2618d50c6fd 100644
--- a/htdocs/loan/class/loanschedule.class.php
+++ b/htdocs/loan/class/loanschedule.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2017       Florian HENRY           <florian.henry@atm-consulting.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023  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
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index fc91fc2f86d..61d763b693e 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -161,11 +161,11 @@ if (!empty($conf->project->enabled)) {
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
 				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
 				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= $formproject->select_projects(-1, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, -1, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
 			}
 		}
 	} else {

From fe5f08afe340809b84a5dff9fea7841a5f906d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 23 Feb 2023 21:36:22 +0100
Subject: [PATCH 082/300] clean code

---
 htdocs/loan/card.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 661a727268f..65d9d5da9b1 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -76,7 +76,7 @@ if ($reshook < 0) {
 }
 if (empty($reshook)) {
 	// Classify paid
-	if ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->loan->write) {
+	if ($action == 'confirm_paid' && $confirm == 'yes' && $user->hasRight('loan', 'write')) {
 		$object->fetch($id);
 		$result = $object->setPaid($user);
 		if ($result > 0) {
@@ -87,7 +87,7 @@ if (empty($reshook)) {
 	}
 
 	// Delete loan
-	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->write) {
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->hasRight('loan', 'write')) {
 		$object->fetch($id);
 		$result = $object->delete($user);
 		if ($result > 0) {
@@ -100,12 +100,12 @@ if (empty($reshook)) {
 	}
 
 	// Add loan
-	if ($action == 'add' && $user->rights->loan->write) {
+	if ($action == 'add' && $user->hasRight('loan', 'write')) {
 		if (!$cancel) {
 			$datestart = dol_mktime(12, 0, 0, GETPOST('startmonth', 'int'), GETPOST('startday', 'int'), GETPOST('startyear', 'int'));
-			$dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int'));
+			$dateend = dol_mktime(12, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int'));
 			$capital = price2num(GETPOST('capital'));
-			$rate	   = price2num(GETPOST('rate'));
+			$rate = price2num(GETPOST('rate'));
 
 			if (!$capital) {
 				$error++; $action = 'create';
@@ -168,23 +168,23 @@ if (empty($reshook)) {
 			header("Location: list.php");
 			exit();
 		}
-	} elseif ($action == 'update' && $user->rights->loan->write) {
+	} elseif ($action == 'update' && $user->hasRight('loan', 'write')) {
 		// Update record
 		if (!$cancel) {
 			$result = $object->fetch($id);
 
 			$datestart = dol_mktime(12, 0, 0, GETPOST('startmonth', 'int'), GETPOST('startday', 'int'), GETPOST('startyear', 'int'));
-			$dateend	= dol_mktime(12, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int'));
-			$capital	= price2num(GETPOST('capital'));
+			$dateend = dol_mktime(12, 0, 0, GETPOST('endmonth', 'int'), GETPOST('endday', 'int'), GETPOST('endyear', 'int'));
+			$capital = price2num(GETPOST('capital'));
 
 			if (!$capital) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("LoanCapital")), null, 'errors');
 				$action = 'edit';
 			} else {
 				$object->datestart = $datestart;
-				$object->dateend	        = $dateend;
-				$object->capital	        = $capital;
-				$object->nbterm		        = GETPOST("nbterm", 'int');
+				$object->dateend = $dateend;
+				$object->capital = $capital;
+				$object->nbterm = GETPOST("nbterm", 'int');
 				$object->rate = price2num(GETPOST("rate", 'alpha'));
 				$object->insurance_amount = price2num(GETPOST('insurance_amount', 'int'));
 
@@ -225,7 +225,7 @@ if (empty($reshook)) {
 	}
 
 	// Link to a project
-	if ($action == 'classin' && $user->rights->loan->write) {
+	if ($action == 'classin' && $user->hasRight('loan', 'write')) {
 		$object->fetch($id);
 		$result = $object->setProject($projectid);
 		if ($result < 0) {
@@ -233,7 +233,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'setlabel' && $user->rights->loan->write) {
+	if ($action == 'setlabel' && $user->hasRight('loan', 'write')) {
 		$object->fetch($id);
 		$result = $object->setValueFrom('label', GETPOST('label'), '', '', 'text', '', $user, 'LOAN_MODIFY');
 		if ($result < 0) {
@@ -426,13 +426,13 @@ if ($id > 0) {
 
 		$morehtmlref = '<div class="refidno">';
 		// Ref loan
-		$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->loan->write, 'string', '', 0, 1);
-		$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, $user->rights->loan->write, 'string', '', null, null, '', 1);
+		$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->hasRight('loan', 'write'), 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, $user->hasRight('loan', 'write'), 'string', '', null, null, '', 1);
 		// Project
 		if (isModEnabled('project')) {
 			$langs->loadLangs(array("projects"));
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->loan->write) {
+			if ($user->hasRight('loan', 'write')) {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				}
@@ -740,17 +740,17 @@ if ($id > 0) {
 				print '<div class="tabsAction">';
 
 				// Edit
-				if (($object->paid == 0 || $object->paid == 2) && $user->rights->loan->write) {
+				if (($object->paid == 0 || $object->paid == 2) && $user->hasRight('loan', 'write')) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a></div>';
 				}
 
 				// Emit payment
-				if (($object->paid == 0 || $object->paid == 2) && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write) {
+				if (($object->paid == 0 || $object->paid == 2) && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->hasRight('loan', 'write')) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&action=create&token='.newToken().'">'.$langs->trans("DoPayment").'</a></div>';
 				}
 
 				// Classify 'paid'
-				if (($object->paid == 0 || $object->paid == 2) && round($staytopay) <= 0 && $user->rights->loan->write) {
+				if (($object->paid == 0 || $object->paid == 2) && round($staytopay) <= 0 && $user->hasRight('loan', 'write')) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/loan/card.php?id='.$object->id.'&action=paid&token='.newToken().'">'.$langs->trans("ClassifyPaid").'</a></div>';
 				}
 

From ed60d4fe22e5a8d259967093b5530313f6efe6f0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 21:40:56 +0100
Subject: [PATCH 083/300] Debug v18

---
 htdocs/core/class/html.form.class.php | 16 +++++++++-------
 htdocs/projet/tasks/time.php          | 14 +++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 855fb711a86..a5d93f75202 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7009,8 +7009,8 @@ class Form
 
 		$retstring = '<span class="nowraponall">';
 
-		$hourSelected = 0;
-		$minSelected = 0;
+		$hourSelected = '';
+		$minSelected = '';
 
 		// Hours
 		if ($iSecond != '') {
@@ -7024,14 +7024,14 @@ class Form
 			$retstring .= '<select class="flat" id="select_'.$prefix.'hour" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').'>';
 			for ($hour = 0; $hour < 25; $hour++) {	// For a duration, we allow 24 hours
 				$retstring .= '<option value="'.$hour.'"';
-				if ($hourSelected == $hour) {
+				if (is_numeric($hourSelected) && $hourSelected == $hour) {
 					$retstring .= " selected";
 				}
 				$retstring .= ">".$hour."</option>";
 			}
 			$retstring .= "</select>";
 		} elseif ($typehour == 'text' || $typehour == 'textselect') {
-			$retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">';
+			$retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour right" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">';
 		} else {
 			return 'BadValueForParameterTypeHour';
 		}
@@ -7046,21 +7046,23 @@ class Form
 		if ($minunderhours) {
 			$retstring .= '<br>';
 		} else {
-			$retstring .= '<span class="hideonsmartphone">&nbsp;</span>';
+			if ($typehour != 'text') {
+				$retstring .= '<span class="hideonsmartphone">&nbsp;</span>';
+			}
 		}
 
 		if ($typehour == 'select' || $typehour == 'textselect') {
 			$retstring .= '<select class="flat" id="select_'.$prefix.'min" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').'>';
 			for ($min = 0; $min <= 55; $min = $min + 5) {
 				$retstring .= '<option value="'.$min.'"';
-				if ($minSelected == $min) {
+				if (is_numeric($minSelected) && $minSelected == $min) {
 					$retstring .= ' selected';
 				}
 				$retstring .= '>'.$min.'</option>';
 			}
 			$retstring .= "</select>";
 		} elseif ($typehour == 'text') {
-			$retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';
+			$retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute right" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';
 		}
 
 		if ($typehour != 'text') {
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 30f2a867af0..57f1a5259cb 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2021	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2023	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
@@ -1921,20 +1921,20 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// Duration - Time spent
 			print '<td class="liste_titre right">';
 
-			$durationtouse_start = 0;
+			$durationtouse_start = '';
 			if ($search_timespent_starthour || $search_timespent_startmin) {
 				$durationtouse_start = ($search_timespent_starthour * 3600 + $search_timespent_startmin * 60);
 			}
-			print '<div class="nowraponall">'.$langs->trans('from').'&nbsp;';
-			$form->select_duration('search_timespent_duration_start', $durationtouse_start, 0, 'text');
+			print '<div class="nowraponall">'.$langs->trans('from').' ';
+			print $form->select_duration('search_timespent_duration_start', $durationtouse_start, 0, 'text', 0, 1);
 			print '</div>';
 
-			$durationtouse_end = 0;
+			$durationtouse_end = '';
 			if ($search_timespent_endhour || $search_timespent_endmin) {
 				$durationtouse_end = ($search_timespent_endhour * 3600 + $search_timespent_endmin * 60);
 			}
-			print '<div class="nowraponall">'.$langs->trans('at').'&nbsp;';
-			$form->select_duration('search_timespent_duration_end', $durationtouse_end, 0, 'text');
+			print '<div class="nowraponall">'.$langs->trans('at').' ';
+			print $form->select_duration('search_timespent_duration_end', $durationtouse_end, 0, 'text', 0, 1);
 			print '</div>';
 
 			print '</td>';

From 78e3275fa983fd0958c6051485c269eb391858c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 23 Feb 2023 21:50:11 +0100
Subject: [PATCH 084/300] doc

---
 htdocs/core/lib/fourn.lib.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index c658916e359..7093493dad9 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2006		Marc Barilley		<marc@ocebo.com>
  * Copyright (C) 2011-2013  Philippe Grand      <philippe.grand@atoo-net.com>
- * Copyright (C) 2022       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022-2023  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
@@ -29,10 +29,10 @@
 /**
  * Prepare array with list of tabs
  *
- * @param   Object	$object		Object related to tabs
+ * @param   FactureFournisseur	$object		Object related to tabs
  * @return  array				Array of tabs to show
  */
-function facturefourn_prepare_head($object)
+function facturefourn_prepare_head(FactureFournisseur $object)
 {
 	global $db, $langs, $conf;
 
@@ -56,7 +56,7 @@ function facturefourn_prepare_head($object)
 	}
 
 	//if ($fac->mode_reglement_code == 'PRE')
-	if (!empty($conf->paymentbybanktransfer->enabled)) {
+	if (isModEnabled('paymentbybanktransfer')) {
 		$nbStandingOrders = 0;
 		$sql = "SELECT COUNT(pfd.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";
@@ -132,8 +132,8 @@ function facturefourn_prepare_head($object)
 /**
  * Prepare array with list of tabs
  *
- * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to show
+ * @param   CommandeFournisseur	$object		Object related to tabs
+ * @return  array							Array of tabs to show
  */
 function ordersupplier_prepare_head(CommandeFournisseur $object)
 {

From 4c6b8d7a20e1fa1ff56ef9a1f19d1d19cb772f39 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 22:14:10 +0100
Subject: [PATCH 085/300] Fix navigation into timespent

---
 htdocs/projet/tasks/time.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 139a1711658..d97dee9a11b 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -1112,23 +1112,27 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
+	// Task
+
 	// Show section with information of task. If id of task is not defined and project id defined, then $projectidforalltimes is not empty.
 	if (empty($projectidforalltimes) && empty($allprojectforuser)) {
 		$head = task_prepare_head($object);
 		print dol_get_fiche_head($head, 'task_time', $langs->trans("Task"), -1, 'projecttask', 0, '', 'reposition');
 
 		if ($action == 'deleteline') {
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST("lineid", 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
+			$urlafterconfirm = $_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST("lineid", 'int').($withproject ? '&withproject=1' : '');
+			print $form->formconfirm($urlafterconfirm, $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
 		}
 
 		$param = ($withproject ? '&withproject=1' : '');
+		$param .= ($param ? '&' : '').'id='.$object->id;		// ID of task
 		$linkback = $withproject ? '<a href="'.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.'">'.$langs->trans("BackToList").'</a>' : '';
 
 		if (!GETPOST('withproject') || empty($projectstatic->id)) {
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 			$object->next_prev_filter = " fk_projet IN (".$db->sanitize($projectsListId).")";
 		} else {
-			$object->next_prev_filter = " fk_projet = ".$projectstatic->id;
+			$object->next_prev_filter = " fk_projet = ".((int) $projectstatic->id);
 		}
 
 		$morehtmlref = '';
@@ -1225,17 +1229,15 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 
 	if ($projectstatic->id > 0 || $allprojectforuser > 0) {
-		if ($action == 'deleteline' && !empty($projectidforalltimes)) {
-			print $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST('lineid', 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
-		}
-
 		// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 		$hookmanager->initHooks(array('tasktimelist'));
 
 		$formconfirm = '';
 
 		if ($action == 'deleteline' && !empty($projectidforalltimes)) {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST('lineid', 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
+			// We must use projectidprojectid if on list of timespent of project and id=taskid if on list of timespent of a task
+			$urlafterconfirm = $_SERVER["PHP_SELF"]."?".($projectstatic->id > 0 ? 'projectid='.$projectstatic->id : ($object->id > 0 ? "id=".$object->id : '')).'&lineid='.GETPOST('lineid', 'int').($withproject ? '&withproject=1' : '')."&contextpage=".urlencode($contextpage);
+			$formconfirm = $form->formconfirm($urlafterconfirm, $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
 		}
 
 		// Call Hook formConfirm

From 043e0b6ce06318da1f18854d419affbedae24005 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 22:26:14 +0100
Subject: [PATCH 086/300] Merge branch '17.0' of
 git@github.com:Dolibarr/dolibarr.git into develop

---
 htdocs/core/class/commondocgenerator.class.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 319c2a7ef2c..26d90d54fb8 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -70,11 +70,6 @@ abstract class CommonDocGenerator
 	 */
 	public $scandir;
 
-	/**
-	 * @var string model name
-	 */
-	public $name;
-
 	/**
 	 * @var string model description (short text)
 	 */

From 34252d34c461f647653b33151e6dadd4a5ea8b7c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 23 Feb 2023 22:31:21 +0100
Subject: [PATCH 087/300] Debug v18

---
 htdocs/public/emailing/mailing-unsubscribe.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index f4ca2b10031..286818bad1c 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -91,6 +91,7 @@ if (empty($tag) || ($unsuscrib != '1')) {
 
 $head = '';
 $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+
 llxHeader($head, $langs->trans("MailUnsubcribe"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
 
 dol_syslog("public/emailing/mailing-unsubscribe.php : Launch unsubscribe requests", LOG_DEBUG);
@@ -107,12 +108,12 @@ if (!$resql) {
 $obj = $db->fetch_object($resql);
 
 if (empty($obj)) {
-	print 'Email tag not found. Operation canceled.';
+	print 'Emailing tag '.$tag.' not found in database. Operation canceled.';
 	llxFooter('', 'private');
 	exit;
 }
 if (empty($obj->email)) {
-	print 'Email for this tag not valid. Operation canceled.';
+	print 'Email for this tag is not valid. Operation canceled.';
 	llxFooter('', 'private');
 	exit;
 }

From 9e59a3d60173f0a8a98cbeb4f401438cccb71c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 24 Feb 2023 08:57:44 +0100
Subject: [PATCH 088/300] fix warning

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

diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 6992612592d..663bb96a7b6 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -446,7 +446,7 @@ class RssParser
 							$itemDescription = sanitizeVal((string) $item['description']);
 							$itemPubDate = sanitizeVal((string) $item['pubdate']);
 							$itemId = sanitizeVal((string) $item['guid']);
-							$itemAuthor = sanitizeVal((string) $item['author']);
+							$itemAuthor = sanitizeVal((string) ($item['author'] ?? ''));
 						}
 
 						// Loop on each category

From e403b416376ac2f4c438a483a087e6708895666c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 24 Feb 2023 09:14:25 +0100
Subject: [PATCH 089/300] translations

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

diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 9e80e36b119..e74539132f6 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -118,6 +118,27 @@ BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
 UsersHome=Home users and groups
 MembersHome=Home Membership
 ThirdpartiesHome=Home Thirdparties
+productindex=Home products and services
+mrpindex=Home MRP
+commercialindex=Home commercial
+projectsindex=Home projects
+invoiceindex=Home invoices
+hrmindex=Home invoices
 TicketsHome=Home Tickets
+stockindex=Home stocks
+sendingindex=Home shippings
+receptionindex=Home receivings
+activityindex=Home activity
+proposalindex=Home proposal
+ordersindex=Home orders
+orderssuppliersindex=Home orders suppliers
+contractindex=Home contracts
+interventionindex=Home interventions
+suppliersproposalsindex=Home suppliers proposals
+donationindex=Home donations
+specialexpensesindex=Home specials expenses
+expensereportindex=Home expensereport
+mailingindex=Home mailing
+opensurveyindex=Home opensurvey
 AccountancyHome=Home Accountancy
 ValidatedProjects=Validated projects

From e90f41da9d4f6b05ba6be7fd024dd6d408fc8e17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 24 Feb 2023 09:28:30 +0100
Subject: [PATCH 090/300] Update rssparser.class.php

---
 htdocs/core/class/rssparser.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 663bb96a7b6..6d83fd6d6da 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -36,6 +36,8 @@ class RssParser
 	 */
 	public $error = '';
 
+	public $feed_version;
+
 	private $_format = '';
 	private $_urlRSS;
 	private $_language;

From 67d9934aa1e63dff6a21dcf0054cd10fc664ae28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Fri, 24 Feb 2023 10:54:23 +0100
Subject: [PATCH 091/300] pagination works with any font

---
 htdocs/core/lib/pdf.lib.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index e4f6b169e93..d6b8365c730 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2019       Lenin Rivas           	<lenin.rivas@servcom-it.com>
  * Copyright (C) 2020       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2021-2022	Anthony Berton       	<anthony.berton@bb2a.fr>
+ * Copyright (C) 2023       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
@@ -1287,11 +1288,14 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		}
 	}
 	// Show page nb only on iso languages (so default Helvetica font)
-	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica') {
+	// if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica') {
 		$pdf->SetXY($dims['wk'] - $dims['rm'] - 18, -$posy);
-		//$pdf->MultiCell(18, 2, $pdf->getPageNumGroupAlias().' / '.$pdf->getPageGroupAlias(), 0, 'R', 0);
-		$pdf->MultiCell(18, 2, $pdf->PageNo().' / '.$pdf->getAliasNbPages(), 0, 'R', 0);
-	}
+		// $pdf->MultiCell(18, 2, $pdf->getPageNumGroupAlias().' / '.$pdf->getPageGroupAlias(), 0, 'R', 0);
+		// $pdf->MultiCell(18, 2, $pdf->PageNo().' / '.$pdf->getAliasNbPages(), 0, 'R', 0); // doesn't works with all fonts
+		// $pagination = $pdf->getAliasNumPage().' / '.$pdf->getAliasNbPages(); // works with $pdf->Cell
+		$pagination = $pdf->PageNo().' / '.$pdf->getNumPages();
+		$pdf->MultiCell(18, 2, $pagination, 0, 'R', 0);
+	// }
 
 	//  Show Draft Watermark
 	if (!empty($watermark)) {

From 5f8bff123b8e3d53dea3bb0180fc88c154a5777b Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Fri, 24 Feb 2023 11:05:54 +0100
Subject: [PATCH 092/300] fix process

---
 htdocs/core/ajax/flowjs-server.php | 3 ---
 htdocs/public/test/test_forms.php  | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/ajax/flowjs-server.php b/htdocs/core/ajax/flowjs-server.php
index 480dba39195..962db0b8548 100644
--- a/htdocs/core/ajax/flowjs-server.php
+++ b/htdocs/core/ajax/flowjs-server.php
@@ -35,9 +35,6 @@ if (!defined('NOREQUIREAJAX')) {
 if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (!defined('NOCSRFCHECK')) {
-	define('NOCSRFCHECK', '1');
-}
 // If there is no need to load and show top and left menu
 if (!defined("NOLOGIN")) {
 	define("NOLOGIN", '1');
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index e041e1d98fa..50693000442 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -109,7 +109,7 @@ print '<br><br>'."\n";
 
 // Test6a: Upload of big files
 print "Test 6a: Upload of big files<br>\n";
-print "The file will be uploaded in the directory: documents/test_form/temp/<br>\n";
+print "The file will be uploaded in the directory: documents/test/temp/<br>\n";
 
 if (is_file(DOL_DOCUMENT_ROOT.'/includes/flowjs/flow.js')) {
 	print '<button id="buttonbigupload" type="button">Browse...</button>';
@@ -121,7 +121,7 @@ if (is_file(DOL_DOCUMENT_ROOT.'/includes/flowjs/flow.js')) {
 	jQuery(document).ready(function() {
 		var flow = new Flow({
 			target:"'.DOL_URL_ROOT.'/core/ajax/flowjs-server.php", 
-			query:{module:"test_form"},
+			query:{module:"test", token:"'.newToken().'"},
 			testChunks:false
 		});
 		';
@@ -166,7 +166,7 @@ if (is_file(DOL_DOCUMENT_ROOT.'/includes/flowjs/flow.js')) {
 	';
 	print '</script>';
 } else {
-	print "If this message displays, please add flow.js file which can be found here :https://github.com/flowjs/flow.js and place the js lib in htdocs/includes/flowjs/<br>\n";
+	print "If this message displays, please add flow.js and flow.min.js files which can be found here: https://github.com/flowjs/flow.js and place the js lib in htdocs/includes/flowjs/<br>\n";
 }
 
 print '</div>';

From fdf374fdee7706a47fb9c693e2bdcec2ca7d635f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 11:15:17 +0100
Subject: [PATCH 093/300] Add field to protect a file by a password

---
 htdocs/install/mysql/migration/17.0.0-18.0.0.sql | 1 +
 htdocs/install/mysql/tables/llx_ecm_files.sql    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index 5f4a0f2cdd0..522940b62ed 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -82,4 +82,5 @@ ALTER TABLE llx_supplier_proposal ADD INDEX idx_supplier_proposal_fk_user_valid
 ALTER TABLE llx_supplier_proposal ADD INDEX idx_supplier_proposal_fk_projet (fk_projet);
 ALTER TABLE llx_supplier_proposal ADD INDEX idx_supplier_proposal_fk_account(fk_account);
 
+ALTER TABLE llx_ecm_files ADD COLUMN share_pass varchar(32) after share;
 
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index cf9f3a8f148..14952d45594 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -22,6 +22,7 @@ CREATE TABLE llx_ecm_files
   ref				varchar(128),					-- contains hash from filename+filepath
   label				varchar(128) NOT NULL,			-- contains hash of file content
   share				varchar(128) NULL,				-- contains hash for file sharing
+  share_pass		varchar(32) NULL,				-- password to access the file (encoded with dolEncrypt)
   entity			integer DEFAULT 1 NOT NULL,		-- multi company id
   filepath    		varchar(255) NOT NULL,   	    -- relative to dolibarr document dir. Example module/def
   filename          varchar(255) NOT NULL,			-- file name only without any directory

From 27c15c523dcfe685e8266500f0d23cc49a396e2d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 11:27:14 +0100
Subject: [PATCH 094/300] CSS

---
 htdocs/product/reassort.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index 22c475ab337..bfe12d7efe2 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -465,7 +465,7 @@ if ($resql) {
 		print $product->getNomUrl(1, '', 16);
 		//if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow"));
 		print '</td>';
-		print '<td>'.$product->label.'</td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($product->label).'">'.dol_escape_htmltag($product->label).'</td>';
 
 		if (isModEnabled("service") && $type == 1) {
 			print '<td class="center">';
@@ -502,7 +502,7 @@ if ($resql) {
 			if ($nb_warehouse > 1) {
 				foreach ($warehouses_list as &$wh) {
 					print '<td class="right">';
-					print price(empty($product->stock_warehouse[$wh['id']]->real) ? 0 : $product->stock_warehouse[$wh['id']]->real, 0, $langs, 1, 0);
+					print price(empty($product->stock_warehouse[$wh['id']]->real) ? 0 : price2num($product->stock_warehouse[$wh['id']]->real, 'MS'), 0, $langs, 1, 0);
 					print '</td>';
 				}
 			}
@@ -523,7 +523,7 @@ if ($resql) {
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			print '<td class="left">'.dol_escape_htmltag($objp->unit_short).'</td>';
 		}
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
 		print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$product->id.'">'.$langs->trans("Movements").'</a>';
 		print '</td>';

From ca6e7dcb4164359b1d3fdf97b6200544030b5c36 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 11:31:46 +0100
Subject: [PATCH 095/300] Fix sql error

---
 htdocs/product/stock/stockatdate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 69893559dfa..da6627942c5 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -276,10 +276,10 @@ if (!empty($canvas)) {
 	$sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 }
 if ($fk_warehouse > 0) {
-	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
+	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.pmp, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
 	$sql .= ' p.tms, p.duration, p.tobuy, p.stock';
 } else {
-	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
+	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.pmp, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
 	$sql .= ' p.tms, p.duration, p.tobuy, p.stock';
 }
 // Add where from hooks

From c266681379762dc853c6ba568418f598a384b5a0 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 24 Feb 2023 11:32:56 +0100
Subject: [PATCH 096/300] fix : Warning: Constant DOL_URL_ROOT already defined
 in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/filemanagerdol/connectors/php/config.inc.php
 on line 40

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

diff --git a/htdocs/core/filemanagerdol/connectors/php/config.inc.php b/htdocs/core/filemanagerdol/connectors/php/config.inc.php
index 848153d84fc..368b82c42e7 100644
--- a/htdocs/core/filemanagerdol/connectors/php/config.inc.php
+++ b/htdocs/core/filemanagerdol/connectors/php/config.inc.php
@@ -37,7 +37,7 @@ $pos = strstr($uri, '/'); // $pos contient alors url sans nom domaine
 if ($pos == '/') {
 	$pos = ''; // si $pos vaut /, on le met a ''
 }
-define('DOL_URL_ROOT', $pos);
+//define('DOL_URL_ROOT', $pos);
 $entity = ((!empty($_SESSION['dol_entity']) && $_SESSION['dol_entity'] > 1) ? $_SESSION['dol_entity'] : null);
 
 // SECURITY: You must explicitly enable this "connector". (Set it to "true").

From 2a16db0e860fe5aa5705f4532630c969f2fbc81b Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Fri, 24 Feb 2023 11:35:07 +0100
Subject: [PATCH 097/300] fix :  Warning: Undefined variable  in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/filemanagerdol/browser/default/browser.php
 on line 52

---
 htdocs/core/filemanagerdol/browser/default/browser.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/core/filemanagerdol/browser/default/browser.php b/htdocs/core/filemanagerdol/browser/default/browser.php
index 0c1b29d12b2..1cf6d8612c2 100644
--- a/htdocs/core/filemanagerdol/browser/default/browser.php
+++ b/htdocs/core/filemanagerdol/browser/default/browser.php
@@ -49,6 +49,7 @@ if (!empty($conf->modules_parts['theme'])) {	// This slow down
 }
 
 //print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
+$themeparam = '';
 print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
 ?>
 		<script type="text/javascript" src="js/fckxml.js"></script>

From 2cb3e260f7fdc6be019de07663ded89b6e3f3d04 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Fri, 24 Feb 2023 12:20:39 +0100
Subject: [PATCH 098/300] add module verification

---
 htdocs/core/ajax/flowjs-server.php | 9 ++++++++-
 htdocs/public/test/test_forms.php  | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/ajax/flowjs-server.php b/htdocs/core/ajax/flowjs-server.php
index 962db0b8548..d520c57c9c5 100644
--- a/htdocs/core/ajax/flowjs-server.php
+++ b/htdocs/core/ajax/flowjs-server.php
@@ -62,7 +62,7 @@ $flowTotalSize = GETPOST('flowTotalSize', 'alpha');
 top_httphead();
 dol_syslog(join(',', $_GET));
 
-$result = true;
+$result = false;
 
 if (!empty($upload_dir)) {
 	$temp_dir = $upload_dir.'/'.$flowIdentifier;
@@ -71,6 +71,12 @@ if (!empty($upload_dir)) {
 	$upload_dir = DOL_DATA_ROOT.'/'.$module.'/temp/';
 }
 
+if ($module != "test" && !isModEnabled($module)) {
+	echo json_encode("The module ".$module." is not enabled");
+	header("HTTP/1.0 400");
+	die();
+}
+
 if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 	$chunk_file = $temp_dir.'/'.$flowFilename.'.part'.$flowChunkNumber;
 	if (file_exists($chunk_file)) {
@@ -83,6 +89,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
 	if (file_exists($upload_dir.'/'.$flowFilename)) {
 		echo json_encode('File '.$flowIdentifier.' was already uploaded');
 		header("HTTP/1.0 200 Ok");
+		die();
 	} elseif (!empty($_FILES)) foreach ($_FILES as $file) {
 		// check the error status
 		if ($file['error'] != 0) {
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index 50693000442..b7ed524e297 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -161,6 +161,11 @@ if (is_file(DOL_DOCUMENT_ROOT.'/includes/flowjs/flow.js')) {
 				$("#filespan").text("No file selected.");
 				$(this).hide();
 			})
+			flow.on("fileError", function(file, message){
+				console.log("Error on file upload",file, message);
+				$("#"+file.uniqueIdentifier+"pgbar").width(20+"%");
+				$("#"+file.uniqueIdentifier+"pgbar").children("span").text("ERROR UPLOAD");
+			});
 		}
 	})
 	';

From 393b0e7c4c48e7b826805795d3af095d69f0088b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 12:56:11 +0100
Subject: [PATCH 099/300] NEW Support multiselect in the warehouse selection
 combo box

---
 .../product/class/html.formproduct.class.php  | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index b4da53f4635..beb84f3e455 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -260,7 +260,7 @@ class FormProduct
 	/**
 	 *  Return list of warehouses
 	 *
-	 *  @param  string|int  $selected           Id of preselected warehouse ('' or '-1' for no value, 'ifone' and 'ifonenodefault' = select value if one value otherwise no value, '-2' to use the default value from setup)
+	 *  @param  string|int|array  $selected           Id of preselected warehouse ('' or '-1' for no value, 'ifone' and 'ifonenodefault' = select value if one value otherwise no value, '-2' to use the default value from setup)
 	 *  @param  string      $htmlname           Name of html select html
 	 *  @param  string      $filterstatus       warehouse status filter, following comma separated filter options can be used
 	 *                                          'warehouseopen' = select products from open warehouses,
@@ -272,17 +272,18 @@ class FormProduct
 	 *  @param	string	    $empty_label	    Empty label if needed (only if $empty=1)
 	 *  @param	int		    $showstock		    1=Show stock count
 	 *  @param	int	    	$forcecombo		    1=Force combo iso ajax select2
-	 *  @param	array	    $events			            Events to add to select2
-	 *  @param  string      $morecss                    Add more css classes to HTML select
+	 *  @param	array	    $events			    Events to add to select2
+	 *  @param  string      $morecss            Add more css classes to HTML select
 	 *  @param	array	    $exclude            Warehouses ids to exclude
 	 *  @param  int         $showfullpath       1=Show full path of name (parent ref into label), 0=Show only ref of current warehouse
 	 *  @param  bool|int    $stockMin           [=false] Value of minimum stock to filter or false not not filter by minimum stock
 	 *  @param  string      $orderBy            [='e.ref'] Order by
+	 *  @param	int			$multiselect		1=Allow multiselect
 	 * 	@return string					        HTML select
 	 *
 	 *  @throws Exception
 	 */
-	public function selectWarehouses($selected = '', $htmlname = 'idwarehouse', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $empty_label = '', $showstock = 0, $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $exclude = array(), $showfullpath = 1, $stockMin = false, $orderBy = 'e.ref')
+	public function selectWarehouses($selected = '', $htmlname = 'idwarehouse', $filterstatus = '', $empty = 0, $disabled = 0, $fk_product = 0, $empty_label = '', $showstock = 0, $forcecombo = 0, $events = array(), $morecss = 'minwidth200', $exclude = array(), $showfullpath = 1, $stockMin = false, $orderBy = 'e.ref', $multiselect = 0)
 	{
 		global $conf, $langs, $user, $hookmanager;
 
@@ -307,17 +308,20 @@ class FormProduct
 
 		if (strpos($htmlname, 'search_') !== 0) {
 			if (empty($user->fk_warehouse) || $user->fk_warehouse == -1) {
-				if (($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) {
+				if (is_scalar($selected) && ($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) {
 					$selected = $conf->global->MAIN_DEFAULT_WAREHOUSE;
 				}
 			} else {
-				if (($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+				if (is_scalar($selected) && ($selected == '-2' || $selected == 'ifone') && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
 					$selected = $user->fk_warehouse;
 				}
 			}
 		}
 
-		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled' : '').' id="'.$htmlname.'" name="'.($htmlname.($disabled ? '_disabled' : '')).'">';
+		$out .= '<select '.($multiselect ? 'multiple ' : '').'class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled' : '');
+		$out .= ' id="'.$htmlname.'" name="'.($htmlname.($multiselect?'[]':'').($disabled ? '_disabled' : '')).'"';
+		//$out .= ' placeholder="todo"'; 	// placeholder for select2 must be added by setting the id+placeholder js param when calling select2
+		$out .= '>';
 		if ($empty) {
 			$out .= '<option value="-1">'.($empty_label ? $empty_label : '&nbsp;').'</option>';
 		}
@@ -330,15 +334,21 @@ class FormProduct
 			}
 			if (($fk_product || ($showstock > 0)) && ($arraytypes['stock'] != 0 || ($showstock > 0))) {
 				if ($arraytypes['stock'] <= 0) {
-					$label .= ' <span class= \'text-warning\'>('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
+					$label .= ' <span class="text-warning">('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
 				} else {
-					$label .= ' <span class=\'opacitymedium\'>('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
+					$label .= ' <span class="opacitymedium">('.$langs->trans("Stock").':'.$arraytypes['stock'].')</span>';
 				}
 			}
 
 			$out .= '<option value="'.$id.'"';
-			if ($selected == $id || (preg_match('/^ifone/', $selected) && $nbofwarehouses == 1)) {
-				$out .= ' selected';
+			if (is_array($selected)) {
+				if (in_array($id, $selected)) {
+					$out .= ' selected';
+				}
+			} else {
+				if ($selected == $id || (preg_match('/^ifone/', $selected) && $nbofwarehouses == 1)) {
+					$out .= ' selected';
+				}
 			}
 			$out .= ' data-html="'.dol_escape_htmltag($label).'"';
 			$out .= '>';

From 093099ea4453e86bf43f14cd6c259581d21dad6d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 12:57:15 +0100
Subject: [PATCH 100/300] NEW Can select several warehouses into the view stock
 at date in past

---
 htdocs/product/class/product.class.php |  4 +-
 htdocs/product/stock/stockatdate.php   | 98 +++++++++++++++++---------
 2 files changed, 67 insertions(+), 35 deletions(-)

diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8a6cfd5419c..8939132cff9 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -5503,7 +5503,7 @@ class Product extends CommonObject
 	 * This function need a lot of load. If you use it on list, use a cache to execute it once for each product id.
 	 * If ENTREPOT_EXTRA_STATUS is set, filtering on warehouse status is possible.
 	 *
-	 * @param  	string 	$option 					'' = Load all stock info, also from closed and internal warehouses, 'nobatch', 'novirtual'
+	 * @param  	string 	$option 					'' = Load all stock info, also from closed and internal warehouses, 'nobatch' = do not load batch detail, 'novirtual' = do no load virtual detail
 	 * 												You can also filter on 'warehouseclosed', 'warehouseopen', 'warehouseinternal'
 	 * @param	int		$includedraftpoforvirtual	Include draft status of PO for virtual stock calculation
 	 * @param	int		$dateofvirtualstock			Date of virtual stock
@@ -5568,7 +5568,7 @@ class Product extends CommonObject
 			$this->db->free($result);
 
 			if (!preg_match('/novirtual/', $option)) {
-				$this->load_virtual_stock($includedraftpoforvirtual, $dateofvirtualstock); // This also load all arrays stats_xxx...
+				$this->load_virtual_stock($includedraftpoforvirtual, $dateofvirtualstock); // This load stock_theorique and also load all arrays stats_xxx...
 			}
 
 			return 1;
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index da6627942c5..075a8df857d 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -67,7 +67,21 @@ $search_nom = GETPOST('search_nom', 'alphanohtml');
 $now = dol_now();
 
 $productid = GETPOST('productid', 'int');
-$fk_warehouse = GETPOST('fk_warehouse', 'int');
+if (GETPOSTISARRAY('search_fk_warehouse')) {
+	$search_fk_warehouse = GETPOST('search_fk_warehouse', 'array:int');
+} else {
+	$search_fk_warehouse = array(GETPOST('search_fk_warehouse', 'int'));
+}
+// For backward compatibility
+if (GETPOST('fk_warehouse', 'int')) {
+	$search_fk_warehouse = array(GETPOST('fk_warehouse', 'int'));
+}
+// Clean value -1
+foreach ($search_fk_warehouse as $key => $val) {
+	if ($val == -1 || empty($val)) {
+		unset($search_fk_warehouse[$key]);
+	}
+}
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -111,7 +125,7 @@ if ($mode == 'future') {
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 	$date = '';
 	$productid = 0;
-	$fk_warehouse = 0;
+	$search_fk_warehouse = array();
 	$search_ref = '';
 	$search_nom = '';
 }
@@ -139,8 +153,8 @@ if ($date && $dateIsValid) {	// Avoid heavy sql if mandatory date is not defined
 	if ($productid > 0) {
 		$sql .= " AND ps.fk_product = ".((int) $productid);
 	}
-	if ($fk_warehouse > 0) {
-		$sql .= " AND ps.fk_entrepot = ".((int) $fk_warehouse);
+	if (! empty($search_fk_warehouse)) {
+		$sql .= " AND ps.fk_entrepot IN (".$db->sanitize(join(",", $search_fk_warehouse)).")";
 	}
 	$sql .= " GROUP BY fk_product, fk_entrepot";
 	//print $sql;
@@ -194,8 +208,8 @@ if ($date && $dateIsValid) {
 	if ($productid > 0) {
 		$sql .= " AND sm.fk_product = ".((int) $productid);
 	}
-	if ($fk_warehouse > 0) {
-		$sql .= " AND sm.fk_entrepot = ".((int) $fk_warehouse);
+	if (!empty($search_fk_warehouse)) {
+		$sql .= " AND sm.fk_entrepot IN (".$db->sanitize(join(",", $search_fk_warehouse)).")";
 	}
 	$sql .= " GROUP BY sm.fk_product, sm.fk_entrepot";
 	$resql = $db->query($sql);
@@ -246,7 +260,7 @@ $title = $langs->trans('StockAtDate');
 $sql = 'SELECT p.rowid, p.ref, p.label, p.description, p.price, p.pmp,';
 $sql .= ' p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
 $sql .= ' p.tms as datem, p.duration, p.tobuy, p.stock, ';
-if ($fk_warehouse > 0) {
+if (!empty($search_fk_warehouse)) {
 	$sql .= " SUM(p.pmp * ps.reel) as estimatedvalue, SUM(p.price * ps.reel) as sellvalue";
 	$sql .= ', SUM(ps.reel) as stock_reel';
 } else {
@@ -258,8 +272,8 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // N
 $sql .= $hookmanager->resPrint;
 
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
-if ($fk_warehouse > 0) {
-	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot = '.((int) $fk_warehouse);
+if (!empty($search_fk_warehouse)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON p.rowid = ps.fk_product AND ps.fk_entrepot IN ('.$db->sanitize(join(",", $search_fk_warehouse)).")";
 }
 // Add fields from hooks
 $parameters = array();
@@ -275,7 +289,7 @@ if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 if (!empty($canvas)) {
 	$sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 }
-if ($fk_warehouse > 0) {
+if (!empty($search_fk_warehouse)) {
 	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.pmp, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
 	$sql .= ' p.tms, p.duration, p.tobuy, p.stock';
 } else {
@@ -287,10 +301,10 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-if ($sortfield == 'stock_reel' && $fk_warehouse <= 0) {
+if ($sortfield == 'stock_reel' && empty($search_fk_warehouse)) {
 	$sortfield = 'stock';
 }
-if ($sortfield == 'stock' && $fk_warehouse > 0) {
+if ($sortfield == 'stock' && !empty($search_fk_warehouse)) {
 	$sortfield = 'stock_reel';
 }
 $sql .= $db->order($sortfield, $sortorder);
@@ -319,7 +333,6 @@ if ($date && $dateIsValid) {	// We avoid a heavy sql if mandatory parameter date
 }
 
 $i = 0;
-//print $sql;
 
 $helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|';
 $helpurl .= 'ES:M&oacute;dulo_Stocks';
@@ -361,10 +374,15 @@ print img_picto('', 'product', 'class="pictofiwedwidth"').' ';
 print '</span> ';
 print $form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, array(), 0, $langs->trans('Product'), 0, 'maxwidth300', 0, '', null, 1);
 
-print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddingrightonly">&nbsp;</span> ';
-print img_picto('', 'stock', 'class="pictofiwedwidth"');
-print '</span> ';
-print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifonenodefault'), 'fk_warehouse', '', 1, 0, 0, $langs->trans('Warehouse'), 0, 0, null, '', null, 1, false, 'e.ref');
+if ($mode != 'future') {
+	// A virtual stock in future has no sense on a per warehouse view, so no filter on warehouse is available for stock at date in future
+	print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddingrightonly">&nbsp;</span> ';
+	print img_picto('', 'stock', 'class="pictofixedwidth"').$langs->trans("Warehouse").' :';
+	print '</span> ';
+	$selected = ((GETPOSTISSET('search_fk_warehouse') || GETPOSTISSET('fk_warehouse')) ? $search_fk_warehouse : 'ifonenodefault');
+	print $formproduct->selectWarehouses($selected, 'search_fk_warehouse', '', 1, 0, 0, $langs->trans('Warehouse'), 0, 0, null, '', null, 1, false, 'e.ref', 1);
+}
+
 print '</div>';
 
 $parameters = array();
@@ -387,8 +405,10 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 $param .= '&mode='.$mode;
-if ($fk_warehouse > 0) {
-	$param .= '&fk_warehouse='.$fk_warehouse;
+if (!empty($search_fk_warehouse)) {
+	foreach ($search_fk_warehouse as $val) {
+		$param .= '&search_fk_warehouse[]='.$val;
+	}
 }
 if ($productid > 0) {
 	$param .= '&productid='.$productid;
@@ -414,7 +434,6 @@ if ($mode == 'future') {
 	$stocklabel = $langs->trans("VirtualStockAtDate");
 }
 
-//print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
@@ -446,7 +465,7 @@ print '</td>';
 print '</tr>';
 
 $fieldtosortcurrentstock = 'stock';
-if ($fk_warehouse > 0) {
+if (!empty($search_fk_warehouse)) {
 	$fieldtosortcurrentstock = 'stock_reel';
 }
 
@@ -506,9 +525,14 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}*/
 
 		$currentstock = '';
-		if ($fk_warehouse > 0) {
+		if (!empty($search_fk_warehouse)) {
 			//if ($productid > 0) {
-				$currentstock = $stock_prod_warehouse[$objp->rowid][$fk_warehouse];
+			foreach ($search_fk_warehouse as $val) {
+				if (!is_numeric($currentstock)) {
+					$currentstock = 0;
+				}
+				$currentstock += $stock_prod_warehouse[$objp->rowid][$val];
+			}
 			//} else {
 			//	$currentstock = $objp->stock_reel;
 			//}
@@ -521,17 +545,21 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}
 
 		if ($mode == 'future') {
-			$prod->load_stock('warehouseopen, warehouseinternal', 0, $dateendofday);
-			$stock = $prod->stock_theorique;
-			$prod->load_stock('warehouseopen, warehouseinternal', 0);
-			$virtualstock = $prod->stock_theorique;
+			$prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0, $dateendofday);
+			$stock = $prod->stock_theorique;		// virtual stock at a date
+			$prod->load_stock('warehouseopen,warehouseinternal,nobatch', 0);
+			$virtualstock = $prod->stock_theorique;	// virtual stock in infinite future
 		} else {
-			if ($fk_warehouse > 0) {
-				$stock = $currentstock - $movements_prod_warehouse[$objp->rowid][$fk_warehouse];
-				$nbofmovement = $movements_prod_warehouse_nb[$objp->rowid][$fk_warehouse];
+			$stock = $currentstock;
+			$nbofmovement = 0;
+			if (!empty($search_fk_warehouse)) {
+				foreach ($search_fk_warehouse as $val) {
+					$stock -= $movements_prod_warehouse[$objp->rowid][$val];
+					$nbofmovement += $movements_prod_warehouse_nb[$objp->rowid][$val];
+				}
 			} else {
-				$stock = $currentstock - $movements_prod[$objp->rowid];
-				$nbofmovement = $movements_prod_nb[$objp->rowid];
+				$stock -= $movements_prod[$objp->rowid];
+				$nbofmovement += $movements_prod_nb[$objp->rowid];
 			}
 		}
 
@@ -585,7 +613,11 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 			print '<td class="right">';
 			if ($nbofmovement > 0) {
-				print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$objp->rowid.($fk_warehouse > 0 ? '&search_warehouse='.$fk_warehouse : '').'">'.$langs->trans("Movements").'</a>';
+				print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$objp->rowid;
+				foreach ($search_fk_warehouse as $val) {
+					print ($val > 0 ? '&search_warehouse='.$val : '');
+				}
+				print '">'.$langs->trans("Movements").'</a>';
 				print ' <span class="tabs"><span class="badge">'.$nbofmovement.'</span></span>';
 			}
 			print '</td>';

From 904babed3ecb0cd78b8918a2ca768ba0e7f1ff14 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 13:28:19 +0100
Subject: [PATCH 101/300] Fix filter on warehouse must not be visible on stock
 at date in future

---
 htdocs/product/stock/stockatdate.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 69893559dfa..1f9b82a4392 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -361,10 +361,14 @@ print img_picto('', 'product', 'class="pictofiwedwidth"').' ';
 print '</span> ';
 print $form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, array(), 0, $langs->trans('Product'), 0, 'maxwidth300', 0, '', null, 1);
 
-print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddingrightonly">&nbsp;</span> ';
-print img_picto('', 'stock', 'class="pictofiwedwidth"');
-print '</span> ';
-print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifonenodefault'), 'fk_warehouse', '', 1, 0, 0, $langs->trans('Warehouse'), 0, 0, null, '', null, 1, false, 'e.ref');
+if ($mode != 'future') {
+	// A virtual stock in future has no sense on a per warehouse view, so no filter on warehouse is available for stock at date in future
+	print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddingrightonly">&nbsp;</span> ';
+	print img_picto('', 'stock', 'class="pictofiwedwidth"');
+	print '</span> ';
+	print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifonenodefault'), 'fk_warehouse', '', 1, 0, 0, $langs->trans('Warehouse'), 0, 0, null, '', null, 1, false, 'e.ref');
+}
+
 print '</div>';
 
 $parameters = array();

From ad84346cae11869e3594ab5efa1b4075071a1deb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 11:31:46 +0100
Subject: [PATCH 102/300] Fix sql error

---
 htdocs/product/stock/stockatdate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index 1f9b82a4392..4138841b3bb 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -276,10 +276,10 @@ if (!empty($canvas)) {
 	$sql .= " AND p.canvas = '".$db->escape($canvas)."'";
 }
 if ($fk_warehouse > 0) {
-	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
+	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.pmp, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
 	$sql .= ' p.tms, p.duration, p.tobuy, p.stock';
 } else {
-	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
+	$sql .= ' GROUP BY p.rowid, p.ref, p.label, p.description, p.price, p.pmp, p.price_ttc, p.price_base_type, p.fk_product_type, p.desiredstock, p.seuil_stock_alerte,';
 	$sql .= ' p.tms, p.duration, p.tobuy, p.stock';
 }
 // Add where from hooks

From a3a9d6e6a28448fde9650eff54fb4a729bf44d1c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 11:27:14 +0100
Subject: [PATCH 103/300] CSS

---
 htdocs/product/reassort.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index f3c354b88a4..b0f6f4b3283 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -464,7 +464,7 @@ if ($resql) {
 		print $product->getNomUrl(1, '', 16);
 		//if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow"));
 		print '</td>';
-		print '<td>'.$product->label.'</td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($product->label).'">'.dol_escape_htmltag($product->label).'</td>';
 
 		if (isModEnabled("service") && $type == 1) {
 			print '<td class="center">';
@@ -495,7 +495,7 @@ if ($resql) {
 			if ($nb_warehouse > 1) {
 				foreach ($warehouses_list as &$wh) {
 					print '<td class="right">';
-					print price(empty($product->stock_warehouse[$wh['id']]->real) ? 0 : $product->stock_warehouse[$wh['id']]->real, 0, $langs, 1, 0);
+					print price(empty($product->stock_warehouse[$wh['id']]->real) ? 0 : price2num($product->stock_warehouse[$wh['id']]->real, 'MS'), 0, $langs, 1, 0);
 					print '</td>';
 				}
 			}
@@ -514,7 +514,7 @@ if ($resql) {
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			print '<td class="left">'.$objp->unit_short.'</td>';
 		}
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
 		print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$product->id.'">'.$langs->trans("Movements").'</a>';
 		print '</td>';

From fae051deb4eeef7f6ac729c355a3fd577ef2e93c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 15:14:18 +0100
Subject: [PATCH 104/300] Fix warning

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

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 3d4a094c30b..deba6883277 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -3411,8 +3411,8 @@ if (!function_exists("llxFooter")) {
 		}
 
 		// Wrapper to add log when clicking on download or preview
-		if (isModEnabled('blockedlog') && is_object($object) && !empty($object->id) && $object->id > 0 && $object->statut > 0) {
-			if (in_array($object->element, array('facture'))) {       // Restrict for the moment to element 'facture'
+		if (isModEnabled('blockedlog') && is_object($object) && !empty($object->id) && $object->id > 0) {
+			if (in_array($object->element, array('facture')) && $object->statut > 0) {       // Restrict for the moment to element 'facture'
 				print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
 				?>
 				<script>

From f140036f37389341da450d7a1c84e2a43cd543dd Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Fri, 24 Feb 2023 15:59:43 +0100
Subject: [PATCH 105/300] FIX shipping list for external user

---
 htdocs/expedition/list.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 9b55ff46c14..4c6a764997b 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -71,7 +71,6 @@ $search_datedelivery_end = dol_mktime(23, 59, 59, GETPOST('search_datedelivery_e
 $search_datereceipt_start = dol_mktime(0, 0, 0, GETPOST('search_datereceipt_startmonth', 'int'), GETPOST('search_datereceipt_startday', 'int'), GETPOST('search_datereceipt_startyear', 'int'));
 $search_datereceipt_end = dol_mktime(23, 59, 59, GETPOST('search_datereceipt_endmonth', 'int'), GETPOST('search_datereceipt_endday', 'int'), GETPOST('search_datereceipt_endyear', 'int'));
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
-$socid = GETPOST('socid', 'int');
 $search_user = GETPOST('search_user', 'int');
 $search_sale = GETPOST('search_sale', 'int');
 $search_categ_cus = GETPOST("search_categ_cus", 'int');

From 3c58b1cfc75a4e44ca37630186d66922ab749285 Mon Sep 17 00:00:00 2001
From: Christophe Battarel <christophe@altairis.fr>
Date: Fri, 24 Feb 2023 16:28:15 +0100
Subject: [PATCH 106/300] add comment for Travis to play it again sam

---
 htdocs/expedition/list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 4c6a764997b..3b653aaf17b 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2016-2021 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
  * Copyright (C) 2020      Thibault FOUCART     <support@ptibogxiv.net>
+ * Copyright (C) 2023      Christophe Battarel	<christophe@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

From 3adc7dd2e9b3ac4512d2174da127daa496d7d1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 24 Feb 2023 16:45:07 +0100
Subject: [PATCH 107/300] set errors from object

---
 htdocs/adherents/class/adherent.class.php |  3 +--
 htdocs/core/class/commonobject.class.php  | 17 +++++++++++++++++
 htdocs/core/lib/functions.lib.php         |  2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index f8d37ff30ca..01b98f4b200 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1726,8 +1726,7 @@ class Adherent extends CommonObject
 				return -2;
 			}
 		} else {
-			$this->error = $subscription->error;
-			$this->errors = $subscription->errors;
+			$this->setErrorsFromObject($subscription);
 			$this->db->rollback();
 			return -1;
 		}
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 26c5beb0b73..e3c3dff2b7c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -669,6 +669,23 @@ abstract class CommonObject
 		}
 		return -1;
 	}
+
+	/**
+	 * setErrorsFromObject
+	 *
+	 * @param CommonObject $object commonobject
+	 * @return void
+	 */
+	public function setErrorsFromObject($object)
+	{
+		if (!empty($object->error)) {
+			$this->error = $object->error;
+		}
+		if (!empty($object->errors)) {
+			$this->errors = array_merge($this->errors, $object->errors);
+		}
+	}
+
 	/**
 	 * getTooltipContentArray
 	 *
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 66b25f6740f..2c993af7deb 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1672,7 +1672,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 		if (!array_key_exists($level, $logLevels)) {
 			throw new Exception('Incorrect log level');
 		}
-		if ($level > $conf->global->SYSLOG_LEVEL) {
+		if ($level > getDolGlobalInt('SYSLOG_LEVEL')) {
 			return;
 		}
 

From 2d454d68159646470cb1e96f10329c17b1598f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 24 Feb 2023 16:50:41 +0100
Subject: [PATCH 108/300] set errors from object

---
 htdocs/comm/action/class/actioncomm.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 9269446c2ab..51ec0986fc7 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -742,8 +742,7 @@ class ActionComm extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-					$this->errors += $hookmanager->errors;
-					$this->error = $hookmanager->error;
+					$this->setErrorsFromObject($hookmanager);
 					$error++;
 				}
 			}

From e4e472b4ffbf1102b9cdcfd822c8b5cfec44f73f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 24 Feb 2023 16:55:26 +0100
Subject: [PATCH 109/300] set errors from object

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

diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index bd42149ea07..892c3f77687 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -1175,8 +1175,7 @@ class SupplierProposal extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-					$this->errors += $hookmanager->errors;
-					$this->error = $hookmanager->error;
+					$this->setErrorsFromObject($hookmanager);
 					$error++;
 				}
 			}

From 652a215a07ffaace796ab0695fe941085764c483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 24 Feb 2023 16:57:39 +0100
Subject: [PATCH 110/300] set errors from object

---
 htdocs/comm/propal/class/propal.class.php          | 3 +--
 htdocs/commande/class/commande.class.php           | 6 ++----
 htdocs/compta/facture/class/facture.class.php      | 6 ++----
 htdocs/contrat/class/contrat.class.php             | 3 +--
 htdocs/expensereport/class/expensereport.class.php | 3 +--
 htdocs/fichinter/class/fichinter.class.php         | 3 +--
 htdocs/fourn/class/fournisseur.commande.class.php  | 3 +--
 7 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a285662e7f6..04e81ce1c6a 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1505,8 +1505,7 @@ class Propal extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-					$this->errors += $hookmanager->errors;
-					$this->error = $hookmanager->error;
+					$this->setErrorsFromObject($hookmanager);
 					$error++;
 				}
 			}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 38e3accc1fb..abff23d19ee 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1279,8 +1279,7 @@ class Commande extends CommonOrder
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-					$this->errors += $hookmanager->errors;
-					$this->error = $hookmanager->error;
+					$this->setErrorsFromObject($hookmanager);
 					$error++;
 				}
 			}
@@ -1436,8 +1435,7 @@ class Commande extends CommonOrder
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
-				$this->errors += $hookmanager->errors;
-				$this->error = $hookmanager->error;
+				$this->setErrorsFromObject($hookmanager);
 				$error++;
 			}
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 8e3119ff424..9fa6b0e0bc9 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1330,8 +1330,7 @@ class Facture extends CommonInvoice
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-					$this->errors += $hookmanager->errors;
-					$this->error = $hookmanager->error;
+					$this->setErrorsFromObject($hookmanager);
 					$error++;
 				}
 			}
@@ -1465,8 +1464,7 @@ class Facture extends CommonInvoice
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 			if ($reshook < 0) {
-				$this->errors += $hookmanager->errors;
-				$this->error = $hookmanager->error;
+				$this->setErrorsFromObject($hookmanager);
 				$error++;
 			}
 
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 48a3e4053a4..ae9be094fea 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2630,8 +2630,7 @@ class Contrat extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $clonedObj, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-					$this->errors += $hookmanager->errors;
-					$this->error = $hookmanager->error;
+					$this->setErrorsFromObject($hookmanager);
 					$error++;
 				}
 			}
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 30862623810..76a0614da18 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -512,8 +512,7 @@ class ExpenseReport extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-					$this->errors += $hookmanager->errors;
-					$this->error = $hookmanager->error;
+					$this->setErrorsFromObject($hookmanager);
 					$error++;
 				}
 			}
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 62f05f8750d..da199f42206 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1249,8 +1249,7 @@ class Fichinter extends CommonObject
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-					$this->errors += $hookmanager->errors;
-					$this->error = $hookmanager->error;
+					$this->setErrorsFromObject($hookmanager);
 					$error++;
 				}
 			}
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 86be26b17ef..99685ea140c 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1758,8 +1758,7 @@ class CommandeFournisseur extends CommonOrder
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if ($reshook < 0) {
-					$this->errors += $hookmanager->errors;
-					$this->error = $hookmanager->error;
+					$this->setErrorsFromObject($hookmanager);
 					$error++;
 				}
 			}

From b6089882af30cf856a5dbbde2f7783a0af918c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 24 Feb 2023 17:01:00 +0100
Subject: [PATCH 111/300] set errors from object

---
 htdocs/adherents/class/adherent.class.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 01b98f4b200..f2e84e5127a 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1789,13 +1789,11 @@ class Adherent extends CommonObject
 					}
 				} else {
 					$error++;
-					$this->error = $acct->error;
-					$this->errors = $acct->errors;
+					$this->setErrorsFromObject($acct);
 				}
 			} else {
 				$error++;
-				$this->error = $acct->error;
-				$this->errors = $acct->errors;
+				$this->setErrorsFromObject($acct);
 			}
 		}
 

From 829e818b6d13db88f30661a557ece1bdb4d71c7d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 18:06:08 +0100
Subject: [PATCH 112/300] Update bonprelevement.class.php

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

diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 0db7f85a4ec..0f5546e5e46 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -813,7 +813,7 @@ class BonPrelevement extends CommonObject
 			$sql .= " AND f.total_ttc > 0";
 			$sql .= " AND pfd.ext_payment_id IS NULL";
 			if ($did > 0) {
-				$sql .= " AND pfd.rowid = '".$this->db->escape($did)."'";
+				$sql .= " AND pfd.rowid = ".((int) $did);
 			}
 			dol_syslog(__METHOD__."::Read invoices,", LOG_DEBUG);
 

From e2ecc3d091d8ce562e5d3d4eaf817596efacca71 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 18:15:17 +0100
Subject: [PATCH 113/300] Comment dangerous part for the moment

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

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 077e008e768..81a3d03328a 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -300,6 +300,8 @@ if ($event->type == 'payout.created') {
 } elseif ($event->type == 'payment_intent.succeeded') {		// Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
 	// TODO: create fees
 	// TODO: Redirect to paymentok.php
+
+	/* TODO Enable this only if this is a payment of a Dolibarr bon_prelevement only
 	include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
 	$object = $event->data->object;
 	$invoice_id = $object->metadata->dol_id;
@@ -442,6 +444,7 @@ if ($event->type == 'payout.created') {
 			}
 		}
 	}
+	*/
 } elseif ($event->type == 'payment_intent.payment_failed') {
 	// TODO: Redirect to paymentko.php
 } elseif ($event->type == 'checkout.session.completed') {		// Called when making payment with new Checkout method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).

From d49caabe51ce3d585ca897d7cca73a21d86d4377 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 18:42:53 +0100
Subject: [PATCH 114/300] Fix css

---
 htdocs/compta/facture/prelevement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 8a9d4e6c198..884d19a221b 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -941,7 +941,7 @@ if ($object->id > 0) {
 			print '</td>';
 
 			// Amount
-			print '<td class="center">'.price($obj->amount).'</td>';
+			print '<td class="center"><span class="amount">'.price($obj->amount).'</span></td>';
 
 			// Date process
 			print '<td class="center">'.dol_print_date($db->jdate($obj->date_traite), 'day')."</td>\n";

From 62c6178269f980252c06852d11095016fe899017 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 23:15:54 +0100
Subject: [PATCH 115/300] Work on SEPA Stripe Payments

---
 htdocs/compta/facture/prelevement.php         |  45 ++-
 .../class/bonprelevement.class.php            |  66 ++--
 htdocs/core/class/commoninvoice.class.php     | 356 ++++--------------
 .../install/mysql/migration/17.0.0-18.0.0.sql |   2 +
 .../mysql/tables/llx_prelevement_demande.sql  |   2 +
 htdocs/public/stripe/ipn.php                  |   3 +-
 htdocs/stripe/class/stripe.class.php          |  58 ++-
 7 files changed, 199 insertions(+), 333 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 884d19a221b..782e16ec71b 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -325,7 +325,7 @@ if ($object->id > 0) {
 		$sql .= " WHERE fk_facture = ".((int) $object->id);
 	}
 	$sql .= " AND pfd.traite = 0";
-	$sql .= " AND pfd.ext_payment_id IS NULL";
+	$sql .= " AND pfd.type = 'ban'";
 	$sql .= " ORDER BY pfd.date_demande DESC";
 
 	$resql = $db->query($sql);
@@ -700,7 +700,7 @@ if ($object->id > 0) {
 		$sql .= " WHERE fk_facture = ".((int) $object->id);
 	}
 	$sql .= " AND pfd.traite = 0";
-	$sql .= " AND pfd.ext_payment_id IS NULL";
+	$sql .= " AND pfd.type = 'ban'";
 
 	$resql = $db->query($sql);
 	if ($resql) {
@@ -817,7 +817,8 @@ if ($object->id > 0) {
 	print '</tr>';
 
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande,";
-	$sql .= " pfd.date_traite as date_traite, pfd.amount,";
+	$sql .= " pfd.date_traite as date_traite, pfd.amount, pfd.fk_prelevement_bons,";
+	$sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status,";
 	$sql .= " u.rowid as user_id, u.email, u.lastname, u.firstname, u.login, u.statut as user_status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
@@ -828,7 +829,7 @@ if ($object->id > 0) {
 		$sql .= " WHERE fk_facture = ".((int) $object->id);
 	}
 	$sql .= " AND pfd.traite = 0";
-	$sql .= " AND pfd.ext_payment_id IS NULL";
+	$sql .= " AND pfd.type = 'ban'";
 	$sql .= " ORDER BY pfd.date_demande DESC";
 
 	$resql = $db->query($sql);
@@ -868,19 +869,36 @@ if ($object->id > 0) {
 			print '<td class="center"><span class="opacitymedium">'.$langs->trans("OrderWaiting").'</span></td>';
 
 			// Link to make payment now
-			print '<td>';
+			print '<td class="center">';
+			if ($obj->fk_prelevement_bons > 0) {
+				$withdrawreceipt = new BonPrelevement($db);
+				$withdrawreceipt->id = $obj->fk_prelevement_bons;
+				$withdrawreceipt->ref = $obj->ref;
+				$withdrawreceipt->date_trans = $db->jdate($obj->date_trans);
+				$withdrawreceipt->date_credit = $db->jdate($obj->date_credit);
+				$withdrawreceipt->date_creation = $db->jdate($obj->datec);
+				$withdrawreceipt->statut = $obj->status;
+				$withdrawreceipt->status = $obj->status;
+				//$withdrawreceipt->credite = $db->jdate($obj->credite);
+
+				print $withdrawreceipt->getNomUrl(1);
+			}
+
 			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
 				$langs->load("stripe");
+				if ($obj->fk_prelevement_bons > 0) {
+					print ' &nbsp; ';
+				}
 				print '<a href="'.$_SERVER["PHP_SELF"].'?action=sepastripepayment&paymentservice=stripesepa&token='.newToken().'&did='.$obj->rowid.'&id='.$object->id.'&type='.urlencode($type).'">'.img_picto('', 'stripe', 'class="pictofixedwidth"').$langs->trans("RequestDirectDebitWithStripe").'</a>';
 			}
 			print '</td>';
 
 			//
-			print '<td align="center">-</td>';
+			print '<td class="center">-</td>';
 
 			// Actions
 			print '<td class="right">';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'&did='.$obj->rowid.'&type='.$type.'">';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'&did='.$obj->rowid.'&type='.urlencode($type).'">';
 			print img_delete();
 			print '</a></td>';
 
@@ -897,7 +915,7 @@ if ($object->id > 0) {
 	// Past requests
 
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande, pfd.date_traite, pfd.fk_prelevement_bons, pfd.amount,";
-	$sql .= " pb.ref,";
+	$sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status,";
 	$sql .= " u.rowid as user_id, u.email, u.lastname, u.firstname, u.login, u.statut as user_status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
@@ -908,7 +926,7 @@ if ($object->id > 0) {
 		$sql .= " WHERE fk_facture = ".((int) $object->id);
 	}
 	$sql .= " AND pfd.traite = 1";
-	$sql .= " AND pfd.ext_payment_id IS NULL";
+	$sql .= " AND pfd.type = 'ban'";
 	$sql .= " ORDER BY pfd.date_demande DESC";
 
 	$result = $db->query($sql);
@@ -944,7 +962,7 @@ if ($object->id > 0) {
 			print '<td class="center"><span class="amount">'.price($obj->amount).'</span></td>';
 
 			// Date process
-			print '<td class="center">'.dol_print_date($db->jdate($obj->date_traite), 'day')."</td>\n";
+			print '<td class="center">'.dol_print_date($db->jdate($obj->date_traite), 'dayhour', 'tzuserrel')."</td>\n";
 
 			// Link to payment request done
 			print '<td class="center">';
@@ -952,6 +970,13 @@ if ($object->id > 0) {
 				$withdrawreceipt = new BonPrelevement($db);
 				$withdrawreceipt->id = $obj->fk_prelevement_bons;
 				$withdrawreceipt->ref = $obj->ref;
+				$withdrawreceipt->date_trans = $db->jdate($obj->date_trans);
+				$withdrawreceipt->date_credit = $db->jdate($obj->date_credit);
+				$withdrawreceipt->date_creation = $db->jdate($obj->datec);
+				$withdrawreceipt->statut = $obj->status;
+				$withdrawreceipt->status = $obj->status;
+				//$withdrawreceipt->credite = $db->jdate($obj->credite);
+
 				print $withdrawreceipt->getNomUrl(1);
 			}
 			print "</td>\n";
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 0f5546e5e46..70836cb50cf 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -128,9 +128,7 @@ class BonPrelevement extends CommonObject
 
 		$this->factures = array();
 
-		$this->methodes_trans = array();
-
-		$this->methodes_trans[0] = "Internet";
+		$this->methodes_trans = array(0 => 'Internet', 2 => 'Email', 3 => 'Api');
 
 		$this->fetched = 0;
 	}
@@ -509,7 +507,7 @@ class BonPrelevement extends CommonObject
 	 *
 	 *	@param	User		$user		id of user
 	 *	@param 	int	$date		date of action
-	 *	@param	string		$method		method of transmision to bank
+	 *	@param	string		$method		method of transmision to bank (0=Internet, 1=Api...)
 	 *	@return	int						>0 if OK, <0 if KO
 	 */
 	public function set_infotrans($user, $date, $method)
@@ -737,7 +735,11 @@ class BonPrelevement extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Create a direct debit order or a credit transfer order
+	 *	Create a BAN payment order:
+	 *  - Select waiting requests from prelevement_demande (or use $did if provided)
+	 *  - Check BAN values
+	 *  - Then create a direct debit order or a credit transfer order
+	 *  - Link the order with the prelevement_demande lines
 	 *  TODO delete params banque and agence when not necessary
 	 *
 	 *	@param 	int		$banque			dolibarr mysoc bank
@@ -747,7 +749,7 @@ class BonPrelevement extends CommonObject
 	 *  @param  string  $executiondate	Date to execute the transfer
 	 *  @param	int	    $notrigger		Disable triggers
 	 *  @param	string	$type			'direct-debit' or 'bank-transfer'
-	 *  @param	int		$did			ID of payment request
+	 *  @param	int		$did			ID of an existing payment request. If $did is defined, no entry
 	 *	@return	int						<0 if KO, No of invoice included into file if OK
 	 */
 	public function create($banque = 0, $agence = 0, $mode = 'real', $format = 'ALL', $executiondate = '', $notrigger = 0, $type = 'direct-debit', $did = 0)
@@ -755,7 +757,7 @@ class BonPrelevement extends CommonObject
 		// phpcs:enable
 		global $conf, $langs, $user;
 
-		dol_syslog(__METHOD__."::Bank=".$banque." Office=".$agence." mode=".$mode." format=".$format, LOG_DEBUG);
+		dol_syslog(__METHOD__." Bank=".$banque." Office=".$agence." mode=".$mode." format=".$format, LOG_DEBUG);
 
 		require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
 		require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
@@ -815,7 +817,7 @@ class BonPrelevement extends CommonObject
 			if ($did > 0) {
 				$sql .= " AND pfd.rowid = ".((int) $did);
 			}
-			dol_syslog(__METHOD__."::Read invoices,", LOG_DEBUG);
+			dol_syslog(__METHOD__." Read invoices,", LOG_DEBUG);
 
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -827,17 +829,17 @@ class BonPrelevement extends CommonObject
 					$factures[$i] = $row; // All fields
 					if ($row[7] == 0) {
 						$error++;
-						dol_syslog(__METHOD__."::Read invoices error Found a null invoice", LOG_ERR);
+						dol_syslog(__METHOD__." Read invoices error Found a null invoice", LOG_ERR);
 						$this->invoice_in_error[$row[0]] = "Error for invoice id ".$row[0].", found a null amount";
 						break;
 					}
 					$i++;
 				}
 				$this->db->free($resql);
-				dol_syslog(__METHOD__."::Read invoices, ".$i." invoices to withdraw", LOG_DEBUG);
+				dol_syslog(__METHOD__." Read invoices, ".$i." invoices to withdraw", LOG_DEBUG);
 			} else {
 				$error++;
-				dol_syslog(__METHOD__."::Read invoices error ".$this->db->error(), LOG_ERR);
+				dol_syslog(__METHOD__." Read invoices error ".$this->db->error(), LOG_ERR);
 			}
 		}
 
@@ -847,7 +849,7 @@ class BonPrelevement extends CommonObject
 
 			// Check BAN
 			$i = 0;
-			dol_syslog(__METHOD__."::Check BAN", LOG_DEBUG);
+			dol_syslog(__METHOD__." Check BAN", LOG_DEBUG);
 
 			if (count($factures) > 0) {
 				foreach ($factures as $key => $fac) {
@@ -878,19 +880,19 @@ class BonPrelevement extends CommonObject
 								$i++;
 								//dol_syslog(__METHOD__."::RIB is ok", LOG_DEBUG);
 							} else {
-								dol_syslog(__METHOD__."::Check BAN Error on default bank number IBAN/BIC for thirdparty reported by verif() ".$tmpinvoice->socid." ".$soc->name, LOG_WARNING);
+								dol_syslog(__METHOD__." Check BAN Error on default bank number IBAN/BIC for thirdparty reported by verif() ".$tmpinvoice->socid." ".$soc->name, LOG_WARNING);
 								$this->invoice_in_error[$fac[0]] = "Error on default bank number IBAN/BIC for invoice ".$tmpinvoice->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 								$this->thirdparty_in_error[$soc->id] = "Error on default bank number IBAN/BIC for invoice ".$tmpinvoice->getNomUrl(0)." for thirdparty ".$soc->getNomUrl(0);
 							}
 						} else {
-							dol_syslog(__METHOD__."::Check BAN Failed to read company", LOG_WARNING);
+							dol_syslog(__METHOD__." Check BAN Failed to read company", LOG_WARNING);
 						}
 					} else {
-						dol_syslog(__METHOD__."::Check BAN Failed to read invoice", LOG_WARNING);
+						dol_syslog(__METHOD__." Check BAN Failed to read invoice", LOG_WARNING);
 					}
 				}
 			} else {
-				dol_syslog(__METHOD__."::Check BAN No invoice to process", LOG_WARNING);
+				dol_syslog(__METHOD__." Check BAN No invoice to process", LOG_WARNING);
 			}
 		}
 
@@ -934,13 +936,14 @@ class BonPrelevement extends CommonObject
 			if (!$error) {
 				$ref = substr($year, -2).$month;
 
+				// Get next free nuber for the ref of bon
 				$sql = "SELECT substring(ref from char_length(ref) - 1)";	// To extract "YYMMXX" from "TYYMMXX"
 				$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons";
 				$sql .= " WHERE ref LIKE '_".$this->db->escape($ref)."%'";
 				$sql .= " AND entity = ".((int) $conf->entity);
 				$sql .= " ORDER BY ref DESC LIMIT 1";
 
-				dol_syslog(get_class($this)."::create", LOG_DEBUG);
+				dol_syslog(get_class($this)." get next free number", LOG_DEBUG);
 				$resql = $this->db->query($sql);
 
 				if ($resql) {
@@ -964,7 +967,7 @@ class BonPrelevement extends CommonObject
 
 					$this->filename = $dir.'/'.$ref.'.xml';
 
-					// Create withdraw receipt in database
+					// Create withdraw order in database
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
 					$sql .= "ref, entity, datec, type";
 					$sql .= ") VALUES (";
@@ -981,11 +984,11 @@ class BonPrelevement extends CommonObject
 						$this->ref = $ref;
 					} else {
 						$error++;
-						dol_syslog(__METHOD__."::Create withdraw receipt ".$this->db->lasterror(), LOG_ERR);
+						dol_syslog(__METHOD__." Create withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 					}
 				} else {
 					$error++;
-					dol_syslog(__METHOD__."::Get last withdraw receipt ".$this->db->lasterror(), LOG_ERR);
+					dol_syslog(__METHOD__." Get last withdraw receipt ".$this->db->lasterror(), LOG_ERR);
 				}
 			}
 
@@ -996,9 +999,7 @@ class BonPrelevement extends CommonObject
 					$fact = new FactureFournisseur($this->db);
 				}
 
-				/*
-				 * Create withdrawal receipt in database
-				 */
+				// Add lines for the bon
 				if (count($factures_prev) > 0) {
 					foreach ($factures_prev as $fac) {	// Add a link in database for each invoice
 						// Fetch invoice
@@ -1009,7 +1010,7 @@ class BonPrelevement extends CommonObject
 						}
 
 						/*
-						 * Add standing order. This add record into llx_prelevement_lignes
+						 * Add standing order. This add record into llx_prelevement_lignes and llx_prelevement
 						 *
 						 * $fac[0] : invoice_id
 						 * $fac[1] : ???
@@ -1037,7 +1038,7 @@ class BonPrelevement extends CommonObject
 						if (!$resql) {
 							$error++;
 							$this->errors[] = $this->db->lasterror();
-							dol_syslog(__METHOD__."::Update Error=".$this->db->lasterror(), LOG_ERR);
+							dol_syslog(__METHOD__." Update Error=".$this->db->lasterror(), LOG_ERR);
 						}
 					}
 				}
@@ -1048,7 +1049,7 @@ class BonPrelevement extends CommonObject
 				 * Create file of type='direct-debit' for direct debit order or type='bank-transfer' for credit transfer into a XML file
 				 */
 
-				dol_syslog(__METHOD__."::Init direct debit or credit transfer file for ".count($factures_prev)." invoices", LOG_DEBUG);
+				dol_syslog(__METHOD__." Init direct debit or credit transfer file for ".count($factures_prev)." invoices", LOG_DEBUG);
 
 				if (count($factures_prev) > 0) {
 					$this->date_echeance = $datetimeprev;
@@ -1085,7 +1086,7 @@ class BonPrelevement extends CommonObject
 						$error++;
 					}
 				}
-				dol_syslog(__METHOD__."::End withdraw receipt, file ".$this->filename, LOG_DEBUG);
+				dol_syslog(__METHOD__." Bank order file has been generated under filename ".$this->filename, LOG_DEBUG);
 			}
 			//var_dump($this->total);exit;
 
@@ -1101,7 +1102,7 @@ class BonPrelevement extends CommonObject
 				$resql = $this->db->query($sql);
 				if (!$resql) {
 					$error++;
-					dol_syslog(__METHOD__."::Error update total: ".$this->db->error(), LOG_ERR);
+					dol_syslog(__METHOD__." Error update total: ".$this->db->error(), LOG_ERR);
 				}
 			}
 
@@ -1226,12 +1227,15 @@ class BonPrelevement extends CommonObject
 			$labeltoshow = 'PaymentByBankTransfer';
 		}
 
-		$label = '<u>'.$langs->trans($labeltoshow).'</u>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans($labeltoshow).'</u> '.$this->getLibStatut(5);
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (isset($this->statut)) {
-			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		if (isset($this->date_trans)) {
+			$label .= '<br><b>'.$langs->trans("TransData").":</b> ".dol_print_date($this->date_trans, 'dayhour', 'tzuserrel');
 		}
+		/*if (isset($this->date_credit)) {
+			$label .= '<br><b>'.$langs->trans("TransData").":</b> ".dol_print_date($this->date_credit, 'dayhour', 'tzuserrel');
+		}*/
 
 		$url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id;
 		if (!empty($this->type) && $this->type == 'bank-transfer') {
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 9786ad65168..677b7c1017a 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -789,7 +789,7 @@ abstract class CommonInvoice extends CommonObject
 			} else {
 				$sql .= " WHERE fk_facture = ".((int) $this->id);
 			}
-			$sql .= " AND ext_payment_id IS NULL"; // To exclude record done for some online payments
+			$sql .= " AND type = 'ban'"; // To exclude record done for some online payments
 			$sql .= " AND traite = 0";
 
 			dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
@@ -819,7 +819,7 @@ abstract class CommonInvoice extends CommonObject
 						} else {
 							$sql .= 'fk_facture, ';
 						}
-						$sql .= ' amount, date_demande, fk_user_demande, code_banque, code_guichet, number, cle_rib, sourcetype, entity)';
+						$sql .= ' amount, date_demande, fk_user_demande, code_banque, code_guichet, number, cle_rib, sourcetype, type, entity)';
 						$sql .= " VALUES (".((int) $this->id);
 						$sql .= ", ".((float) price2num($amount));
 						$sql .= ", '".$this->db->idate($now)."'";
@@ -829,6 +829,7 @@ abstract class CommonInvoice extends CommonObject
 						$sql .= ", '".$this->db->escape($bac->number)."'";
 						$sql .= ", '".$this->db->escape($bac->cle_rib)."'";
 						$sql .= ", '".$this->db->escape($sourcetype)."'";
+						$sql .= ", 'ban'";
 						$sql .= ", ".((int) $conf->entity);
 						$sql .= ")";
 
@@ -876,11 +877,11 @@ abstract class CommonInvoice extends CommonObject
 
 
 	/**
-	 *	Create a withdrawal request, from a prelevement_demande, to Stripe for a direct debit order or a credit transfer order.
-	 *  Use the remain to pay excluding all existing open direct debit requests.
+	 *	Create a payment order for a prelevement_demande
+	 *  Then send the payment order to Stripe (for a direct debit order or a credit transfer order).
 	 *
 	 *	@param      User	$fuser      	User asking the direct debit transfer
-	 *  @param		int		$did			ID of payment request
+	 *  @param		int		$did			ID of unitary payment request to pay
 	 *  @param		string	$type			'direct-debit' or 'bank-transfer'
 	 *  @param		string	$sourcetype		Source ('facture' or 'supplier_invoice')
 	 *	@return     int         			<0 if KO, >0 if OK
@@ -896,11 +897,12 @@ abstract class CommonInvoice extends CommonObject
 
 		$error = 0;
 
-		dol_syslog(get_class($this)."::makeStripeSepaRequest 0", LOG_DEBUG);
+		dol_syslog(get_class($this)."::makeStripeSepaRequest start", LOG_DEBUG);
 
 		if ($this->statut > self::STATUS_DRAFT && $this->paye == 0) {
+			// Get the default payment mode for BAN payment
 			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-			$bac = new CompanyBankAccount($this->db);
+			$bac = new CompanyBankAccount($this->db);	// table societe_rib
 			$result = $bac->fetch(0, $this->socid, 1, 'ban');
 			if ($result <= 0 || empty($bac->id)) {
 				$this->error = $langs->trans("ThirdpartyHasNoDefaultBanAccount");
@@ -909,13 +911,14 @@ abstract class CommonInvoice extends CommonObject
 				return -1;
 			}
 
-			$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn";
+			// Load the request to process
+			$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn, fk_prelevement_bons";
 			$sql .= " FROM ".$this->db->prefix()."prelevement_demande";
 			$sql .= " WHERE rowid = ".((int) $did);
 			$sql .= " AND fk_facture = ".((int) $this->id);		// Add a protection to not pay another invoice than current one
 			$sql .= " AND traite = 0";	// Add a protection to not process twice
 
-			dol_syslog(get_class($this)."::makeStripeSepaRequest 1", LOG_DEBUG);
+			dol_syslog(get_class($this)."::makeStripeSepaRequest load requests to process", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
@@ -924,30 +927,16 @@ abstract class CommonInvoice extends CommonObject
 					return -2;
 				}
 
-				//
+				// amount to pay
 				$amount = $obj->amount;
 
-				$now = dol_now();
-
-				$totalpaye = $this->getSommePaiement();
-				$totalcreditnotes = $this->getSumCreditNotesUsed();
-				$totaldeposits = $this->getSumDepositsUsed();
-				//print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
-
-				// We can also use bcadd to avoid pb with floating points
-				// For example print 239.2 - 229.3 - 9.9; does not return 0.
-				//$resteapayer=bcadd($this->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
-				//$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
-				$amounttocheck = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
-
-				// TODO We can compare $amount and $amounttocheck
-
 				if (is_numeric($amount) && $amount != 0) {
 					require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
-					$companypaymentmode = new CompanyPaymentMode($this->db);
+					$companypaymentmode = new CompanyPaymentMode($this->db);	// table societe_rib
 					$companypaymentmode->fetch($bac->id);
 
 					// Start code for Stripe
+					// TODO This must come from a parameter ? or the method may not work as expected when used from a batch ?
 					$service = 'StripeTest';
 					$servicestatus = 0;
 					if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
@@ -955,26 +944,27 @@ abstract class CommonInvoice extends CommonObject
 						$servicestatus = 1;
 					}
 
-					dol_syslog("makeStripeSepaRequest amount = ".$amount." service=" . $service . " servicestatus=" . $servicestatus . " thirdparty_id=" . $this->socid . " companypaymentmode=" . $companypaymentmode->id);
+					dol_syslog("makeStripeSepaRequest amount = ".$amount." service=" . $service . " servicestatus=" . $servicestatus . " thirdparty_id=" . $this->socid." did=".$did);
 
 					$this->stripechargedone = 0;
 					$this->stripechargeerror = 0;
+
 					$now = dol_now();
 
 					$currency = $conf->currency;
 
 					global $stripearrayofkeysbyenv;
-					global $savstripearrayofkeysbyenv;
 
 					$errorforinvoice = 0;     // We reset the $errorforinvoice at each invoice loop
 
 					$this->fetch_thirdparty();
 
-					dol_syslog("--- Process invoice thirdparty_id=" . $this->id . ", thirdparty_name=" . $this->thirdparty->name . " id=" . $this->id . ", ref=" . $this->ref . ", datef=" . dol_print_date($this->date, 'dayhourlog'), LOG_DEBUG);
+					dol_syslog("--- Process payment request thirdparty_id=" . $this->thirdparty->id . ", thirdparty_name=" . $this->thirdparty->name . " ban id=" . $bac->id, LOG_DEBUG);
 
-					$alreadypayed = $this->getSommePaiement();
-					$amount_credit_notes_included = $this->getSumCreditNotesUsed();
-					$amounttopay = $this->total_ttc - $alreadypayed - $amount_credit_notes_included;
+					//$alreadypayed = $this->getSommePaiement();
+					//$amount_credit_notes_included = $this->getSumCreditNotesUsed();
+					//$amounttopay = $this->total_ttc - $alreadypayed - $amount_credit_notes_included;
+					$amounttopay = $amount;
 
 					// Correct the amount according to unit of currency
 					// See https://support.stripe.com/questions/which-zero-decimal-currencies-does-stripe-support
@@ -984,7 +974,41 @@ abstract class CommonInvoice extends CommonObject
 						$amountstripe = $amountstripe * 100;
 					}
 
-					if ($amountstripe > 0) {
+					$this->db->begin();
+
+					// Create a prelevement_bon
+					$bon = new BonPrelevement($this->db);
+					if (empty($obj->fk_prelevement_bons)) {
+						// This create record into llx_prelevment_bons and update link with llx_prelevement_demande
+						$nbinvoices = $bon->create(0, 0, 'real', 'ALL', '', 0, 'direct-debit', $did);
+						if ($nbinvoices <= 0) {
+							$error++;
+							$errorforinvoice++;
+							dol_syslog("Error on BonPrelevement creation", LOG_ERR);
+							$this->errors[] = "Error on BonPrelevement creation";
+						}
+						/*
+						if (!$error) {
+							// Update the direct debit payment request of the processed request to save the id of the prelevement_bon
+							$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";
+							$sql .= " fk_prelevement_bons = ".((int) $bon->id);
+							$sql .= " WHERE rowid = ".((int) $did);
+
+							$result = $this->db->query($sql);
+							if ($result < 0) {
+								$error++;
+								$this->errors[] = "Error on updateing fk_prelevement_bons to ".$bon->id;
+							}
+						}
+						*/
+					} else {
+						$error++;
+						$errorforinvoice++;
+						dol_syslog("Error Line already part of a bank payment order", LOG_ERR);
+						$this->errors[] = "The line is already included into a bank payment order. Delete the bank payment order first.";
+					}
+
+					if (!$error && $amountstripe > 0) {
 						try {
 							//var_dump($companypaymentmode);
 							dol_syslog("We will try to pay with companypaymentmodeid=" . $companypaymentmode->id . " stripe_card_ref=" . $companypaymentmode->stripe_card_ref . " mode=" . $companypaymentmode->status, LOG_DEBUG);
@@ -996,94 +1020,26 @@ abstract class CommonInvoice extends CommonObject
 							// So it inits or erases the $stripearrayofkeysbyenv
 							$stripe = new Stripe($this->db);
 
-							if (empty($savstripearrayofkeysbyenv)) {
-								$savstripearrayofkeysbyenv = $stripearrayofkeysbyenv;
-							}
 							dol_syslog("makeStripeSepaRequest Current Stripe environment is " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']);
-							dol_syslog("makeStripeSepaRequest Current Saved Stripe environment is " . $savstripearrayofkeysbyenv[$servicestatus]['publishable_key']);
 
-							$foundalternativestripeaccount = '';
-
-							// Force stripe to another value (by default this value is empty)
-							if (!empty($thirdparty->array_options['options_stripeaccount'])) {
-								dol_syslog("makeStripeSepaRequest The thirdparty id=" . $thirdparty->id . " has a dedicated Stripe Account, so we switch to it.");
-
-								$tmparray = explode('@', $thirdparty->array_options['options_stripeaccount']);
-								if (!empty($tmparray[1])) {
-									$tmparray2 = explode(':', $tmparray[1]);
-									if (!empty($tmparray2[3])) {
-										$stripearrayofkeysbyenv = [
-											0 => [
-												"publishable_key" => $tmparray2[0],
-												"secret_key" => $tmparray2[1]
-											],
-											1 => [
-												"publishable_key" => $tmparray2[2],
-												"secret_key" => $tmparray2[3]
-											]
-										];
-
-										$stripearrayofkeys = $stripearrayofkeysbyenv[$servicestatus];
-										\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
-
-										$foundalternativestripeaccount = $tmparray[0];    // Store the customer id
-
-										dol_syslog("We use now customer=" . $foundalternativestripeaccount . " publishable_key=" . $stripearrayofkeys['publishable_key'], LOG_DEBUG);
-									}
-								}
-
-								if (!$foundalternativestripeaccount) {
-									$stripearrayofkeysbyenv = $savstripearrayofkeysbyenv;
-
-									$stripearrayofkeys = $savstripearrayofkeysbyenv[$servicestatus];
-									\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
-									dol_syslog("We found a bad value for Stripe Account for thirdparty id=" . $thirdparty->id . ", so we ignore it and keep using the global one, so " . $stripearrayofkeys['publishable_key'], LOG_WARNING);
-								}
-							} else {
-								$stripearrayofkeysbyenv = $savstripearrayofkeysbyenv;
-
-								$stripearrayofkeys = $savstripearrayofkeysbyenv[$servicestatus];
-								\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
-								dol_syslog("The thirdparty id=" . $thirdparty->id . " has no dedicated Stripe Account, so we use global one, so " . json_encode($stripearrayofkeys), LOG_DEBUG);
-							}
+							$stripearrayofkeys = $stripearrayofkeysbyenv[$servicestatus];
+							\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 
 
 							dol_syslog("makeStripeSepaRequest get stripe connet account", LOG_DEBUG);
 							$stripeacc = $stripe->getStripeAccount($service, $this->socid);								// Get Stripe OAuth connect account if it exists (no network access here)
 							dol_syslog("makeStripeSepaRequest get stripe connect account return " . json_encode($stripeacc), LOG_DEBUG);
 
-							if ($foundalternativestripeaccount) {
-								if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-									$customer = \Stripe\Customer::retrieve(['id' => "$foundalternativestripeaccount", 'expand[]' => 'sources']);
-								} else {
-									$customer = \Stripe\Customer::retrieve(['id' => "$foundalternativestripeaccount", 'expand[]' => 'sources'], ["stripe_account" => $stripeacc]);
-								}
-							} else {
-								$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0);
-								if (empty($customer) && !empty($stripe->error)) {
-									$this->errors[] = $stripe->error;
-								}
-								/*if (!empty($customer) && empty($customer->sources)) {
-								 $customer = null;
-								 $this->errors[] = '\Stripe\Customer::retrieve did not returned the sources';
-								 }*/
+							$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0);
+							if (empty($customer) && !empty($stripe->error)) {
+								$this->errors[] = $stripe->error;
 							}
 
 							// $nbhoursbetweentries = (empty($conf->global->SELLYOURSAAS_NBHOURSBETWEENTRIES) ? 49 : $conf->global->SELLYOURSAAS_NBHOURSBETWEENTRIES);				// Must have more that 48 hours + 1 between each try (so 1 try every 3 daily batch)
 							// $nbdaysbeforeendoftries = (empty($conf->global->SELLYOURSAAS_NBDAYSBEFOREENDOFTRIES) ? 35 : $conf->global->SELLYOURSAAS_NBDAYSBEFOREENDOFTRIES);
-							$labeltouse = '';
 							$postactionmessages = [];
 
 							if ($resultthirdparty > 0 && !empty($customer)) {
-								if (!$error && !empty($this->array_options['options_delayautopayment']) && $this->array_options['options_delayautopayment'] > $now && empty($calledinmyaccountcontext)) {
-									$errmsg = 'Payment try was canceled (invoice qualified by the automatic payment was delayed after the ' . dol_print_date($this->array_options['options_delayautopayment'], 'day') . ')';
-									dol_syslog($errmsg, LOG_DEBUG);
-
-									$error++;
-									$errorforinvoice++;
-									$this->errors[] = $errmsg;
-								}
-
 								if (!$error) {	// Payment was not canceled
 									$sepaMode = false;
 									$stripecard = null;
@@ -1096,8 +1052,8 @@ abstract class CommonInvoice extends CommonObject
 									}
 
 									if ($stripecard) {  // Can be src_... (for sepa) or pm_... (new card mode). Note that card_... (old card mode) should not happen here.
-										$FULLTAG = 'INV=' . $this->id . '-CUS=' . $thirdparty->id;
-										$description = 'Stripe payment from makeStripeSepaRequest: ' . $FULLTAG . ' ref=' . $this->ref;
+										$FULLTAG = 'DID='.$did.'-INV=' . $this->id . '-CUS=' . $thirdparty->id;
+										$description = 'Stripe payment from makeStripeSepaRequest: ' . $FULLTAG . ' did='.$did.' ref=' . $this->ref;
 
 										$stripefailurecode = '';
 										$stripefailuremessage = '';
@@ -1107,7 +1063,7 @@ abstract class CommonInvoice extends CommonObject
 										dol_syslog("* Create payment on SEPA " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
 
 										// Create payment intent and charge payment (confirmnow = true)
-										$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $this, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1);
+										$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $this, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1, 1, $did);
 
 										$charge = new stdClass();
 
@@ -1200,17 +1156,6 @@ abstract class CommonInvoice extends CommonObject
 
 										$object = $this;
 
-										// Send emails
-										$labeltouse = 'InvoicePaymentSuccess';
-										$sendemailtocustomer = 1;
-
-										if (empty($charge) || $charge->status == 'failed') {
-											$labeltouse = 'InvoicePaymentFailure';
-											if ($noemailtocustomeriferror) {
-												$sendemailtocustomer = 0;
-											}		// $noemailtocustomeriferror is set when error already reported on myaccount screen
-										}
-
 										// Track an event
 										if (empty($charge) || $charge->status == 'failed') {
 											$actioncode = 'PAYMENT_STRIPE_KO';
@@ -1227,12 +1172,6 @@ abstract class CommonInvoice extends CommonObject
 										dol_syslog("No direct debit payment method found for this stripe customer " . $customer->id, LOG_WARNING);
 										$this->errors[] = 'Failed to get direct debit payment method for stripe customer = ' . $customer->id;
 
-										$labeltouse = 'InvoicePaymentFailure';
-										$sendemailtocustomer = 1;
-										if ($noemailtocustomeriferror) {
-											$sendemailtocustomer = 0;
-										}		// $noemailtocustomeriferror is set when error already reported on myaccount screen
-
 										$description = 'Failed to find or use the payment mode - no credit card defined for the customer account';
 										$stripefailurecode = 'BADPAYMENTMODE';
 										$stripefailuremessage = 'Failed to find or use the payment mode - no credit card defined for the customer account';
@@ -1244,10 +1183,7 @@ abstract class CommonInvoice extends CommonObject
 										$extraparams = '';
 									}
 								} else {
-									// If error because payment was canceled for a logical reason, we do nothing (no email and no event added)
-									$labeltouse = '';
-									$sendemailtocustomer = 0;
-
+									// If error because payment was canceled for a logical reason, we do nothing (no event added)
 									$description = '';
 									$stripefailurecode = '';
 									$stripefailuremessage = '';
@@ -1268,12 +1204,6 @@ abstract class CommonInvoice extends CommonObject
 								$error++;
 								$errorforinvoice++;
 
-								$labeltouse = 'InvoicePaymentFailure';
-								$sendemailtocustomer = 1;
-								if ($noemailtocustomeriferror) {
-									$sendemailtocustomer = 0;
-								}		// $noemailtocustomeriferror is set when error already reported on myaccount screen
-
 								$description = 'Failed to find or use your payment mode (no payment mode for this customer id)';
 								$stripefailurecode = 'BADPAYMENTMODE';
 								$stripefailuremessage = 'Failed to find or use your payment mode (no payment mode for this customer id)';
@@ -1285,121 +1215,8 @@ abstract class CommonInvoice extends CommonObject
 								$extraparams = '';
 							}
 
-							/*
-							// Send email + create action after
-							if ($sendemailtocustomer && $labeltouse) {
-								dol_syslog("* Send email with result of payment - " . $labeltouse);
-
-								// Set output language
-								$outputlangs = new Translate('', $conf);
-								$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-								$outputlangs->loadLangs(["main", "members", "bills"]);
-
-								// Get email content from templae
-								$arraydefaultmessage = null;
-
-								include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-								$formmail = new FormMail($this->db);
-
-								if (!empty($labeltouse)) {
-									$arraydefaultmessage = $formmail->getEMailTemplate($this->db, 'facture_send', $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);
-
-								//$substitutionarray['__SELLYOURSAAS_PAYMENT_ERROR_DESC__'] = $stripefailurecode . ' ' . $stripefailuremessage;
-
-								complete_substitutions_array($substitutionarray, $outputlangs, $object);
-
-								// Set the property ->ref_customer with ref_customer of contract so __REF_CLIENT__ will be replaced in email content
-								// Search contract linked to invoice
-								$foundcontract = null;
-								$this->fetchObjectLinked();
-								if (is_array($this->linkedObjects['contrat']) && count($this->linkedObjects['contrat']) > 0) {
-									//dol_sort_array($object->linkedObjects['facture'], 'date');
-									foreach ($this->linkedObjects['contrat'] as $idcontract => $contract) {
-										$substitutionarray['__CONTRACT_REF__'] = $contract->ref_customer;
-										$substitutionarray['__REFCLIENT__'] = $contract->ref_customer;	// For backward compatibility
-										$substitutionarray['__REF_CLIENT__'] = $contract->ref_customer;
-										$foundcontract = $contract;
-										break;
-									}
-								}
-
-								dol_syslog('__DIRECTDOWNLOAD_URL_INVOICE__=' . $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__']);
-
-								//erics - erreur de réécriture de l'url de téléchargement direct de la facture ... le lien de base est le bon
-								//on cherche donc d'ou vien le pb ...
-								//$urlforsellyoursaasaccount = getRootUrlForAccount($foundcontract);
-								// if ($urlforsellyoursaasaccount) {
-								// 	$tmpforurl = preg_replace('/.*document.php/', '', $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__']);
-								// 	if ($tmpforurl) {
-								// 		dol_syslog('__DIRECTDOWNLOAD_URL_INVOICE__ cas 1, urlforsellyoursaasaccount=' . $urlforsellyoursaasaccount);
-								// 		// $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $urlforsellyoursaasaccount . '/source/document.php' . $tmpforurl;
-								// 	} else {
-								// 		dol_syslog('__DIRECTDOWNLOAD_URL_INVOICE__ cas 2, urlforsellyoursaasaccount=' . $urlforsellyoursaasaccount);
-								// 		// $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $urlforsellyoursaasaccount;
-								// 	}
-								// }
-
-								$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-								$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
-
-								// Attach a file ?
-								$file = '';
-								$listofpaths = [];
-								$listofnames = [];
-								$listofmimes = [];
-								if (is_object($invoice)) {
-									$invoicediroutput = $conf->facture->dir_output;
-									//erics - choix du PDF a joindre aux mails
-									$fileparams = dol_most_recent_file($invoicediroutput . '/' . $this->ref, preg_quote($this->ref, '/') . '[^\-]+*.pdf');
-									$file = $fileparams['fullname'];
-									//$file = $invoicediroutput . '/' . $this->ref . '/' . $this->ref . '.pdf';
-									// $file = '';		// Disable attachment of invoice in emails
-
-									if ($file) {
-										$listofpaths = [$file];
-										$listofnames = [basename($file)];
-										$listofmimes = [dol_mimetype($file)];
-									}
-								}
-								$from = "";//$conf->global->SELLYOURSAAS_NOREPLY_EMAIL;
-
-								$trackid = 'inv' . $this->id;
-								$moreinheader = 'X-Dolibarr-Info: makeStripeSepaRequest' . "\r\n";
-
-								// Send email (substitutionarray must be done just before this)
-								include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
-								$mailfile = new CMailFile($subjecttosend, $this->thirdparty->email, $from, $texttosend, $listofpaths, $listofmimes, $listofnames, '', '', 0, -1, '', '', $trackid, $moreinheader);
-								if ($mailfile->sendfile()) {
-									$result = 1;
-								} else {
-									$this->error = $langs->trans("ErrorFailedToSendMail", $from, $this->thirdparty->email) . '. ' . $mailfile->error;
-									$result = -1;
-								}
-
-								if ($result < 0) {
-									$errmsg = $this->error;
-									$postactionmessages[] = $errmsg;
-									$ispostactionok = -1;
-								} else {
-									if ($file) {
-										$postactionmessages[] = 'Email sent to thirdparty (to ' . $this->thirdparty->email . ' with invoice document attached: ' . $file . ', language = ' . $outputlangs->defaultlang . ')';
-									} else {
-										$postactionmessages[] = 'Email sent to thirdparty (to ' . $this->thirdparty->email . ' without any attached document, language = ' . $outputlangs->defaultlang . ')';
-									}
-								}
-							}
-							*/
-
 							if ($description) {
-								dol_syslog("* Record event for payment result - " . $description);
+								dol_syslog("* Record event for credit transfer or direct debit request result - " . $description);
 								require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
 								// Insert record of payment (success or error)
@@ -1448,18 +1265,9 @@ abstract class CommonInvoice extends CommonObject
 						$this->errors[] = "Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?";
 					}
 
-					// TODO Create a prelevement_bon and set its status to sent instead of this
-					$bon = new BonPrelevement($this->db);
-					$nbinvoices = $bon->create(0, 0, 'real', 'ALL', '', 0, 'direct-debit', $did);
-					if ($nbinvoices <= 0) {
-						$error++;
-						$errorforinvoice++;
-						dol_syslog("Error on BonPrelevement creation", LOG_ERR);
-						$this->errors[] = "Error on BonPrelevement creation";
-					}
-
-					if (!$errorforinvoice) {
-						$result = $bon->set_infotrans($user, $now, 'internet');
+					// Set status of the order to "Transferred" with method 'api'
+					if (!$error && !$errorforinvoice) {
+						$result = $bon->set_infotrans($user, $now, 3);
 						if ($result < 0) {
 							$error++;
 							$errorforinvoice++;
@@ -1468,19 +1276,14 @@ abstract class CommonInvoice extends CommonObject
 						}
 					}
 
-					if (!$errorforinvoice) {
-						$idtransferfile = $bon->id;
+					if (!$error && !$errorforinvoice) {
 						// Update the direct debit payment request of the processed invoice to save the id of the prelevement_bon
 						$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";
-						$sql .= " traite = 1,";	// TODO Remove this
-						$sql .= " date_traite = '".$this->db->idate(dol_now())."',";	// TODO Remove this
-						if ($idtransferfile > 0) {
-							$sql .= " fk_prelevement_bons = ".((int) $idtransferfile);
-						}
+						$sql .= " ext_payment_id = '".$this->db->escape($paymentintent->id)."',";
+						$sql .= " ext_payment_site = '".$this->db->escape($service)."'";
 						$sql .= " WHERE rowid = ".((int) $did);
 
-
-						dol_syslog(get_class($this)."::makeStripeSepaRequest", LOG_DEBUG);
+						dol_syslog(get_class($this)."::makeStripeSepaRequest update to save stripe paymentintent ids", LOG_DEBUG);
 						$resql = $this->db->query($sql);
 						if (!$resql) {
 							$this->error = $this->db->lasterror();
@@ -1488,19 +1291,26 @@ abstract class CommonInvoice extends CommonObject
 							$error++;
 						}
 					}
+
+					if (!$error && !$errorforinvoice) {
+						$this->db->commit();
+					} else {
+						$this->db->rollback();
+					}
 				} else {
 					$this->error = 'WithdrawRequestErrorNilAmount';
 					dol_syslog(get_class($this).'::makeStripeSepaRequest WithdrawRequestErrorNilAmount');
 					$error++;
 				}
 
+				/*
 				if (!$error) {
-					// Force payment mode of invoice to withdraw
+					// Force payment mode of the invoice to withdraw
 					$payment_mode_id = dol_getIdFromCode($this->db, ($type == 'bank-transfer' ? 'VIR' : 'PRE'), 'c_paiement', 'code', 'id', 1);
 					if ($payment_mode_id > 0) {
 						$result = $this->setPaymentMethods($payment_mode_id);
 					}
-				}
+				}*/
 
 				if ($error) {
 					return -1;
diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index 522940b62ed..1e5c82672cc 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -84,3 +84,5 @@ ALTER TABLE llx_supplier_proposal ADD INDEX idx_supplier_proposal_fk_account(fk_
 
 ALTER TABLE llx_ecm_files ADD COLUMN share_pass varchar(32) after share;
 
+ALTER TABLE llx_prelevement_demande ADD COLUMN type varchar(12) DEFAULT '';
+UPDATE llx_prelevement_demande SET type = 'ban' WHERE ext_payment_id IS NULL AND type = '';
diff --git a/htdocs/install/mysql/tables/llx_prelevement_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_demande.sql
index b0b1b87f77f..2229b5cc203 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_demande.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_demande.sql
@@ -36,6 +36,8 @@ create table llx_prelevement_demande
   code_guichet        varchar(6),
   number              varchar(255),
   cle_rib             varchar(5),
+  
+  type                varchar(12) DEFAULT '',
   ext_payment_id      varchar(255),
   ext_payment_site    varchar(128)
 )ENGINE=innodb;
diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 81a3d03328a..a194e88627b 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -196,7 +196,6 @@ if ($event->type == 'payout.created') {
 		return -1;
 	}
 } elseif ($event->type == 'payout.paid') {
-	global $conf;
 	$error = 0;
 	$result = dolibarr_set_const($db, $service."_NEXTPAYOUT", null, 'chaine', 0, '', $conf->entity);
 	if ($result) {
@@ -298,6 +297,8 @@ if ($event->type == 'payout.created') {
 	$db->query($sql);
 	$db->commit();
 } elseif ($event->type == 'payment_intent.succeeded') {		// Called when making payment with PaymentIntent method ($conf->global->STRIPE_USE_NEW_CHECKOUT is on).
+	dol_syslog("object = ".var_export($event->data, true));
+
 	// TODO: create fees
 	// TODO: Redirect to paymentok.php
 
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 5c49868b8c8..207bbca63b3 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -341,9 +341,10 @@ class Stripe extends CommonObject
 	 * @param   string  $payment_method                     'pm_....' (if known)
 	 * @param   string  $off_session                        If we use an already known payment method to pay when customer is not available during the checkout flow.
 	 * @param	string	$noidempotency_key					Do not use the idempotency_key when creating the PaymentIntent
+	 * @param	int		$did								ID of an existing line into llx_prelevement_demande (Dolibarr intent). If provided, no new line will be created.
 	 * @return 	\Stripe\PaymentIntent|null 			        Stripe PaymentIntent or null if not found and failed to create
 	 */
-	public function getPaymentIntent($amount, $currency_code, $tag, $description = '', $object = null, $customer = null, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic', $confirmnow = false, $payment_method = null, $off_session = 0, $noidempotency_key = 1)
+	public function getPaymentIntent($amount, $currency_code, $tag, $description = '', $object = null, $customer = null, $key = null, $status = 0, $usethirdpartyemailforreceiptemail = 0, $mode = 'automatic', $confirmnow = false, $payment_method = null, $off_session = 0, $noidempotency_key = 1, $did = 0)
 	{
 		global $conf, $user;
 
@@ -530,29 +531,50 @@ class Stripe extends CommonObject
 				// Store the payment intent
 				if (is_object($object)) {
 					$paymentintentalreadyexists = 0;
-					// Check that payment intent $paymentintent->id is not already recorded.
-					$sql = "SELECT pi.rowid";
-					$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pi";
-					$sql .= " WHERE pi.entity IN (".getEntity('societe').")";
-					$sql .= " AND pi.ext_payment_site = '".$this->db->escape($service)."'";
-					$sql .= " AND pi.ext_payment_id = '".$this->db->escape($paymentintent->id)."'";
 
-					dol_syslog(get_class($this)."::getPaymentIntent search if payment intent already in prelevement_demande", LOG_DEBUG);
-					$resql = $this->db->query($sql);
-					if ($resql) {
-						$num = $this->db->num_rows($resql);
-						if ($num) {
-							$obj = $this->db->fetch_object($resql);
-							if ($obj) {
-								$paymentintentalreadyexists++;
-							}
+					if ($did > 0) {
+						// If a payment request line provided, we do not need to recreate one, we just update it
+						dol_syslog(get_class($this)."::getPaymentIntent search if payment intent already in prelevement_demande", LOG_DEBUG);
+
+						$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";
+						$sql .= " ext_payment_site = '".$this->db->escape($service)."',";
+						$sql .= " ext_payment_id = '".$this->db->escape($paymentintent->id)."'";
+						$sql .= " WHERE rowid = ".((int) $did);
+
+						$resql = $this->db->query($sql);
+						if ($resql) {
+							$paymentintentalreadyexists++;
+						} else {
+							$error++;
+							dol_print_error($this->db);
 						}
 					} else {
-						dol_print_error($this->db);
+						// Check that payment intent $paymentintent->id is not already recorded.
+						dol_syslog(get_class($this)."::getPaymentIntent search if payment intent already in prelevement_demande", LOG_DEBUG);
+
+						$sql = "SELECT pi.rowid";
+						$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pi";
+						$sql .= " WHERE pi.entity IN (".getEntity('societe').")";
+						$sql .= " AND pi.ext_payment_site = '".$this->db->escape($service)."'";
+						$sql .= " AND pi.ext_payment_id = '".$this->db->escape($paymentintent->id)."'";
+
+						$resql = $this->db->query($sql);
+						if ($resql) {
+							$num = $this->db->num_rows($resql);
+							if ($num) {
+								$obj = $this->db->fetch_object($resql);
+								if ($obj) {
+									$paymentintentalreadyexists++;
+								}
+							}
+						} else {
+							$error++;
+							dol_print_error($this->db);
+						}
 					}
 
 					// If not, we create it.
-					if (!$paymentintentalreadyexists) {
+					if (!$error && !$paymentintentalreadyexists) {
 						$now = dol_now();
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_demande (date_demande, fk_user_demande, ext_payment_id, fk_facture, sourcetype, entity, ext_payment_site, amount)";
 						$sql .= " VALUES ('".$this->db->idate($now)."', ".((int) $user->id).", '".$this->db->escape($paymentintent->id)."', ".((int) $object->id).", '".$this->db->escape($object->element)."', ".((int) $conf->entity).", '".$this->db->escape($service)."', ".((float) $amount).")";

From 70f2d25e71b1f1160884b92acb97a162b5dfe80f Mon Sep 17 00:00:00 2001
From: Anthony Berton <anthony.berton@bb2a.fr>
Date: Sat, 25 Feb 2023 00:17:12 +0100
Subject: [PATCH 116/300] ADD input for name

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

diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index cd793a91bfc..a19d0f1fc7b 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -548,6 +548,7 @@ print '<tr><td class="center">';
 if ($action == "dosign" && empty($cancel)) {
 	print '<div class="tablepublicpayment">';
 	print '<input type="button" class="buttonDelete small" id="clearsignature" value="'.$langs->trans("ClearSignature").'">';
+	print '<input type="text" class="" id="onlinesignname" name="onlinesignname" placeholder="'.$langs->trans("Lastname").'">';
 	print '<div id="signature" style="border:solid;"></div>';
 	print '</div>';
 	// Do not use class="reposition" here: It breaks the submit and there is a message on top to say it's ok, so going back top is better.
@@ -558,7 +559,7 @@ if ($action == "dosign" && empty($cancel)) {
 	print '<script language="JavaScript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jSignature/jSignature.js"></script>
 	<script type="text/javascript">
 	$(document).ready(function() {
-	  $("#signature").jSignature({ color:"#000", lineWidth:4, '.(empty($conf->dol_optimize_smallscreen) ? '' : 'width: 280, ' ).'height: 180});
+	  $("#signature").jSignature({ color:"#000", lineWidth:0, '.(empty($conf->dol_optimize_smallscreen) ? '' : 'width: 280, ' ).'height: 180});
 
 	  $("#signature").on("change",function(){
 		$("#clearsignature").css("display","");

From 5aaca18567697577b4b76176d20a1a4b763a6bbd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 00:48:50 +0100
Subject: [PATCH 117/300] css

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

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 5775ea5404e..c47cb8b9379 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -553,12 +553,12 @@ if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
 	print $conf->global->MAIN_EXEC_USE_POPEN;
 }
 if ($execmethod == 1) {
-	print '<span class="opacitymedium">, "exec" PHP method will be used for shell commands';
+	print '<span class="opacitymedium"> &nbsp; &nbsp; "exec" PHP method will be used for shell commands';
 	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
 	print '</span>';
 }
 if ($execmethod == 2) {
-	print '<span class="opacitymedium">, "popen" PHP method will be used for shell commands';
+	print '<span class="opacitymedium"> &nbsp; &nbsp; "popen" PHP method will be used for shell commands';
 	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
 	print '</span>';
 }

From 67b2563ac9131cada7b8479412a6b099ec675333 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 00:57:02 +0100
Subject: [PATCH 118/300] Doc

---
 htdocs/compta/facture/invoicetemplate_list.php | 4 ++--
 htdocs/core/class/extrafields.class.php        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index addac069636..4209d956f22 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -56,7 +56,6 @@ $mode       = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hier
 
 $socid = GETPOST('socid', 'int');
 
-// Security check
 $id = (GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int'));
 $lineid = GETPOST('lineid', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -140,7 +139,7 @@ $arrayfields = array(
 	'f.titre'=>array('label'=>"Ref", 'checked'=>1),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
 	'f.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
-	'f.total_tva'=>array('label'=>"AmountVAT", 'checked'=>1),
+	'f.total_tva'=>array('label'=>"AmountVAT", 'checked'=>-1),
 	'f.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>1),
 	'f.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>0),
 	'f.fk_cond_reglement'=>array('label'=>"PaymentTerm", 'checked'=>0),
@@ -184,6 +183,7 @@ $permissionnote = $user->hasRight('facture', 'creer'); // Used by the include of
 $permissiondellink = $user->hasRight('facture', 'creer'); // Used by the include of actions_dellink.inc.php
 $permissiontoedit = $user->hasRight('facture', 'creer'); // Used by the include of actions_lineupdonw.inc.php
 
+// Security check
 $result = restrictedArea($user, 'facture', $object->id, $objecttype);
 
 
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 293efbe751c..3bbb40737e0 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -126,7 +126,7 @@ class ExtraFields
 	 *  @param  array|string	$param				Params for field (ex for select list : array('options' => array(value'=>'label of option')) )
 	 *  @param  int				$alwayseditable		Is attribute always editable regardless of the document status
 	 *  @param	string			$perms				Permission to check
-	 *  @param	string			$list				Visibilty ('0'=never visible, '1'=visible on list+forms, '2'=list only, '3'=form only or 'eval string')
+	 *  @param	string			$list				Visibility ('0'=never visible, '1'=visible on list+forms, '2'=list only, '3'=form only or 'eval string')
 	 *  @param	string			$help				Text with help tooltip
 	 *  @param  string  		$computed           Computed value
 	 *  @param  string  		$entity    		 	Entity of extrafields (for multicompany modules)

From 303b3a93dbb45b4280832a08a65363a872c02170 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 00:59:39 +0100
Subject: [PATCH 119/300] css

---
 htdocs/compta/facture/invoicetemplate_list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 4209d956f22..41b2a7ffe96 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -588,7 +588,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 
 // Fields title search
 // --------------------------------------------------------------------
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch center">';

From 6a68d3f6cd9ff73342680bdeac08c4ae28dd494e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 01:16:39 +0100
Subject: [PATCH 120/300] Fix look and feel v17

---
 .../compta/facture/invoicetemplate_list.php   | 67 ++++++++++++-------
 htdocs/core/lib/functions.lib.php             |  2 +-
 .../partnership/class/partnership.class.php   |  2 +-
 htdocs/partnership/partnership_list.php       |  2 +-
 htdocs/societe/list.php                       | 66 +++++++++---------
 5 files changed, 79 insertions(+), 60 deletions(-)

diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 41b2a7ffe96..a36edf5cd88 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -711,7 +711,7 @@ if (!empty($arrayfields['f.tms']['checked'])) {
 }
 // Status
 if (!empty($arrayfields['status']['checked'])) {
-	print '<td class="liste_titre center">';
+	print '<td class="liste_titre center minwidth75imp parentonrightofpage">';
 	$liststatus = array(
 		0=>$langs->trans("Draft"),
 		1=>$langs->trans("Active"),
@@ -737,78 +737,97 @@ $totalarray['nbfield'] = 0;
 print '<tr class="liste_titre">';
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.titre']['checked'])) {
 	print_liste_field_titre($arrayfields['f.titre']['label'], $_SERVER['PHP_SELF'], "f.titre", "", $param, "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], "s.nom", "", $param, "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_ht']['checked'])) {
-	print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], "f.total_ht", "", $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], "f.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_tva']['checked'])) {
-	print_liste_field_titre($arrayfields['f.total_tva']['label'], $_SERVER['PHP_SELF'], "f.total_tva", "", $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.total_tva']['label'], $_SERVER['PHP_SELF'], "f.total_tva", "", $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_ttc']['checked'])) {
-	print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], "f.total_ttc", "", $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 	print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 	print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['recurring']['checked'])) {
-	print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, 'class="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.frequency']['checked'])) {
-	print_liste_field_titre($arrayfields['f.frequency']['label'], $_SERVER['PHP_SELF'], "f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.frequency']['label'], $_SERVER['PHP_SELF'], "f.frequency", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.unit_frequency']['checked'])) {
-	print_liste_field_titre($arrayfields['f.unit_frequency']['label'], $_SERVER['PHP_SELF'], "f.unit_frequency", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.unit_frequency']['label'], $_SERVER['PHP_SELF'], "f.unit_frequency", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
-	print_liste_field_titre($arrayfields['f.nb_gen_done']['label'], $_SERVER['PHP_SELF'], "f.nb_gen_done", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.nb_gen_done']['label'], $_SERVER['PHP_SELF'], "f.nb_gen_done", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.date_last_gen']['checked'])) {
-	print_liste_field_titre($arrayfields['f.date_last_gen']['label'], $_SERVER['PHP_SELF'], "f.date_last_gen", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.date_last_gen']['label'], $_SERVER['PHP_SELF'], "f.date_last_gen", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.date_when']['checked'])) {
-	print_liste_field_titre($arrayfields['f.date_when']['label'], $_SERVER['PHP_SELF'], "f.date_when", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.date_when']['label'], $_SERVER['PHP_SELF'], "f.date_when", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.fk_user_author']['checked'])) {
-	print_liste_field_titre($arrayfields['f.fk_user_author']['label'], $_SERVER['PHP_SELF'], "f.fk_user_author", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.fk_user_author']['label'], $_SERVER['PHP_SELF'], "f.fk_user_author", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.fk_user_modif']['checked'])) {
-	print_liste_field_titre($arrayfields['f.fk_user_modif']['label'], $_SERVER['PHP_SELF'], "f.fk_user_modif", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.fk_user_modif']['label'], $_SERVER['PHP_SELF'], "f.fk_user_modif", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.datec']['checked'])) {
-	print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER['PHP_SELF'], "f.datec", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER['PHP_SELF'], "f.datec", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.tms']['checked'])) {
-	print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER['PHP_SELF'], "f.tms", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER['PHP_SELF'], "f.tms", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 if (!empty($arrayfields['status']['checked'])) {
-	print_liste_field_titre($arrayfields['status']['label'], $_SERVER['PHP_SELF'], "f.suspended,f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['status']['label'], $_SERVER['PHP_SELF'], "f.suspended,f.frequency", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
 }
-$totalarray['nbfield']++;	// For the column action
 print '</tr>'."\n";
 
-	$i = 0;
-	$savnbfield = $totalarray['nbfield'];
-	$totalarray = array();
-	$totalarray['nbfield'] = 0;
-	$totalarray['val']['f.total_ht'] = 0;
-	$totalarray['val']['f.total_tva'] = 0;
-	$totalarray['val']['f.total_ttc'] = 0;
-	$imaxinloop = ($limit ? min($num, $limit) : $num);
+$i = 0;
+$savnbfield = $totalarray['nbfield'];
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+$totalarray['val']['f.total_ht'] = 0;
+$totalarray['val']['f.total_tva'] = 0;
+$totalarray['val']['f.total_ttc'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
 while ($i < $imaxinloop) {
 	$objp = $db->fetch_object($resql);
 	if (empty($objp)) {
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 2c993af7deb..93897800d28 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5173,7 +5173,7 @@ function dol_print_error_email($prefixcode, $errormessage = '', $errormessages =
  *	@param  string	$moreattrib  Options of attribute td ("" by defaut)
  *	@param  string	$sortfield   Current field used to sort
  *	@param  string	$sortorder   Current sort order
- *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag.
+ *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.
  *  @param	string	$tooltip	 Tooltip
  *  @param	string	$forcenowrapcolumntitle		No need for use 'wrapcolumntitle' css style
  *	@return	void
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index ca2e061cbe4..acdea0fd665 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -117,12 +117,12 @@ class Partnership extends CommonObject
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		'date_partnership_start' => array('type'=>'date', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
 		'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>0, 'visible'=>1,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>2, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Accepted', '2'=>'Refused', '8'=>'Suspended', '9'=>'Terminated'),),
 		'url_to_check' => array('type'=>'varchar(255)', 'label'=>'UrlToCheck', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>-1,),
 		'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
 		'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>-2,),
 		'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>73, 'notnull'=>0, 'visible'=>-2,),
 		'ip' => array('type'=>'varchar(250)', 'label'=>'Ip', 'enabled'=>'1', 'position'=>74, 'notnull'=>0, 'visible'=>-2,),
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>2000, 'notnull'=>1, 'visible'=>2, 'default'=>'0', 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Accepted', '2'=>'Refused', '8'=>'Suspended', '9'=>'Terminated'),),
 	);
 	public $rowid;
 	public $ref;
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 4fc78fdbdde..e186adda22a 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -723,7 +723,7 @@ if ($managedfor == 'member') {
 }
 // Fields title search
 // --------------------------------------------------------------------
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 68304f2b119..085bc0d2532 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -1356,135 +1356,135 @@ $totalarray['nbfield'] = 0;
 print '<tr class="liste_titre">';
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.rowid']['checked'])) {
 	print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"], "s.rowid", "", $param, ' data-key="id"', $sortfield, $sortorder, 'actioncolumn ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, ' data-key="ref"', $sortfield, $sortorder, 'actioncolumn ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.name_alias']['checked'])) {
 	print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], "s.name_alias", "", $param, "", $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.barcode']['checked'])) {
 	print_liste_field_titre($arrayfields['s.barcode']['label'], $_SERVER["PHP_SELF"], "s.barcode", $param, '', '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.code_client']['checked'])) {
 	print_liste_field_titre($arrayfields['s.code_client']['label'], $_SERVER["PHP_SELF"], "s.code_client", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.code_fournisseur']['checked'])) {
 	print_liste_field_titre($arrayfields['s.code_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_fournisseur", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.code_compta']['checked'])) {
 	print_liste_field_titre($arrayfields['s.code_compta']['label'], $_SERVER["PHP_SELF"], "s.code_compta", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) {
 	print_liste_field_titre($arrayfields['s.code_compta_fournisseur']['label'], $_SERVER["PHP_SELF"], "s.code_compta_fournisseur", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.address']['checked'])) {
 	print_liste_field_titre($arrayfields['s.address']['label'], $_SERVER['PHP_SELF'], 's.address', '', $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.zip']['checked'])) {
 	print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], "s.zip", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.town']['checked'])) {
 	print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], "s.town", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['state.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['region.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['region.nom']['label'], $_SERVER["PHP_SELF"], "region.nom", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, "", $sortfield, $sortorder, 'center ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['staff.code']['checked'])) {
 	print_liste_field_titre($arrayfields['staff.code']['label'], $_SERVER["PHP_SELF"], "staff.code", "", $param, '', $sortfield, $sortorder, 'center ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.price_level']['checked'])) {
 	print_liste_field_titre($arrayfields['s.price_level']['label'], $_SERVER["PHP_SELF"], "s.price_level", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.email']['checked'])) {
 	print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER["PHP_SELF"], "s.email", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.phone']['checked'])) {
 	print_liste_field_titre($arrayfields['s.phone']['label'], $_SERVER["PHP_SELF"], "s.phone", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.fax']['checked'])) {
 	print_liste_field_titre($arrayfields['s.fax']['label'], $_SERVER["PHP_SELF"], "s.fax", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.url']['checked'])) {
 	print_liste_field_titre($arrayfields['s.url']['label'], $_SERVER["PHP_SELF"], "s.url", "", $param, '', $sortfield, $sortorder);
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.siren']['checked'])) {
 	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"), $textprofid[1], 1, 0), $_SERVER["PHP_SELF"], "s.siren", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.siret']['checked'])) {
 	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"), $textprofid[2], 1, 0), $_SERVER["PHP_SELF"], "s.siret", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.ape']['checked'])) {
 	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"), $textprofid[3], 1, 0), $_SERVER["PHP_SELF"], "s.ape", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.idprof4']['checked'])) {
 	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof4", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.idprof5']['checked'])) {
 	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[5], 1, 0), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.idprof6']['checked'])) {
 	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[6], 1, 0), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.tva_intra']['checked'])) {
 	print_liste_field_titre($arrayfields['s.tva_intra']['label'], $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder, 'nowrap ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['customerorsupplier']['checked'])) {
 	print_liste_field_titre($arrayfields['customerorsupplier']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'center '); // type of customer
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.fk_prospectlevel']['checked'])) {
 	print_liste_field_titre($arrayfields['s.fk_prospectlevel']['label'], $_SERVER["PHP_SELF"], "s.fk_prospectlevel", "", $param, '', $sortfield, $sortorder, 'center ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.fk_stcomm']['checked'])) {
 	print_liste_field_titre($arrayfields['s.fk_stcomm']['label'], $_SERVER["PHP_SELF"], "s.fk_stcomm", "", $param, '', $sortfield, $sortorder, 'center ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s2.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s2.nom']['label'], $_SERVER["PHP_SELF"], "s2.nom", "", $param, '', $sortfield, $sortorder, 'center ');
-	$totalarray['nbfield']++;	// For the column action
+	$totalarray['nbfield']++;
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';

From 468d05b08e3c3031b388ae6568b884de985f828a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 24 Feb 2023 18:42:53 +0100
Subject: [PATCH 121/300] Fix css

---
 htdocs/compta/facture/prelevement.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 829d3b0b482..319b93c4dcb 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -935,7 +935,8 @@ if ($object->id > 0) {
 			print $tmpuser->getNomUrl(1, '', 0, 0, 0, 0, 'login');
 			print '</td>';
 
-			print '<td class="center">'.price($obj->amount).'</td>';
+			// Amount
+			print '<td class="center"><span class="amount">'.price($obj->amount).'</span></td>';
 
 			print '<td class="center">';
 			if ($obj->fk_prelevement_bons > 0) {

From 3354a27a6f085a11d6ca3e98a7e17e3bd3a3baed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 00:48:50 +0100
Subject: [PATCH 122/300] css

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

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 9fdc6e886b6..91de4341b49 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -553,12 +553,12 @@ if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
 	print $conf->global->MAIN_EXEC_USE_POPEN;
 }
 if ($execmethod == 1) {
-	print '<span class="opacitymedium">, "exec" PHP method will be used for shell commands';
+	print '<span class="opacitymedium"> &nbsp; &nbsp; "exec" PHP method will be used for shell commands';
 	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
 	print '</span>';
 }
 if ($execmethod == 2) {
-	print '<span class="opacitymedium">, "popen" PHP method will be used for shell commands';
+	print '<span class="opacitymedium"> &nbsp; &nbsp; "popen" PHP method will be used for shell commands';
 	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
 	print '</span>';
 }

From 5e8fc026cbdbb44ef7eafaa024c51d1ab65b2e84 Mon Sep 17 00:00:00 2001
From: Anthony Berton <anthony.berton@bb2a.fr>
Date: Sat, 25 Feb 2023 01:54:13 +0100
Subject: [PATCH 123/300] add name and date on sign propal

---
 htdocs/core/ajax/onlineSign.php            | 13 ++++++++++++-
 htdocs/public/onlinesign/newonlinesign.php |  5 ++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index 47a7a2b6f13..c3fd2e75cf8 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -59,6 +59,7 @@ $signature = GETPOST('signaturebase64');
 $ref = GETPOST('ref', 'aZ09');
 $mode = GETPOST('mode', 'aZ09');	// 'proposal', ...
 $SECUREKEY = GETPOST("securekey"); // Secure key
+$online_sign_name = GETPOST("onlinesignname");
 
 $error = 0;
 $response = "";
@@ -103,6 +104,10 @@ if ($action == "importSignature") {
 			$upload_dir = !empty($conf->propal->multidir_output[$object->entity])?$conf->propal->multidir_output[$object->entity]:$conf->propal->dir_output;
 			$upload_dir .= '/'.dol_sanitizeFileName($object->ref).'/';
 
+			$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
+			$default_font = pdf_getPDFFont($langs);	// Must be after pdf_getInstance
+			$langs->loadLangs(array("main", "companies"));
+
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
 			$filename = "signatures/".$date."_signature.png";
 			if (!is_dir($upload_dir."signatures/")) {
@@ -167,7 +172,14 @@ if ($action == "importSignature") {
 						$yforimgstart = (empty($s['h']) ? 240 : $s['h'] - 60);
 						$wforimg = $s['w'] - 20 - $xforimgstart;
 
+						$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4) - 4);
+						$pdf->SetFont($default_font, '', $default_font_size);
+						$pdf->MultiCell($wforimg, 4, $langs->trans("DateSigning").': '.dol_print_date(dol_now(), "daytext", false, $langs, true), 0, 'L');
+						$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4));
+						$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname").': '.$online_sign_name, 0, 'L');
+
 						$pdf->Image($upload_dir.$filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
+
 						//$pdf->Close();
 						$pdf->Output($newpdffilename, "F");
 
@@ -187,7 +199,6 @@ if ($action == "importSignature") {
 				$db->begin();
 
 				$online_sign_ip = getUserRemoteIP();
-				$online_sign_name = '';		// TODO Ask name on form to sign
 
 				$sql  = "UPDATE ".MAIN_DB_PREFIX."propal";
 				$sql .= " SET fk_statut = ".((int) $object::STATUS_SIGNED).", note_private = '".$db->escape($object->note_private)."',";
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index a19d0f1fc7b..ac88f7b638f 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -548,7 +548,7 @@ print '<tr><td class="center">';
 if ($action == "dosign" && empty($cancel)) {
 	print '<div class="tablepublicpayment">';
 	print '<input type="button" class="buttonDelete small" id="clearsignature" value="'.$langs->trans("ClearSignature").'">';
-	print '<input type="text" class="" id="onlinesignname" name="onlinesignname" placeholder="'.$langs->trans("Lastname").'">';
+	print '<input type="text" class="" id="name"  placeholder="'.$langs->trans("Lastname").'">';
 	print '<div id="signature" style="border:solid;"></div>';
 	print '</div>';
 	// Do not use class="reposition" here: It breaks the submit and there is a message on top to say it's ok, so going back top is better.
@@ -569,6 +569,7 @@ if ($action == "dosign" && empty($cancel)) {
 				console.log("We click on button sign");
 				$("#signbutton").val(\''.dol_escape_js($langs->transnoentities('PleaseBePatient')).'\');
 				var signature = $("#signature").jSignature("getData", "image");
+				var name = document.getElementById("name").value;
 				$.ajax({
 					type: "POST",
 					url: "'.DOL_URL_ROOT.'/core/ajax/onlineSign.php",
@@ -577,6 +578,7 @@ if ($action == "dosign" && empty($cancel)) {
 						"action" : "importSignature",
 						"token" : \''.newToken().'\',
 						"signaturebase64" : signature,
+						"onlinesignname" : name,
 						"ref" : \''.dol_escape_js($REF).'\',
 						"securekey" : \''.dol_escape_js($SECUREKEY).'\',
 						"mode" : \''.dol_escape_htmltag($source).'\',
@@ -598,6 +600,7 @@ if ($action == "dosign" && empty($cancel)) {
 	  $("#clearsignature").on("click",function(){
 		$("#signature").jSignature("clear");
 		$("#signbutton").attr("disabled",true);
+		// document.getElementById("onlinesignname").value = "";
 	  });
 
 	  $("#signbutton").attr("disabled",true);

From c94df95c233a55224a67d77e957653846e73e856 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 01:54:36 +0100
Subject: [PATCH 124/300] Fix filter on email selector for thirdparties

---
 .../modules/mailings/thirdparties.modules.php | 98 ++++++++++---------
 1 file changed, 51 insertions(+), 47 deletions(-)

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 2f8040d4b75..289433d4dc3 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -73,55 +73,53 @@ class mailing_thirdparties extends MailingTargets
 		$cibles = array();
 
 		$addDescription = "";
+		$addFilter = "";
+		if (GETPOSTISSET("filter_client_thirdparties") && GETPOST("filter_client_thirdparties") <> '-1') {
+			$addFilter .= " AND s.client=".((int) GETPOST("filter_client_thirdparties", 'int'));
+			$addDescription = $langs->trans('ProspectCustomer')."=";
+			if (GETPOST("filter_client_thirdparties") == 0) {
+				$addDescription .= $langs->trans('NorProspectNorCustomer');
+			} elseif (GETPOST("filter_client_thirdparties") == 1) {
+				$addDescription .= $langs->trans('Customer');
+			} elseif (GETPOST("filter_client_thirdparties") == 2) {
+				$addDescription .= $langs->trans('Prospect');
+			} elseif (GETPOST("filter_client_thirdparties") == 3) {
+				$addDescription .= $langs->trans('ProspectCustomer');
+			} else {
+				$addDescription .= "Unknown status ".GETPOST("filter_client_thirdparties");
+			}
+		}
+		if (GETPOSTISSET("filter_status")) {
+			if (strlen($addDescription) > 0) {
+				$addDescription .= ";";
+			}
+			$addDescription .= $langs->trans("Status")."=";
+			if (GETPOST("filter_status") == '1') {
+				$addFilter .= " AND s.status=1";
+				$addDescription .= $langs->trans("Enabled");
+			} else {
+				$addFilter .= " AND s.status=0";
+				$addDescription .= $langs->trans("Disabled");
+			}
+		}
+		if (GETPOST('default_lang', 'alpha')) {
+			$addFilter .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('default_lang', 'alpha'))."%'";
+			$addDescription = $langs->trans('DefaultLang')."=";
+		}
+		if (GETPOST('filter_lang_thirdparties', 'alpha')) {
+			$addFilter .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('filter_lang_thirdparties', 'alpha'))."%'";
+			$addDescription = $langs->trans('DefaultLang')."=";
+		}
+
 		// Select the third parties from category
-		if (!GETPOST('filter')) {
+		if (!GETPOST('filter_thirdparties') || GETPOST('filter_thirdparties') == '-1') {
 			$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= " WHERE s.email <> ''";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
-			if (GETPOST('default_lang', 'alpha')) {
-				$sql .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('default_lang', 'alpha'))."%'";
-			}
+			$sql .= $addFilter;
 		} else {
-			$addFilter = "";
-			if (GETPOSTISSET("filter_client") && GETPOST("filter_client") <> '-1') {
-				$addFilter .= " AND s.client=".((int) GETPOST("filter_client", 'int'));
-				$addDescription = $langs->trans('ProspectCustomer')."=";
-				if (GETPOST("filter_client") == 0) {
-					$addDescription .= $langs->trans('NorProspectNorCustomer');
-				} elseif (GETPOST("filter_client") == 1) {
-					$addDescription .= $langs->trans('Customer');
-				} elseif (GETPOST("filter_client") == 2) {
-					$addDescription .= $langs->trans('Prospect');
-				} elseif (GETPOST("filter_client") == 3) {
-					$addDescription .= $langs->trans('ProspectCustomer');
-				} else {
-					$addDescription .= "Unknown status ".GETPOST("filter_client");
-				}
-			}
-			if (GETPOSTISSET("filter_status")) {
-				if (strlen($addDescription) > 0) {
-					$addDescription .= ";";
-				}
-				$addDescription .= $langs->trans("Status")."=";
-				if (GETPOST("filter_status") == '1') {
-					$addFilter .= " AND s.status=1";
-					$addDescription .= $langs->trans("Enabled");
-				} else {
-					$addFilter .= " AND s.status=0";
-					$addDescription .= $langs->trans("Disabled");
-				}
-			}
-			if (GETPOST('default_lang', 'alpha')) {
-				$addFilter .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('default_lang', 'alpha'))."%'";
-				$addDescription = $langs->trans('DefaultLang')."=";
-			}
-			if (GETPOST('filter_lang_thirdparties', 'alpha')) {
-				$addFilter .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('filter_lang_thirdparties', 'alpha'))."%'";
-				$addDescription = $langs->trans('DefaultLang')."=";
-			}
-
 			$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
 			$sql .= " WHERE s.email <> ''";
@@ -129,8 +127,8 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 			$sql .= " AND cs.fk_soc = s.rowid";
 			$sql .= " AND c.rowid = cs.fk_categorie";
-			if (GETPOST('filter', 'int') > 0) {
-				$sql .= " AND c.rowid=".((int) GETPOST('filter', 'int'));
+			if (GETPOST('filter_thirdparties', 'int') > 0) {
+				$sql .= " AND c.rowid=".((int) GETPOST('filter_thirdparties', 'int'));
 			}
 			$sql .= $addFilter;
 			$sql .= " UNION ";
@@ -141,13 +139,15 @@ class mailing_thirdparties extends MailingTargets
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
 			$sql .= " AND cs.fk_soc = s.rowid";
 			$sql .= " AND c.rowid = cs.fk_categorie";
-			if (GETPOST('filter', 'int') > 0) {
-				$sql .= " AND c.rowid=".((int) GETPOST('filter', 'int'));
+			if (GETPOST('filter_thirdparties', 'int') > 0) {
+				$sql .= " AND c.rowid=".((int) GETPOST('filter_thirdparties', 'int'));
 			}
 			$sql .= $addFilter;
 		}
 		$sql .= " ORDER BY email";
 
+		//print $sql;exit;
+
 		// Stock recipients emails into targets table
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -243,7 +243,8 @@ class mailing_thirdparties extends MailingTargets
 
 		$langs->load("companies");
 
-		$s = '<select id="filter_thirdparties" name="filter" class="flat">';
+		// filter
+		$s = '<select id="filter_thirdparties" name="filter_thirdparties" class="flat">';
 
 		// Show categories
 		$sql = "SELECT rowid, label, type, visible";
@@ -293,6 +294,7 @@ class mailing_thirdparties extends MailingTargets
 
 		$s .= '</select> ';
 
+		// filter_client_thirdparties
 		$s .= '<select id="filter_client_thirdparties" name="filter_client_thirdparties" class="flat">';
 		$s .= '<option value="-1">'.$langs->trans('ProspectCustomer').'</option>';
 		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
@@ -309,6 +311,7 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '</select> ';
 		$s .= ajax_combobox("filter_client_thirdparties");
 
+		// filter_status
 		$s .= ' <select id="filter_status_thirdparties" name="filter_status" class="flat">';
 		$s .= '<option value="-1">'.$langs->trans("Status").'</option>';
 		$s .= '<option value="1">'.$langs->trans("Enabled").'</option>';
@@ -316,6 +319,7 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '</select>';
 		$s .= ajax_combobox("filter_status_thirdparties");
 
+		// filter_lang_thirdparties
 		if (getDolGlobalInt('MAIN_MULTILANGS')) {
 			// Choose language
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';

From 9110b1d03f5e68baed53206aac7241a07c2c5ad1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 02:23:16 +0100
Subject: [PATCH 125/300] Fix emailing filter

---
 htdocs/core/modules/mailings/thirdparties.modules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 289433d4dc3..e8f0b9e8f75 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -97,7 +97,7 @@ class mailing_thirdparties extends MailingTargets
 			if (GETPOST("filter_status") == '1') {
 				$addFilter .= " AND s.status=1";
 				$addDescription .= $langs->trans("Enabled");
-			} else {
+			} elseif (GETPOST("filter_status") == '0') {
 				$addFilter .= " AND s.status=0";
 				$addDescription .= $langs->trans("Disabled");
 			}

From c90fa255fd02407c91335037d377010fdcbb0265 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 02:43:37 +0100
Subject: [PATCH 126/300] css

---
 htdocs/comm/mailing/cibles.php                | 22 +++++-------
 .../modules/mailings/thirdparties.modules.php | 36 +++++++++++++++++--
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index b78931be9f2..106d6c3d12a 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -310,22 +310,15 @@ if ($object->fetch($id) >= 0) {
 	if ($allowaddtarget && $user->rights->mailing->creer) {
 		print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin ?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1) : ''), 'generic');
 
-		//print '<table class="noborder centpercent">';
-
 		print '<div class="div-table-responsive">';
 		print '<div class="tagtable centpercent liste_titre_bydiv borderbottom" id="tablelines">';
 
-		//print '<tr class="liste_titre">';
 		print '<div class="tagtr liste_titre">';
-		//print '<td class="liste_titre">'.$langs->trans("RecipientSelectionModules").'</td>';
+		print '<div class="tagtd"></div>';
 		print '<div class="tagtd">'.$langs->trans("RecipientSelectionModules").'</div>';
-		//print '<td class="liste_titre" align="center">'.$langs->trans("NbOfUniqueEMails").'</td>';
 		print '<div class="tagtd" align="center">'.$langs->trans("NbOfUniqueEMails").'</div>';
-		//print '<td class="liste_titre" align="left">'.$langs->trans("Filter").'</td>';
 		print '<div class="tagtd left">'.$langs->trans("Filter").'</div>';
-		//print '<td class="liste_titre" align="center">&nbsp;</td>';
 		print '<div class="tagtd">&nbsp;</div>';
-		//print "</tr>\n";
 		print '</div>';	// End tr
 
 		clearstatcache();
@@ -390,12 +383,13 @@ if ($object->fetch($id) >= 0) {
 						print '<div '.$bctag[$var].'>';
 					}
 
-					print '<div class="tagtd">';
+					print '<div class="tagtd paddingleftimp marginleftonly paddingrightimp marginrightonly valignmiddle center">';
 					if (empty($obj->picto)) {
 						$obj->picto = 'generic';
 					}
-					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle pictomodule pictofixedwidth"');
-					print ' ';
+					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle width25 size15x"');
+					print '</div>';
+					print '<div class="tagtd valignmiddle">';	//  style="height: 4em"
 					print $obj->getDesc();
 					print '</div>';
 
@@ -405,7 +399,7 @@ if ($object->fetch($id) >= 0) {
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
 
-					print '<div class="tagtd center">';
+					print '<div class="tagtd center valignmiddle">';
 					if ($nbofrecipient === '' || $nbofrecipient >= 0) {
 						print $nbofrecipient;
 					} else {
@@ -413,7 +407,7 @@ if ($object->fetch($id) >= 0) {
 					}
 					print '</div>';
 
-					print '<div class="tagtd left">';
+					print '<div class="tagtd left valignmiddle">';
 					if ($allowaddtarget) {
 						try {
 							$filter = $obj->formFilter();
@@ -428,7 +422,7 @@ if ($object->fetch($id) >= 0) {
 					}
 					print '</div>';
 
-					print '<div class="tagtd right">';
+					print '<div class="tagtd right valignmiddle">';
 					if ($allowaddtarget) {
 						print '<input type="submit" class="button button-add small reposition" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 					} else {
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index e8f0b9e8f75..fd91e5e849f 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -89,6 +89,30 @@ class mailing_thirdparties extends MailingTargets
 				$addDescription .= "Unknown status ".GETPOST("filter_client_thirdparties");
 			}
 		}
+		if (GETPOSTISSET("filter_supplier_thirdparties") && GETPOST("filter_supplier_thirdparties") <> '-1') {
+			$addFilter .= " AND s.fournisseur = ".((int) GETPOST("filter_supplier_thirdparties", 'int'));
+			$addDescription = $langs->trans('Supplier')."=";
+			if (GETPOST("filter_supplier_thirdparties") == 0) {
+				$addDescription .= $langs->trans('No');
+			} elseif (GETPOST("filter_supplier_thirdparties") == 1) {
+				$addDescription .= $langs->trans('Yes');
+			} else {
+				$addDescription .= "Unknown status ".GETPOST("filter_supplier_thirdparties");
+			}
+		}
+		if (GETPOSTISSET("filter_status")) {
+			if (strlen($addDescription) > 0) {
+				$addDescription .= ";";
+			}
+			$addDescription .= $langs->trans("Status")."=";
+			if (GETPOST("filter_status") == '1') {
+				$addFilter .= " AND s.status=1";
+				$addDescription .= $langs->trans("Enabled");
+			} elseif (GETPOST("filter_status") == '0') {
+				$addFilter .= " AND s.status=0";
+				$addDescription .= $langs->trans("Disabled");
+			}
+		}
 		if (GETPOSTISSET("filter_status")) {
 			if (strlen($addDescription) > 0) {
 				$addDescription .= ";";
@@ -295,7 +319,7 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '</select> ';
 
 		// filter_client_thirdparties
-		$s .= '<select id="filter_client_thirdparties" name="filter_client_thirdparties" class="flat">';
+		$s .= '<select id="filter_client_thirdparties" name="filter_client_thirdparties" class="flat minwidth100">';
 		$s .= '<option value="-1">'.$langs->trans('ProspectCustomer').'</option>';
 		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 			$s .= '<option value="2">'.$langs->trans('Prospect').'</option>';
@@ -311,7 +335,15 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '</select> ';
 		$s .= ajax_combobox("filter_client_thirdparties");
 
-		// filter_status
+		// filter_supplier_thirdparties
+		$s .= ' <select id="filter_supplier_thirdparties" name="filter_supplier_thirdparties" class="flat minwidth100">';
+		$s .= '<option value="-1">'.$langs->trans("Supplier").'</option>';
+		$s .= '<option value="1">'.$langs->trans("Yes").'</option>';
+		$s .= '<option value="0">'.$langs->trans("No").'</option>';
+		$s .= '</select>';
+		$s .= ajax_combobox("filter_supplier_thirdparties");
+
+		// filter_status_thirdparties
 		$s .= ' <select id="filter_status_thirdparties" name="filter_status" class="flat">';
 		$s .= '<option value="-1">'.$langs->trans("Status").'</option>';
 		$s .= '<option value="1">'.$langs->trans("Enabled").'</option>';

From 03319bd06ecded9a16550d6cc77021b10552676e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 02:44:43 +0100
Subject: [PATCH 127/300] Fix trans

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

diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index f83637c9c40..4d98f0e7f49 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 

From b04e7e38e653f28a28e9902c9af50e85164b32a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 02:53:34 +0100
Subject: [PATCH 128/300] Message

---
 htdocs/comm/mailing/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 80b808524c8..d3833cf1b94 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -896,7 +896,7 @@ if ($action == 'create') {
 						$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft" disabled>php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
 					}
 
-					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', '', '', 1, 330, 600, 0, $langs->trans("Confirm"), $langs->trans("Cancel"));
+					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', '', '', 1, 380, 660, 0, $langs->trans("Confirm"), $langs->trans("Cancel"));
 				}
 			}
 

From 6092932141dc8b4419faf168aba93ffe0d6e3748 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 02:55:28 +0100
Subject: [PATCH 129/300] css

---
 htdocs/comm/mailing/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index d3833cf1b94..5da75c22fce 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -893,7 +893,7 @@ if ($action == 'create') {
 					if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || $conf->global->MAILING_LIMIT_SENDBYCLI >= 0) {
 						$text .= '<br><br>';
 						$text .= $langs->trans("MailingNeedCommand");
-						$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft" disabled>php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
+						$text .= '<br><textarea class="quatrevingtpercent" rows="'.ROWS_2.'" wrap="soft" disabled>php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
 					}
 
 					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', '', '', 1, 380, 660, 0, $langs->trans("Confirm"), $langs->trans("Cancel"));

From 7b7b8fda24a3fa8af51c9de1bb3ba6a4464345c5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 04:05:18 +0100
Subject: [PATCH 130/300] Fix sending emails with data:image inside

---
 htdocs/comm/mailing/card.php          | 10 ++++-----
 htdocs/core/class/CMailFile.class.php | 29 +++++++++++++++++----------
 htdocs/langs/en_US/mails.lang         |  1 +
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 5da75c22fce..2ae78628ba3 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -201,9 +201,9 @@ if (empty($reshook)) {
 
 					$thirdpartystatic = new Societe($db);
 					// Loop on each email and send it
-					$i = 0;
+					$iforemailloop = 0;
 
-					while ($i < $num && $i < $conf->global->MAILING_LIMIT_SENDBYWEB) {
+					while ($iforemailloop < $num && $iforemailloop < $conf->global->MAILING_LIMIT_SENDBYWEB) {
 						// Here code is common with same loop ino mailing-send.php
 						$res = 1;
 						$now = dol_now();
@@ -366,7 +366,7 @@ if (empty($reshook)) {
 							// Mail successful
 							$nbok++;
 
-							dol_syslog("comm/mailing/card.php: ok for #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_DEBUG);
+							dol_syslog("comm/mailing/card.php: ok for #".$iforemailloop.($mail->error ? ' - '.$mail->error : ''), LOG_DEBUG);
 
 							$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 							$sql .= " SET statut=1, date_envoi = '".$db->idate($now)."' WHERE rowid=".((int) $obj->rowid);
@@ -405,7 +405,7 @@ if (empty($reshook)) {
 							// Mail failed
 							$nbko++;
 
-							dol_syslog("comm/mailing/card.php: error for #".$i.($mail->error ? ' - '.$mail->error : ''), LOG_WARNING);
+							dol_syslog("comm/mailing/card.php: error for #".$iforemailloop.($mail->error ? ' - '.$mail->error : ''), LOG_WARNING);
 
 							$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
 							$sql .= " SET statut=-1, error_text='".$db->escape($mail->error)."', date_envoi='".$db->idate($now)."' WHERE rowid=".((int) $obj->rowid);
@@ -415,7 +415,7 @@ if (empty($reshook)) {
 							}
 						}
 
-						$i++;
+						$iforemailloop++;
 					}
 				} else {
 					setEventMessages($langs->transnoentitiesnoconv("NoMoreRecipientToSendTo"), null, 'mesgs');
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index ecfe968bd02..d6b1a275d87 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -255,12 +255,14 @@ class CMailFile
 			$this->html = $msg;
 
 			$findimg = 0;
-			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS)) {
+			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS)) {	// Off by default
 				// Search into the body for <img tags of links in medias files to replace them with an embedded file
 				// Note because media links are public, this should be useless, except avoid blocking images with email browser.
 				// This convert an embedd file with src="/viewimage.php?modulepart... into a cid link
+				// TODO Exclude viewimage used for the read tracker ?
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
 			}
+
 			if (!empty($conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA)) {
 				// Search into the body for <img src="data:image/ext;base64,..." to replace them with an embedded file
 				// This convert an embedded file with src="data:image... into a cid link + attached file
@@ -1708,7 +1710,7 @@ class CMailFile
 							$this->html_images[$i]["content_type"] = $this->image_types[$ext];
 						}
 						// cid
-						$this->html_images[$i]["cid"] = dol_hash(uniqid(time()), 3); // Force md5 hash (does not contains special chars)
+						$this->html_images[$i]["cid"] = dol_hash($this->html_images[$i]["fullpath"], 'md5'); // Force md5 hash (does not contains special chars)
 						// type
 						$this->html_images[$i]["type"] = 'cidfromurl';
 
@@ -1800,17 +1802,22 @@ class CMailFile
 			foreach ($matches[1] as $key => $ext) {
 				// We save the image to send in disk
 				$filecontent = $matches[2][$key];
-				$cid = 'cid000'.dol_hash($this->html, 'md5');		// The id must not change if image is same
+
+				$cid = 'cid000'.dol_hash($filecontent, 'md5');		// The id must not change if image is same
+
 				$destfiletmp = $images_dir.'/'.$cid.'.'.$ext;
 
-				$fhandle = @fopen($destfiletmp, 'w');
-				if ($fhandle) {
-					$nbofbyteswrote = fwrite($fhandle, base64_decode($filecontent));
-					fclose($fhandle);
-					@chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
-				} else {
-					$this->errors[] = "Failed to open file '".$destfiletmp."' for write";
-					return -1;
+				if (!dol_is_file($destfiletmp)) {	// If file does not exist yet (this is the case for the first email sent with a data:image inside)
+					dol_syslog("write the cid file ".$destfiletmp);
+					$fhandle = @fopen($destfiletmp, 'w');
+					if ($fhandle) {
+						$nbofbyteswrote = fwrite($fhandle, base64_decode($filecontent));
+						fclose($fhandle);
+						@chmod($destfiletmp, octdec($conf->global->MAIN_UMASK));
+					} else {
+						$this->errors[] = "Failed to open file '".$destfiletmp."' for write";
+						return -1;
+					}
 				}
 
 				if (file_exists($destfiletmp)) {
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 4d98f0e7f49..0414854a3f4 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact 
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
\ No newline at end of file

From 42696954f3c2003eba94dca6e814759397f85077 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 04:25:23 +0100
Subject: [PATCH 131/300] Increase public limit

---
 dev/setup/fail2ban/jail.local | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/setup/fail2ban/jail.local b/dev/setup/fail2ban/jail.local
index 733987aa45c..bd1f7959f08 100644
--- a/dev/setup/fail2ban/jail.local
+++ b/dev/setup/fail2ban/jail.local
@@ -31,6 +31,7 @@ maxretry = 10
 [web-dol-limitpublic]
 
 ; rule to add rate limit on some public pages
+; note you must keep enough for public access like agenda export, emailing trackers, stripe ipn access, ...
 enabled = true
 port    = http,https
 filter  = web-dolibarr-limitpublic
@@ -38,5 +39,5 @@ logpath = /mypath/documents/documents/dolibarr.log
 action  = %(action_mw)s
 bantime  = 86400     ; 1 day
 findtime = 86400     ; 1 day
-maxretry = 500
+maxretry = 1000
 

From e957e0a945be76d6bcdb7d5657822b068d20864b Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 25 Feb 2023 07:16:19 +0100
Subject: [PATCH 132/300] v17 Merge problem - Restore #22762 - Accountancy -
 Better warning for situation invoice in index

---
 htdocs/accountancy/index.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 628dceafd12..8cda6a5c6e5 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -83,12 +83,7 @@ $help_url = 'EN:Module_Double_Entry_Accounting#Setup';
 
 llxHeader('', $langs->trans("AccountancyArea"), $help_url);
 
-if (!empty($conf->global->INVOICE_USE_SITUATION) && $conf->global->INVOICE_USE_SITUATION == 1) {
-	print load_fiche_titre($langs->trans("AccountancyArea"), '', 'accountancy');
-
-	print '<span class="opacitymedium">'.$langs->trans("SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices")."</span>\n";
-	print "<br>";
-} elseif (isModEnabled('accounting')) {
+if (isModEnabled('accounting')) {
 	$step = 0;
 
 	$resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
@@ -120,6 +115,11 @@ if (!empty($conf->global->INVOICE_USE_SITUATION) && $conf->global->INVOICE_USE_S
 		print "<br>";
 	}
 
+	if (!empty($conf->global->INVOICE_USE_SITUATION) && $conf->global->INVOICE_USE_SITUATION == 1) {
+		print info_admin($langs->trans("SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices"));
+		print "<br>";
+	}
+
 	print '<div class="'.($helpisexpanded ? '' : 'hideobject').'" id="idfaq">'; // hideobject is to start hidden
 	print "<br>\n";
 	print '<span class="opacitymedium">'.$langs->trans("AccountancyAreaDescIntro")."</span><br>\n";

From 15987bc46f660377fded7c86bb51353b7463aaac Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 25 Feb 2023 07:22:20 +0100
Subject: [PATCH 133/300] v17 Merge problem - Restore #22762 - Accountancy -
 Better warning for situation invoice in index

---
 htdocs/accountancy/index.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 8cda6a5c6e5..f5feef4a0f2 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -115,11 +115,6 @@ if (isModEnabled('accounting')) {
 		print "<br>";
 	}
 
-	if (!empty($conf->global->INVOICE_USE_SITUATION) && $conf->global->INVOICE_USE_SITUATION == 1) {
-		print info_admin($langs->trans("SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices"));
-		print "<br>";
-	}
-
 	print '<div class="'.($helpisexpanded ? '' : 'hideobject').'" id="idfaq">'; // hideobject is to start hidden
 	print "<br>\n";
 	print '<span class="opacitymedium">'.$langs->trans("AccountancyAreaDescIntro")."</span><br>\n";

From c8e32bf96ff9849c7968f394bc6dbf1a281774df Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 25 Feb 2023 07:29:57 +0100
Subject: [PATCH 134/300] FIX Activate widget Alert product on stock only on
 home

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

diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 5224f82a2f5..ce08252ced4 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -104,7 +104,7 @@ class modProduct extends DolibarrModules
 		// Boxes
 		$this->boxes = array(
 			0=>array('file'=>'box_produits.php', 'enabledbydefaulton'=>'Home'),
-			1=>array('file'=>'box_produits_alerte_stock.php', 'enabledbydefaulton'=>''),
+			1=>array('file'=>'box_produits_alerte_stock.php', 'enabledbydefaulton'=>'Home'),
 			2=>array('file'=>'box_graph_product_distribution.php', 'enabledbydefaulton'=>'Home')
 		);
 

From d7d8653603c2d18002806aa850ec666929c114c2 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Sat, 25 Feb 2023 08:20:31 +0100
Subject: [PATCH 135/300] FIX Members Index - Missing colspan & language key on
 widget

---
 htdocs/core/boxes/box_members_by_type.php               | 4 ++--
 htdocs/core/boxes/box_members_subscriptions_by_year.php | 4 ++--
 htdocs/langs/en_US/members.lang                         | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index b3f3504cee8..f400ae6fb3d 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -80,7 +80,7 @@ class box_members_by_type extends ModeleBoxes
 	public function loadBox($max = 5)
 	{
 		global $user, $langs, $conf;
-		$langs->load("boxes");
+		$langs->loadLangs(array("boxes", "members"));
 
 		$this->max = $max;
 
@@ -284,7 +284,7 @@ class box_members_by_type extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-						'td' => 'class="center"',
+						'td' => 'colspan="7" class="center"',
 						'text' => $langs->trans("NoRecordedMembersByType")
 					);
 				} else {
diff --git a/htdocs/core/boxes/box_members_subscriptions_by_year.php b/htdocs/core/boxes/box_members_subscriptions_by_year.php
index 716b8ed0482..b7f2ea47229 100644
--- a/htdocs/core/boxes/box_members_subscriptions_by_year.php
+++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php
@@ -79,7 +79,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 	public function loadBox($max = 5)
 	{
 		global $user, $langs, $conf;
-		$langs->load("boxes");
+		$langs->loadLangs(array("boxes", "members"));
 
 		$this->max = $max;
 
@@ -191,7 +191,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 
 				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
-						'td' => 'class="center"',
+						'td' => 'colspan="4" class="center"',
 						'text' => $langs->trans("NoRecordedMembers"),
 					);
 				} else {
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index f8981df17d9..1597f9f2719 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -4,6 +4,8 @@ MemberCard=Member card
 SubscriptionCard=Subscription card
 Member=Member
 Members=Members
+NoRecordedMembers=No recorded members
+NoRecordedMembersByType=No recorded members
 ShowMember=Show member card
 UserNotLinkedToMember=User not linked to a member
 ThirdpartyNotLinkedToMember=Third party not linked to a member
@@ -231,4 +233,4 @@ ForceMemberNature=Force member nature (Individual or Corporation)
 CreateDolibarrLoginDesc=The creation of a user login for members allows them to connect to the application. Depending on the authorizations granted, they will be able, for example, to consult or modify their file themselves.
 CreateDolibarrThirdPartyDesc=A thirdparty is the legal entity that will be used on the invoice if you decide to generate invoice for each contribution. You will be able to create it later during the process of recording the contribution.
 MemberFirstname=Member firstname
-MemberLastname=Member lastname
\ No newline at end of file
+MemberLastname=Member lastname

From 400b246266fd73dd41c6e2a24e5b12c7a5220e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 25 Feb 2023 10:07:07 +0100
Subject: [PATCH 136/300] doc

---
 htdocs/fourn/class/fournisseur.commande.class.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 86be26b17ef..08189b4c48c 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -176,8 +176,20 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public $fk_account;
 
+	/**
+	 * @var int payment choice ID
+	 */
 	public $mode_reglement_id;
+
+	/**
+	 * @var string payment choice code
+	 */
 	public $mode_reglement_code;
+
+	/**
+	 * @var string paymnet choice label
+	 */
+	public $mode_reglement;
 	public $user_author_id;
 	public $user_valid_id;
 	public $user_approve_id;

From aff284b26764b5753478f1702ba47704282e6ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Sat, 25 Feb 2023 10:11:15 +0100
Subject: [PATCH 137/300] clean code

---
 htdocs/fourn/class/fournisseur.commande.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 08189b4c48c..6b7c2cef273 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -284,7 +284,7 @@ class CommandeFournisseur extends CommonOrder
 		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>3, 'position'=>175),
 		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>3, 'position'=>180),
 		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>0, 'position'=>190),
-		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'$conf->banque->enabled', 'visible'=>3, 'position'=>200),
+		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'isModEnabled("banque")', 'visible'=>3, 'position'=>200),
 		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>1, 'visible'=>3, 'position'=>205),
 		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLocation', 'enabled'=>1, 'visible'=>3, 'position'=>210),
 		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>0, 'position'=>215),
@@ -1010,8 +1010,8 @@ class CommandeFournisseur extends CommonOrder
 		if (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER)) {
 			$mybool = false;
 
-			$file = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER.'.php';
-			$classname = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER;
+			$file = getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER').'.php';
+			$classname = getDolGlobalString('COMMANDE_SUPPLIER_ADDON_NUMBER');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1473,7 +1473,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".self::STATUS_DRAFT;
 		$sql .= ", ".((int) $this->source);
-		$sql .= ", '".$this->db->escape($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)."'";
+		$sql .= ", '".$this->db->escape(getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF'))."'";
 		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : 'null');
 		$sql .= ", ".($this->cond_reglement_id > 0 ? $this->cond_reglement_id : 'null');
 		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
@@ -3280,7 +3280,7 @@ class CommandeFournisseur extends CommonOrder
 			if (!empty($this->model_pdf)) {
 				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
-				$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
+				$modele = getDolGlobalString('COMMANDE_SUPPLIER_ADDON_PDF');
 			}
 		}
 

From b83b9ff598bba7fc67bc4513d30bf784f73bb9ad Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 25 Feb 2023 12:06:06 +0100
Subject: [PATCH 138/300] fix : Warning: Undefined array key tomail in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/actions_sendmails.inc.php
 on line 193

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

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 4f7580bb8ca..e459437a74e 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -190,7 +190,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 			$tmparray[] = trim(GETPOST('sendto', 'alphawithlgt'));
 		}
 
-		if (trim($_POST['tomail'])) {
+		if (isset($_POST['tomail']) && trim($_POST['tomail'])) {
 			// Recipients are provided into free hidden text field
 			$tmparray[] = trim(GETPOST('tomail', 'alphawithlgt'));
 		}

From 8b09e0f09024e5115922e2c0c4ae05ceef0d9210 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 25 Feb 2023 12:38:01 +0100
Subject: [PATCH 139/300] fix : Warning: Undefined property: Societe:: in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/actions_sendmails.inc.php
 on line 350

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

diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index e459437a74e..5744316eb4a 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -346,7 +346,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
 			// Make substitution in email content
 			$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
 			$substitutionarray['__EMAIL__'] = $sendto;
-			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($object->thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+			$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?id='.urlencode($object->thirdparty->id).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
 
 			$parameters = array('mode'=>'formemail');
 			complete_substitutions_array($substitutionarray, $langs, $object, $parameters);

From 05a32ab99368cfb42d3bf6007ac391ede2f000c6 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 25 Feb 2023 14:31:20 +0100
Subject: [PATCH 140/300] fix : Fatal error: Uncaught TypeError: Unsupported
 operand types: string / int in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/comm/propal/card.php
 on line 1420

---
 htdocs/comm/propal/card.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index f2c549f91f7..e14a2c05246 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1363,6 +1363,9 @@ if (empty($reshook)) {
 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 
 		$remise_percent = price2num(GETPOST('remise_percent'), '', 2);
+		if (empty($remise_percent)) {
+			$remise_percent = 0;
+		}
 
 		// Prepare a price equivalent for minimum price check
 		$pu_equivalent = $pu_ht;

From 822b81913fbd0df0642f8660e05a296f10176a2a Mon Sep 17 00:00:00 2001
From: Francis Appels <francis.appels@yahoo.com>
Date: Sat, 25 Feb 2023 14:38:32 +0100
Subject: [PATCH 141/300] Fix dol_print_date warning

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

diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 376e14c277f..d880673530d 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1738,8 +1738,8 @@ class FichinterLigne extends CommonObjectLine
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
 			$sql .= " SET duree = ".((int) $total_duration);
-			$sql .= " , dateo = ".(!empty($obj->dateo) ? "'".$this->db->idate($obj->dateo)."'" : "null");
-			$sql .= " , datee = ".(!empty($obj->datee) ? "'".$this->db->idate($obj->datee)."'" : "null");
+			$sql .= " , dateo = ".(!empty($obj->dateo) ? "'".$this->db->escape($obj->dateo)."'" : "null");
+			$sql .= " , datee = ".(!empty($obj->datee) ? "'".$this->db->escape($obj->datee)."'" : "null");
 			$sql .= " WHERE rowid = ".((int) $this->fk_fichinter);
 
 			dol_syslog("FichinterLigne::update_total", LOG_DEBUG);

From 2c57198de763e3c5c6122a82c58369304218acec Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 25 Feb 2023 14:54:07 +0100
Subject: [PATCH 142/300] fix : Warning: Undefined property: stdClass:: in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/files.lib.php
 on line 2847 and Attempt to read property lire on null in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/files.lib.php
 on line 2847

---
 htdocs/core/lib/files.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 23659cd769b..e380563d6c8 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2842,9 +2842,9 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->deplacement->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
-	} elseif (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity])) {
+	} elseif (($modulepart == 'propal' || $modulepart == 'propale') && isset($conf->propal->multidir_output[$entity])) {
 		// Wrapping pour les propales
-		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if (property_exists($fuser->rights, 'propal') && ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file))) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;

From e0cf29b1225a79793687b51b93e798cbb9502886 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 15:32:29 +0100
Subject: [PATCH 143/300] Fix #yogosha14973

---
 htdocs/ecm/dir_add_card.php |  8 ++++++--
 htdocs/ecm/index.php        | 16 +++++++++++-----
 htdocs/ecm/index_auto.php   | 12 ++++++------
 htdocs/langs/en_US/ecm.lang |  2 +-
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index acdc6c2990a..5de525e17ea 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -94,13 +94,16 @@ if (!empty($section)) {
 
 // Permissions
 $permissiontoadd = 0;
+$permissiontodelete = 0;
 $permissiontoupload = 0;
 if ($module == 'ecm') {
 	$permissiontoadd = $user->rights->ecm->setup;
+	$permissiontodelete = $user->rights->ecm->setup;
 	$permissiontoupload = $user->rights->ecm->upload;
 }
 if ($module == 'medias') {
 	$permissiontoadd = ($user->rights->mailing->creer || $user->rights->website->write);
+	$permissiontodelete = ($user->rights->mailing->creer || $user->rights->website->write);
 	$permissiontoupload = ($user->rights->mailing->creer || $user->rights->website->write);
 }
 
@@ -189,7 +192,7 @@ if ($action == 'add' && $permissiontoadd) {
 			exit;
 		}
 	}
-} elseif ($action == 'confirm_deletesection' && $confirm == 'yes' && $permissiontoadd) {
+} elseif ($action == 'confirm_deletesection' && $confirm == 'yes' && $permissiontodelete) {
 	// Deleting file
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
@@ -231,7 +234,8 @@ if ($action == 'create') {
 	print '<table class="border centpercent">';
 
 	// Label
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" class="minwidth100" maxlength="32" value="'.(GETPOST("label", 'alpha') ? GETPOST("label", 'alpha') : $ecmdir->label).'" autofocus></td></tr>'."\n";
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td>';
+	print '<input name="label" class="minwidth100" maxlength="32" value="'.GETPOST("label", 'alpha').'" autofocus></td></tr>'."\n";
 
 	print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
 	print $formecm->selectAllSections((GETPOST("catParent", 'alpha') ? GETPOST("catParent", 'alpha') : $ecmdir->fk_parent), 'catParent', $module);
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 9eb512bc96d..d6cf8a0993f 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -83,6 +83,12 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'ecm', 0);
 
+$permissiontoread = $user->hasRight('ecm', 'read');
+$permissiontocreate = $user->hasRight('ecm', 'upload');
+$permissiontocreatedir = $user->hasRight('ecm', 'setup');
+$permissiontodelete = $user->hasRight('ecm', 'upload');
+$permissiontodeletedir = $user->hasRight('ecm', 'setup');
+
 
 /*
  *	Actions
@@ -93,7 +99,7 @@ $result = restrictedArea($user, 'ecm', 0);
 //include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 // Upload file (code similar but different than actions_linkedfiles.inc.php)
-if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
+if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC) && $permissiontocreate) {
 	// Define relativepath and upload_dir
 	$relativepath = '';
 	if ($ecmdir->id) {
@@ -130,7 +136,7 @@ if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 }
 
 // Remove file (code similar but different than actions_linkedfiles.inc.php)
-if ($action == 'confirm_deletefile') {
+if ($action == 'confirm_deletefile' && $permissiontodelete) {
 	if (GETPOST('confirm') == 'yes') {
 		// GETPOST('urlfile','alpha') is full relative URL from ecm root dir. Contains path of all sections.
 
@@ -152,7 +158,7 @@ if ($action == 'confirm_deletefile') {
 }
 
 // Add directory
-if ($action == 'add' && $user->rights->ecm->setup) {
+if ($action == 'add' && $permissiontocreatedir) {
 	$ecmdir->ref                = 'NOTUSEDYET';
 	$ecmdir->label              = GETPOST("label");
 	$ecmdir->description        = GETPOST("desc");
@@ -170,7 +176,7 @@ if ($action == 'add' && $user->rights->ecm->setup) {
 }
 
 // Remove directory
-if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes') {
+if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes' && $permissiontodeletedir) {
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
@@ -180,7 +186,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
 // Refresh directory view
 // This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
 // To refresh content of dir with cache, just open the dir in edit mode.
-if ($action == 'refreshmanual') {
+if ($action == 'refreshmanual' && $permissiontoread) {
 	$ecmdirtmp = new EcmDirectory($db);
 
 	// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 342d7d74129..628ef871ea5 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -34,12 +34,6 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'ecm', 0);
-
 // Get parameters
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -87,6 +81,12 @@ $userstatic = new User($db);
 
 $error = 0;
 
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'ecm', 0);
+
 
 /*
  *	Actions
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 5ced4ec5617..724e5aa59d7 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=DMS/ECM area
 ECMAreaDesc=The DMS/ECM (Document Management System / Electronic Content Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
 ECMAreaDesc2a=* Manual directories can be used to save documents not linked to a particular element.
 ECMAreaDesc2b=* Automatic directories are filled automatically when adding documents from the page of an element.
-ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files from emailing or website module.
+ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
 ECMSectionWasCreated=Directory <b>%s</b> has been created.
 ECMSearchByKeywords=Search by keywords

From ca1508e3331fff23e12c5734a5a12918558121ec Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sat, 25 Feb 2023 16:29:55 +0100
Subject: [PATCH 144/300] fix : Warning: Undefined property: stdClass:: in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/files.lib.php
 on line 2953

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

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index e380563d6c8..97b803822e9 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2950,7 +2950,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) {
 			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		}
-		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i', $original_file)) {
+		if ((isset($fuser->rights->produit) && $fuser->rights->produit->{$lire}) || (isset($fuser->rights->service) && $fuser->rights->service->{$lire}) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		if (isModEnabled("product")) {

From ed9db6c9ddf50de9255078b44539a55d29e69530 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 16:36:48 +0100
Subject: [PATCH 145/300] Fix #yogosha15050

---
 htdocs/user/card.php | 101 +++++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 47 deletions(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 688ac6c28ac..08c2defd546 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -63,6 +63,9 @@ if (isModEnabled('stock')) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 }
 
+// Load translation files required by page
+$langs->loadLangs(array('users', 'companies', 'ldap', 'admin', 'hrm', 'stocks', 'other'));
+
 $id = GETPOST('id', 'int');
 $action		= GETPOST('action', 'aZ09');
 $mode = GETPOST('mode', 'alpha');
@@ -77,42 +80,8 @@ $datestartvalidity = dol_mktime(0, 0, 0, GETPOST('datestartvaliditymonth', 'int'
 $dateendvalidity = dol_mktime(0, 0, 0, GETPOST('dateendvaliditymonth', 'int'), GETPOST('dateendvalidityday', 'int'), GETPOST('dateendvalidityyear', 'int'));
 $dateofbirth = dol_mktime(0, 0, 0, GETPOST('dateofbirthmonth', 'int'), GETPOST('dateofbirthday', 'int'), GETPOST('dateofbirthyear', 'int'));
 
-// Define value to know what current user can do on users
-$canadduser = (!empty($user->admin) || $user->hasRight("user", "user", "write"));
-$canreaduser = (!empty($user->admin) || $user->hasRight("user", "user", "read"));
-$canedituser = (!empty($user->admin) || $user->hasRight("user", "user", "write"));
-$candisableuser = (!empty($user->admin) || $user->hasRight("user", "user", "delete"));
-$canreadgroup = $canreaduser;
-$caneditgroup = $canedituser;
-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-	$canreadgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "read"));
-	$caneditgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "write"));
-}
-
 $childids = $user->getAllChildIds(1);	// For later, test on salary visibility
 
-// Define value to know what current user can do on properties of edited user
-if ($id > 0) {
-	// $user is the current logged user, $id is the user we want to edit
-	$caneditfield = ((($user->id == $id) && $user->hasRight("user", "self", "write")) || (($user->id != $id) && $user->hasRight("user", "user", "write")));
-	$caneditpassword = ((($user->id == $id) && $user->hasRight("user", "self", "password")) || (($user->id != $id) && $user->hasRight("user", "user", "password")));
-}
-
-// Security check
-$socid = 0;
-if ($user->socid > 0) {
-	$socid = $user->socid;
-}
-$feature2 = 'user';
-$result = restrictedArea($user, 'user', $id, 'user', $feature2);
-
-if ($user->id != $id && !$canreaduser) {
-	accessforbidden();
-}
-
-// Load translation files required by page
-$langs->loadLangs(array('users', 'companies', 'ldap', 'admin', 'hrm', 'stocks', 'other'));
-
 $object = new User($db);
 $extrafields = new ExtraFields($db);
 
@@ -129,6 +98,38 @@ $error = 0;
 $acceptlocallinktomedia = (acceptLocalLinktoMedia() > 0 ? 1 : 0);
 
 
+// Security check
+$socid = 0;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+$feature2 = 'user';
+$result = restrictedArea($user, 'user', $id, 'user', $feature2);
+
+// Define value to know what current user can do on users
+$canadduser = (!empty($user->admin) || $user->hasRight("user", "user", "write"));
+$canreaduser = (!empty($user->admin) || $user->hasRight("user", "user", "read"));
+$canedituser = (!empty($user->admin) || $user->hasRight("user", "user", "write"));	// edit other user
+$candisableuser = (!empty($user->admin) || $user->hasRight("user", "user", "delete"));
+$canreadgroup = $canreaduser;
+$caneditgroup = $canedituser;
+if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+	$canreadgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "read"));
+	$caneditgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "write"));
+}
+
+if ($user->id != $id && !$canreaduser) {
+	accessforbidden();
+}
+
+// Define value to know what current user can do on properties of edited user
+if ($id > 0) {
+	// $user is the current logged user, $id is the user we want to edit
+	$canedituser = (($user->id == $id) && $user->hasRight("user", "self", "write"));	// can edit myself
+	$caneditfield = ((($user->id == $id) && $user->hasRight("user", "self", "write")) || (($user->id != $id) && $user->hasRight("user", "user", "write")));
+	$caneditpassword = ((($user->id == $id) && $user->hasRight("user", "self", "password")) || (($user->id != $id) && $user->hasRight("user", "user", "password")));
+}
+
 
 /**
  * Actions
@@ -390,7 +391,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update' && !$cancel) {
+	if ($action == 'update' && $canedituser) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		if ($caneditfield) {    // Case we can edit all field
@@ -430,8 +431,12 @@ if (empty($reshook)) {
 					$object->national_registration_number = GETPOST("national_registration_number", 'alphanohtml');
 				}
 				$object->gender = GETPOST("gender", 'aZ09');
-				$object->pass = GETPOST("password", 'none');	// We can keep 'none' for password fields
-				$object->api_key = (GETPOST("api_key", 'alphanohtml')) ? GETPOST("api_key", 'alphanohtml') : $object->api_key;
+				if ($caneditpassword) {
+					$object->pass = GETPOST("password", 'none');	// We can keep 'none' for password fields
+				}
+				if ($caneditpassword || $user->hasRight("api", "apikey", "generate")) {
+					$object->api_key = (GETPOST("api_key", 'alphanohtml')) ? GETPOST("api_key", 'alphanohtml') : $object->api_key;
+				}
 				if (!empty($user->admin)) { 	// admin flag can only be set/unset by an admin user. A test is also done later when forging sql request
 					$object->admin = GETPOST("admin", "int");
 				}
@@ -2074,7 +2079,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 								print "</td></tr>\n";
 							}
 						} else {
-							print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+							print '<tr class="oddeven"><td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 						}
 
 						print "</table>";
@@ -2091,7 +2096,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 		/*
 		 * Card in edit mode
 		 */
-		if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id))) {
+		if ($action == 'edit' && ($canedituser || $caneditpassword)) {
 			print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST" name="updateuser" enctype="multipart/form-data">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="update">';
@@ -2417,12 +2422,14 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print "</td></tr>\n";
 
 			// API key
-			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin || $user->hasRight("api", "apikey", "generate"))) {
+			if (isModEnabled('api')) {
 				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 				print '<td>';
-				print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
-				if (!empty($conf->use_javascript_ajax)) {
-					print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
+				if ($caneditpassword || $user->hasRight("api", "apikey", "generate")) {
+					print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
+					if (!empty($conf->use_javascript_ajax)) {
+						print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_api_key" class="linkobject"');
+					}
 				}
 				print '</td></tr>';
 			}
@@ -2879,10 +2886,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 }
 
-if (!empty($conf->api->enabled)) {
-	// Add button to autosuggest a key
-	include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-	print dolJSToSetRandomPassword('password', 'generate_password', 0);
+// Add button to autosuggest a key
+include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+print dolJSToSetRandomPassword('password', 'generate_password', 0);
+if (isModEnabled('api')) {
 	print dolJSToSetRandomPassword('api_key', 'generate_api_key', 1);
 }
 

From cbb6ca071ab76e4e2d5f6c215ff02d7ebadb3d0d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 25 Feb 2023 19:48:33 +0100
Subject: [PATCH 146/300] Fix #yogosha15157

---
 htdocs/adherents/class/api_members.class.php  |   7 +-
 .../class/api_memberstypes.class.php          |   5 +-
 .../class/api_subscriptions.class.php         |   5 +-
 htdocs/api/class/api.class.php                |   4 +-
 htdocs/api/class/api_setup.class.php          | 112 +++++++----------
 htdocs/asset/class/asset.class.php            |   2 +-
 htdocs/bom/class/api_boms.class.php           |   7 +-
 htdocs/bookcal/class/booking.class.php        |   2 +-
 .../categories/class/api_categories.class.php |   7 +-
 .../action/class/api_agendaevents.class.php   |   7 +-
 .../comm/propal/class/api_proposals.class.php |  17 ++-
 htdocs/comm/propal/class/propal.class.php     |   2 +-
 htdocs/commande/class/api_orders.class.php    |   7 +-
 htdocs/commande/class/commande.class.php      |   2 +-
 .../bank/class/api_bankaccounts.class.php     |  14 +--
 .../facture/class/api_invoices.class.php      |   7 +-
 .../facture/class/facture-rec.class.php       |   2 +-
 htdocs/compta/facture/class/facture.class.php |   2 +-
 htdocs/contrat/class/api_contracts.class.php  |   7 +-
 htdocs/contrat/class/contrat.class.php        |   2 +-
 htdocs/core/class/html.form.class.php         |  57 ++-------
 htdocs/core/customreports.php                 |  15 +--
 htdocs/core/lib/functions.lib.php             | 118 +++++++++++++-----
 htdocs/don/class/api_donations.class.php      |   7 +-
 .../class/conferenceorbooth.class.php         |   4 +-
 .../class/conferenceorboothattendee.class.php |   2 +-
 .../expedition/class/api_shipments.class.php  |   7 +-
 .../class/api_expensereports.class.php        |   7 +-
 .../class/api_interventions.class.php         |   7 +-
 htdocs/fichinter/class/fichinter.class.php    |   2 +-
 .../class/api_supplier_invoices.class.php     |   7 +-
 .../fourn/class/api_supplier_orders.class.php |   7 +-
 .../class/fournisseur.commande.class.php      |   2 +-
 .../class/api_knowledgemanagement.class.php   |   7 +-
 .../template/class/api_mymodule.class.php     |   7 +-
 .../template/class/myobject.class.php         |   2 +-
 htdocs/mrp/class/api_mos.class.php            |   7 +-
 htdocs/mrp/class/mo.class.php                 |   4 +-
 .../class/api_partnership.class.php           |   7 +-
 .../partnership/class/partnership.class.php   |   6 +-
 htdocs/product/class/api_products.class.php   |  22 ++--
 .../stock/class/api_stockmovements.class.php  |   7 +-
 .../stock/class/api_warehouses.class.php      |   7 +-
 htdocs/product/stock/class/entrepot.class.php |   4 +-
 .../stock/class/mouvementstock.class.php      |   4 +-
 .../class/stocktransfer.class.php             |   2 +-
 htdocs/projet/class/api_projects.class.php    |   7 +-
 htdocs/projet/class/api_tasks.class.php       |   7 +-
 .../reception/class/api_receptions.class.php  |   7 +-
 .../class/api_recruitment.class.php           |  14 +--
 .../class/recruitmentjobposition.class.php    |   6 +-
 htdocs/societe/class/api_contacts.class.php   |   7 +-
 .../societe/class/api_thirdparties.class.php  |   7 +-
 .../class/api_supplier_proposals.class.php    |   7 +-
 htdocs/ticket/class/api_tickets.class.php     |   7 +-
 htdocs/user/class/api_users.class.php         |  14 +--
 htdocs/zapier/class/api_zapier.class.php      |   7 +-
 test/phpunit/FunctionsLibTest.php             |  28 +++++
 58 files changed, 321 insertions(+), 345 deletions(-)

diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 51ef1153a57..4ecf79d9079 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -238,11 +238,10 @@ class Members extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index 95c514bfedf..8179612d769 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -103,11 +103,10 @@ class MembersTypes extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 67484a723fd..dfde21dc5a1 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -101,11 +101,10 @@ class Subscriptions extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index e0acc8faac8..3a1a176d818 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -302,6 +302,7 @@ class DolibarrApi
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Return if a $sqlfilters parameter is valid
+	 * Function no more used. Kept for backward compatibility with old APIs of modules
 	 *
 	 * @param  	string   		$sqlfilters     sqlfilter string
 	 * @param	string			$error			Error message
@@ -317,7 +318,8 @@ class DolibarrApi
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
-	 * Function to forge a SQL criteria from a Generic filter string
+	 * Function to forge a SQL criteria from a Generic filter string.
+	 * Function no more used. Kept for backward compatibility with old APIs of modules
 	 *
 	 * @param  array    $matches    Array of found string by regex search.
 	 * 								Each entry is 1 and only 1 criteria.
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 9dcd168f344..95243f191ca 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -77,11 +77,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -141,11 +140,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -206,11 +204,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -277,11 +274,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
@@ -378,11 +374,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
@@ -554,11 +549,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -669,11 +663,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -733,11 +726,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -802,11 +794,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -868,11 +859,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -943,11 +933,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -1014,11 +1003,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
@@ -1088,11 +1076,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -1153,11 +1140,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -1213,11 +1199,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -1274,11 +1259,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -1337,11 +1321,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -1396,11 +1379,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -1462,11 +1444,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -1523,11 +1504,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -1586,11 +1566,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
@@ -1650,11 +1629,10 @@ class Setup extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index c01f4b967c4..00404d21d99 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -98,7 +98,7 @@ class Asset extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1', 'comment'=>"Reference of object"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2', 'validate'=>'1',),
-		'fk_asset_model' => array('type'=>'integer:AssetModel:asset/class/assetmodel.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'AssetModel', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'validate'=>'1',),
+		'fk_asset_model' => array('type'=>'integer:AssetModel:asset/class/assetmodel.class.php:1:((status:=:1) and (entity:IN:__SHARED_ENTITIES__))', 'label'=>'AssetModel', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'validate'=>'1',),
 		'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>0, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'validate'=>'1',),
 		'acquisition_type' => array('type'=>'smallint', 'label'=>'AssetAcquisitionType', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('0'=>'AssetAcquisitionTypeNew', '1'=>'AssetAcquisitionTypeOccasion'), 'validate'=>'1',),
 		'asset_type' => array('type'=>'smallint', 'label'=>'AssetType', 'enabled'=>'1', 'position'=>70, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('0'=>'AssetTypeIntangible', '1'=>'AssetTypeTangible', '2'=>'AssetTypeInProgress', '3'=>'AssetTypeFinancial'), 'validate'=>'1',),
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index fb7d175a229..57b0d26e80a 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -150,11 +150,10 @@ class Boms extends DolibarrApi
 		}
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/bookcal/class/booking.class.php b/htdocs/bookcal/class/booking.class.php
index a74cb87a43d..616fbbde03e 100644
--- a/htdocs/bookcal/class/booking.class.php
+++ b/htdocs/bookcal/class/booking.class.php
@@ -104,7 +104,7 @@ class Booking extends CommonObject
 	public $fields=array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1.2, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'validate'=>'1', 'comment'=>"Reference of object"),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'help'=>"LinkToThirparty", 'validate'=>'1',),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) and (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'help'=>"LinkToThirparty", 'validate'=>'1',),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'validate'=>'1',),
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3, 'validate'=>'1',),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index e59ff070aec..e10371f87b6 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -149,11 +149,10 @@ class Categories extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 8c13709b250..058de48542d 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -159,11 +159,10 @@ class AgendaEvents extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index cf675e01b62..cc6bfb2aa2f 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -204,11 +204,10 @@ class Proposals extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
@@ -309,14 +308,14 @@ class Proposals extends DolibarrApi
 		}
 
 		if (!empty($sqlfilters)) {
-			if (!DolibarrApi::_checkFilters($sqlfilters)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			$errormessage = '';
+			$sql = forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-			$filters = " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
-		$this->propal->getLinesArray($filters);
+		$this->propal->getLinesArray($sql);
 		$result = array();
 		foreach ($this->propal->lines as $line) {
 			array_push($result, $this->_cleanObjectDatas($line));
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 9dca1b1051d..8606b9df87d 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -302,7 +302,7 @@ class Propal extends CommonObject
 		'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>22),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>40),
 		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'position'=>23),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>24),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Fk projet', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>24),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
 		'datep' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 2c916abda9a..af460b3b459 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -208,11 +208,10 @@ class Orders extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index a09fa8bdf5e..1b1b77343dd 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -307,7 +307,7 @@ class Commande extends CommonOrder
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>26),
 		'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>28),
 		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>25),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>25),
 		'date_commande' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>1, 'position'=>60),
 		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>62),
 		'date_cloture' =>array('type'=>'datetime', 'label'=>'DateClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index c9886a176f0..052c45fbc56 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -82,11 +82,10 @@ class BankAccounts extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
@@ -440,11 +439,10 @@ class BankAccounts extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= " ORDER BY rowid";
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 4c1392e28eb..47fd0263d7e 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -237,11 +237,10 @@ class Invoices extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index f02850492b5..22ea97feb6d 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -181,7 +181,7 @@ class FactureRec extends CommonInvoice
 		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'Total', 'enabled'=>1, 'visible'=>-1, 'position'=>70, 'isameasure'=>1),
 		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'Total ttc', 'enabled'=>1, 'visible'=>-1, 'position'=>75, 'isameasure'=>1),
 		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>85),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Fk projet', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>85),
 		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'Fk cond reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
 		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'Fk mode reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
 		'date_lim_reglement' =>array('type'=>'date', 'label'=>'Date lim reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 161087a3bf9..2447db6af5d 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -336,7 +336,7 @@ class Facture extends CommonInvoice
 		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>167),
 		'fk_user_closing' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>168),
 		'fk_facture_source' =>array('type'=>'integer', 'label'=>'SourceInvoice', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
 		'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
 		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'CurrencyCode', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
 		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>190),
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index f38fa4758d9..68ace23a26a 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -148,11 +148,10 @@ class Contracts extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 8f66cbdef2e..a29df83b834 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -233,7 +233,7 @@ class Contrat extends CommonObject
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
 		'date_contrat' =>array('type'=>'datetime', 'label'=>'Date contrat', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
 		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>70),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>75),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>75),
 		'fk_commercial_signature' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative Signature', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
 		'fk_commercial_suivi' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative follower', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
 		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>90),
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 921618f7edc..62fd1db45e6 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -7769,40 +7769,6 @@ class Form
 		return $out;
 	}
 
-	/**
-	 * Function to forge a SQL criteria from a Dolibarr filter syntax string.
-	 *
-	 * @param  array    $matches       Array of found string by regex search. Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.nature:is:NULL"
-	 * @return string                  Forged criteria. Example: "t.field like 'abc%'"
-	 */
-	protected static function forgeCriteriaCallback($matches)
-	{
-		global $db;
-
-		//dol_syslog("Convert matches ".$matches[1]);
-		if (empty($matches[1])) {
-			return '';
-		}
-		$tmp = explode(':', $matches[1]);
-		if (count($tmp) < 3) {
-			return '';
-		}
-
-		$tmpescaped = $tmp[2];
-		$regbis = array();
-
-		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {
-			$tmpescaped = "'".$db->escape($regbis[1])."'";
-		} else {
-			$tmpescaped = $db->escape($tmpescaped);
-		}
-
-		if ($tmp[1] == '!=') {
-			$tmp[1] = '<>';
-		}
-
-		return $db->escape($tmp[0]).' '.strtoupper($db->escape($tmp[1]))." ".$tmpescaped;
-	}
 
 	/**
 	 * Output html form to select an object.
@@ -7916,12 +7882,11 @@ class Form
 			}
 
 			if ($filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-				/*if (! DolibarrApi::_checkFilters($filter))
-				{
-					throw new RestException(503, 'Error when validating parameter sqlfilters '.$filter);
-				}*/
-				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-				$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'Form::forgeCriteriaCallback', $filter).")";
+				$errormessage = '';
+				$sql .= forgeSQLFromUniversalSearchCriteria($filter, $errormessage);
+				if ($errormessage) {
+					return 'Error forging a SQL request from an universal criteria: '.$errormessage;
+				}
 			}
 		}
 		$sql .= $this->db->order($sortfield ? $sortfield : $fieldstoshow, "ASC");
@@ -10275,14 +10240,12 @@ class Form
 				$search_component_params_hidden .= '('.$search_component_params_hidden.')';
 			}
 			$errormessage = '';
-			if (!dolCheckFilters($search_component_params_hidden, $errormessage)) {
-				print 'ERROR in parsing search string';
+			$searchtags = forgeSQLFromUniversalSearchCriteria($search_component_params_hidden, $errormessage);
+			if ($errormessage) {
+				print 'ERROR in parsing search string: '.dol_escape_htmltag($errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			//var_dump($search_component_params_hidden);
-			$htmltags = preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $search_component_params_hidden);
-			//var_dump($htmltags);
-			$ret .= '<span class="marginleftonlyshort valignmiddle tagsearch"><span class="tagsearchdelete select2-selection__choice__remove">x</span> '.$htmltags.'</span>';
+			//var_dump($searchtags);
+			$ret .= '<span class="marginleftonlyshort valignmiddle tagsearch"><span class="tagsearchdelete select2-selection__choice__remove">x</span> '.dol_escape_htmltag($searchtags).'</span>';
 		}
 
 		//$ret .= '<button type="submit" class="liste_titre button_search paddingleftonly" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index fefdc5880c8..34561c91621 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -295,12 +295,7 @@ if (is_array($search_groupby) && count($search_groupby)) {
 		$sqlfilters = GETPOST('search_component_params_hidden', 'alphanohtml');
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (dolCheckFilters($sqlfilters, $errormessage)) {
-				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-				$sql .= " WHERE (".preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $sqlfilters).")";
-			} else {
-				print $errormessage;
-			}
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
 		}*/
 
 		$sql .= " LIMIT ".((int) ($MAXUNIQUEVALFORGROUP + 1));
@@ -681,11 +676,9 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 	$sqlfilters = $search_component_params_hidden;
 	if ($sqlfilters) {
 		$errormessage = '';
-		if (dolCheckFilters($sqlfilters, $errormessage)) {
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $sqlfilters).")";
-		} else {
-			print $errormessage;
+		$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+		if ($errormessage) {
+			print dol_escape_htmltag($errormessage);
 		}
 	}
 	$sql .= " GROUP BY ";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 58a77279e6c..835c81c7131 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11522,17 +11522,35 @@ function jsonOrUnserialize($stringtodecode)
 }
 
 
+/**
+ * forgeSQLFromUniversalSearchCriteria
+ *
+ * @param 	string		$filter		String with universal search string
+ * @param	string		$error		Error message
+ * @return	string					Return forged SQL string
+ */
+function forgeSQLFromUniversalSearchCriteria($filter, &$error = '')
+{
+	$regexstring = '\(([a-zA-Z0-9_\.]+:[<>!=insotlke]+:[^\(\)]+)\)';	// Must be  (aaa:bbb:...) with aaa is a field name (with alias or not) and bbb is one of this operator '=', '<', '>', '<=', '>=', '!=', 'in', 'notin', 'like', 'notlike', 'is', 'isnot'
+
+	if (!dolCheckFilters($filter, $error)) {
+		return '1 = 2';		// Bad balance of parenthesis, we force a SQL not found
+	}
+
+	// Test the filter syntax
+	$t = preg_replace_callback('/'.$regexstring.'/i', 'dolForgeDummyCriteriaCallback', $filter);
+	$t = str_replace(array('and','or','AND','OR',' '), '', $t);		// Remove the only strings allowed between each () criteria
+	// If the string result contains something else than '()', the syntax was wrong
+	if (preg_match('/[^\(\)]/', $t)) {
+		$error = 'Bad syntax of the search string, filter criteria is inhalited';
+		return '1 = 3';		// Bad syntax of the search string, we force a SQL not found
+	}
+
+	return " AND (".preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $filter).")";
+}
 
 /**
- * Return if a $sqlfilters parameter is valid and will pass the preg_replace_callback() to replace Generic filter string with SQL filter string
- * Example of usage:
- * if ($sqlfilters) {
- *	 $errormessage = '';
- *   if (dolCheckFilters($sqlfilters, $errormessage)) {
- *	   $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
- *	   $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $sqlfilters).")";
- *   }
- * }
+ * Return if a $sqlfilters parameter has a valid balance of parenthesis
  *
  * @param	string  		$sqlfilters     sqlfilter string
  * @param	string			$error			Error message
@@ -11553,7 +11571,7 @@ function dolCheckFilters($sqlfilters, &$error = '')
 			$counter--;
 		}
 		if ($counter < 0) {
-			$error = "Bad sqlfilters=".$sqlfilters;
+			$error = "Wrond balance of parenthesis in sqlfilters=".$sqlfilters;
 			dol_syslog($error, LOG_WARNING);
 			return false;
 		}
@@ -11563,58 +11581,92 @@ function dolCheckFilters($sqlfilters, &$error = '')
 }
 
 /**
- * Function to forge a SQL criteria from a Generic filter string.
- * Example of usage:
- * if ($sqlfilters) {
- *	 $errormessage = '';
- *   if (dolCheckFilters($sqlfilters, $errormessage)) {
- *	   $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
- *	   $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $sqlfilters).")";
- *   }
- * }
+ * Function to forge a SQL criteria from a Dolibarr filter syntax string.
+ * This method is called by forgeSQLFromUniversalSearchCriteria()
  *
- * @param  array    $matches    Array of found string by regex search.
- * 								Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.date_creation:<:'2016-01-01 12:30:00'" or "t.nature:is:NULL"
- * @return string               Forged criteria. Example: "t.field like 'abc%'"
+ * @param  array    $matches       Array of found string by regex search. Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.nature:is:NULL"
+ * @return string                  Forged criteria. Example: "t.field like 'abc%'"
+ */
+function dolForgeDummyCriteriaCallback($matches)
+{
+	//dol_syslog("Convert matches ".$matches[1]);
+	if (empty($matches[1])) {
+		return '';
+	}
+	$tmp = explode(':', $matches[1]);
+	if (count($tmp) < 3) {
+		return '';
+	}
+
+	return '()';	// An empty criteria
+}
+
+/**
+ * Function to forge a SQL criteria from a Dolibarr filter syntax string.
+ * This method is called by forgeSQLFromUniversalSearchCriteria()
+ *
+ * @param  array    $matches       	Array of found string by regex search.
+ * 									Example: "t.ref:like:'SO-%'" or "t.date_creation:<:'20160101'" or "t.date_creation:<:'2016-01-01 12:30:00'" or "t.nature:is:NULL"
+ * @return string                  	Forged criteria. Example: "t.field like 'abc%'"
  */
 function dolForgeCriteriaCallback($matches)
 {
 	global $db;
 
-	dol_syslog("Convert matches ".$matches[1]);
+	//dol_syslog("Convert matches ".$matches[1]);
 	if (empty($matches[1])) {
 		return '';
 	}
-	$tmp = explode(':', $matches[1], 3);
-
+	$tmp = explode(':', $matches[1]);
 	if (count($tmp) < 3) {
 		return '';
 	}
 
-	$operand = preg_replace('/[^a-z0-9\._]/i', '', trim($tmp[0]));
-
 	$operator = strtoupper(preg_replace('/[^a-z<>=]/i', '', trim($tmp[1])));
 	if ($operator == 'NOTLIKE') {
 		$operator = 'NOT LIKE';
 	}
+	if ($operator == 'ISNOT') {
+		$operator = 'IS NOT';
+	}
+	if ($operator == '!=') {
+		$operator = '<>';
+	}
 
-	$tmpescaped = trim($tmp[2]);
+	$tmpescaped = $tmp[2];
 	$regbis = array();
-	if ($operator == 'IN') {
-		$tmpescaped = "(".$db->sanitize($tmpescaped, 1).")";
+
+	if ($operator == 'IN') {	// IN is allowed for list of ID or code only
+		//if (!preg_match('/^\(.*\)$/', $tmpescaped)) {
+			$tmpescaped = '('.$db->escape($db->sanitize($tmpescaped, 1, 0)).')';
+		//} else {
+		//	$tmpescaped = $db->escape($db->sanitize($tmpescaped, 1));
+		//}
+	} elseif ($operator == 'LIKE' || $operator == 'NOT LIKE') {
+		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {
+			$tmpescaped = $regbis[1];
+		}
+		//$tmpescaped = "'".$db->escapeforlike($db->escape($regbis[1]))."'";
+		$tmpescaped = "'".$db->escape($tmpescaped)."'";	// We do not escape the _ and % so the like will works
 	} elseif (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {
 		$tmpescaped = "'".$db->escape($regbis[1])."'";
 	} else {
-		$tmpescaped = $db->sanitize($db->escape($tmpescaped));
+		if (strtoupper($tmpescaped) == 'NULL') {
+			$tmpescaped = 'NULL';
+		} elseif (is_int($tmpescaped)) {
+			$tmpescaped = (int) $tmpescaped;
+		} else {
+			$tmpescaped = (float) $tmpescaped;
+		}
 	}
 
-	return $db->escape($operand).' '.$db->escape($operator)." ".$tmpescaped;
+	return $db->escape($tmp[0]).' '.strtoupper($operator).' '.$tmpescaped;
 }
 
 
-
 /**
  * Get timeline icon
+ *
  * @param ActionComm $actionstatic actioncomm
  * @param array $histo histo
  * @param int $key key
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index f9af0568bf0..fee513f2ed7 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -129,11 +129,10 @@ class Donations extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index b15dcf3e545..db6bbf7175e 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -106,8 +106,8 @@ class ConferenceOrBooth extends ActionComm
 		'id' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'integer', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'csslist'=>'left', 'comment'=>"Id"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'help'=>"OrganizationEvenLabelName", 'showoncombobox'=>'1', 'autofocusoncreate'=>1),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>52, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500', 'csslist'=>'width100'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'csslist'=>'tdoverflowmax125', 'css'=>'maxwidth500'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:(t.usage_organize_event:=:1)', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'position'=>52, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500', 'csslist'=>'width100'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'csslist'=>'tdoverflowmax125', 'css'=>'maxwidth500'),
 		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3),
 		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width100', 'csslist'=>'tdoverflowmax100'),
 		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index be06f70979e..062de3ef8d7 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -108,7 +108,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 		'email' => array('type'=>'mail', 'label'=>'EmailAttendee', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'autofocusoncreate'=>1, 'searchall'=>1),
 		'firstname' => array('type'=>'varchar(100)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'searchall'=>1),
 		'lastname' => array('type'=>'varchar(100)', 'label'=>'Lastname', 'enabled'=>'1', 'position'=>32, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'searchall'=>1),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status = 1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>40, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>40, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
 		'email_company' => array('type'=>'mail', 'label'=>'EmailCompany', 'enabled'=>'1', 'position'=>41, 'notnull'=>0, 'visible'=>-2, 'searchall'=>1),
 		'date_subscription' => array('type'=>'datetime', 'label'=>'DateOfRegistration', 'enabled'=>'1', 'position'=>56, 'notnull'=>1, 'visible'=>1, 'showoncombobox'=>'1',),
 		'fk_invoice' => array('type'=>'integer:Facture:compta/facture/class/facture.class.php', 'label'=>'Invoice', 'enabled'=>'$conf->facture->enabled', 'position'=>57, 'notnull'=>0, 'visible'=>-1, 'index'=>0, 'picto'=>'bill', 'css'=>'tdoverflowmax150 maxwidth500'),
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 357683ef35a..fea57fbea10 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -145,11 +145,10 @@ class Shipments extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 876b08f18f0..c3bfeb2264d 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -118,11 +118,10 @@ class ExpenseReports extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index f96dc3d6aa7..4b97d6e21ad 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -152,11 +152,10 @@ class Interventions extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 376e14c277f..cc6feb22f1c 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -39,7 +39,7 @@ class Fichinter extends CommonObject
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>15),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>'isModEnabled("project")', 'visible'=>-1, 'position'=>20),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Fk projet', 'enabled'=>'isModEnabled("project")', 'visible'=>-1, 'position'=>20),
 		'fk_contrat' =>array('type'=>'integer', 'label'=>'Fk contrat', 'enabled'=>'$conf->contrat->enabled', 'visible'=>-1, 'position'=>25),
 		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>30),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>35),
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 5cc3e5592a2..02bed2c5e0a 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -160,11 +160,10 @@ class SupplierInvoices extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index d55a398dbd6..4ad1f951883 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -176,11 +176,10 @@ class SupplierOrders extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index feb2466078d..2cf0401d6eb 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -219,7 +219,7 @@ class CommandeFournisseur extends CommonOrder
 		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25, 'searchall'=>1),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>35),
 		'ref_supplier' =>array('type'=>'varchar(255)', 'label'=>'RefOrderSupplierShort', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'searchall'=>1),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>45),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>"isModEnabled('project')", 'visible'=>-1, 'position'=>45),
 		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
 		'date_approve' =>array('type'=>'datetime', 'label'=>'DateApprove', 'enabled'=>1, 'visible'=>-1, 'position'=>62),
 		'date_approve2' =>array('type'=>'datetime', 'label'=>'DateApprove2', 'enabled'=>1, 'visible'=>3, 'position'=>64),
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
index 8232287b23b..6d5c15c0dc6 100644
--- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -199,11 +199,10 @@ class KnowledgeManagement extends DolibarrApi
 		}
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index ce92ef5ea8e..fdb56ff3c67 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -156,11 +156,10 @@ class MyModuleApi extends DolibarrApi
 		}
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 14b8fc6c09c..f309ef346c5 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -119,7 +119,7 @@ class MyObject extends CommonObject
 		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>2, 'validate'=>1, 'alwayseditable'=>1),
 		'amount'        => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount', 'validate'=>1),
 		'qty'           => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp', 'validate'=>1),
-		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'OrganizationEventLinkToThirdParty', 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
+		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'OrganizationEventLinkToThirdParty', 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
 		'fk_project'    => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
 		'description'   => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>60, 'validate'=>1),
 		'note_public'   => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'validate'=>1, 'cssview'=>'wordbreak'),
diff --git a/htdocs/mrp/class/api_mos.class.php b/htdocs/mrp/class/api_mos.class.php
index b747e5eafce..2312f4bd636 100644
--- a/htdocs/mrp/class/api_mos.class.php
+++ b/htdocs/mrp/class/api_mos.class.php
@@ -148,11 +148,10 @@ class Mos extends DolibarrApi
 		}
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 68523ace9da..9c27a21b1f5 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -101,13 +101,13 @@ class Mo extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>'1', 'noteditable'=>1),
-		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>'$conf->bom->enabled', 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'minwidth100 maxwidth300', 'csslist'=>'nowraponall', 'picto'=>'bom'),
+		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:(t.status:=:1)', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>'$conf->bom->enabled', 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'minwidth100 maxwidth300', 'csslist'=>'nowraponall', 'picto'=>'bom'),
 		'mrptype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>34, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth150', 'csslist'=>'minwidth150 center'),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>'$conf->product->enabled', 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax100', 'picto'=>'product'),
 		'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce", 'css'=>'width75', 'default'=>1, 'isameasure'=>1),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'2', 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax200', 'alwayseditable'=>1),
 		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax150'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1, 'css'=>'minwidth200 maxwidth400', 'csslist'=>'tdoverflowmax100'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1, 'css'=>'minwidth200 maxwidth400', 'csslist'=>'tdoverflowmax100'),
 		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>'$conf->stock->enabled', 'visible'=>1, 'position'=>52, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax200'),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'notnull'=>-1,),
diff --git a/htdocs/partnership/class/api_partnership.class.php b/htdocs/partnership/class/api_partnership.class.php
index 1e1c7ca80fe..13bc447c51d 100644
--- a/htdocs/partnership/class/api_partnership.class.php
+++ b/htdocs/partnership/class/api_partnership.class.php
@@ -156,11 +156,10 @@ class PartnershipApi extends DolibarrApi
 		}
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index fab8b1ce32a..15d75f20cb3 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -104,8 +104,8 @@ class Partnership extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', 'position'=>15, 'notnull'=>1, 'visible'=>-2, 'default'=>'1', 'index'=>1,),
-		'fk_type' => array('type'=>'integer:PartnershipType:partnership/class/partnership_type.class.php:0:active=1', 'label'=>'Type', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'csslist'=>'tdoverflowmax100'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax125',),
+		'fk_type' => array('type'=>'integer:PartnershipType:partnership/class/partnership_type.class.php:0:(active:=:1)', 'label'=>'Type', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'csslist'=>'tdoverflowmax100'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax125',),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
@@ -197,7 +197,7 @@ class Partnership extends CommonObject
 		if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
 			$this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'member', 'csslist'=>'tdoverflowmax150');
 		} else {
-			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'company', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150');
+			$this->fields['fk_soc'] = array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'company', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150');
 		}
 
 		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid']) && !empty($this->fields['ref'])) {
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 7a10293d7e4..ac666824f0e 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -222,12 +222,10 @@ class Products extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			//var_dump($sqlfilters);exit;
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';	// We must accept datc:<:2020-01-01 10:10:10
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		//this query will return total products with the filters given
@@ -905,11 +903,10 @@ class Products extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
@@ -1033,11 +1030,10 @@ class Products extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/product/stock/class/api_stockmovements.class.php b/htdocs/product/stock/class/api_stockmovements.class.php
index 544485060af..942cf6fe101 100644
--- a/htdocs/product/stock/class/api_stockmovements.class.php
+++ b/htdocs/product/stock/class/api_stockmovements.class.php
@@ -110,11 +110,10 @@ class StockMovements extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/product/stock/class/api_warehouses.class.php b/htdocs/product/stock/class/api_warehouses.class.php
index 0cf0e57fe3a..a0646598d96 100644
--- a/htdocs/product/stock/class/api_warehouses.class.php
+++ b/htdocs/product/stock/class/api_warehouses.class.php
@@ -117,11 +117,10 @@ class Warehouses extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 8393b081a90..55e365f07da 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -127,8 +127,8 @@ class Entrepot extends CommonObject
 		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25, 'searchall'=>1),
 		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35, 'searchall'=>1),
 		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'showoncombobox'=>2, 'searchall'=>1),
-		'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:statut=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
-		'fk_project' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>25),
+		'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
+		'fk_project' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>25),
 		'address' =>array('type'=>'varchar(255)', 'label'=>'Address', 'enabled'=>1, 'visible'=>-2, 'position'=>45, 'searchall'=>1),
 		'zip' =>array('type'=>'varchar(10)', 'label'=>'Zip', 'enabled'=>1, 'visible'=>-2, 'position'=>50, 'searchall'=>1),
 		'town' =>array('type'=>'varchar(50)', 'label'=>'Town', 'enabled'=>1, 'visible'=>-2, 'position'=>55, 'searchall'=>1),
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index ac5d612394b..55be0eaba3c 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -119,12 +119,12 @@ class MouvementStock extends CommonObject
 		'fk_origin' =>array('type'=>'integer', 'label'=>'Fk origin', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
 		'origintype' =>array('type'=>'varchar(32)', 'label'=>'Origintype', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>70),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>75),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>75),
 		'inventorycode' =>array('type'=>'varchar(128)', 'label'=>'InventoryCode', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
 		'batch' =>array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
 		'eatby' =>array('type'=>'date', 'label'=>'Eatby', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
 		'sellby' =>array('type'=>'date', 'label'=>'Sellby', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'fk_project' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk project', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
+		'fk_project' =>array('type'=>'integer:Project:projet/class/project.class.php:1:(fk_statut:=:1)', 'label'=>'Fk project', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
 	);
 
 
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
index 0711815da15..441c420bf08 100644
--- a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -123,7 +123,7 @@ class StockTransfer extends CommonObject
 		'label'                    => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth200'/*, 'help'=>"Help text"*/, 'showoncombobox'=>'1',),
 		'description'              => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>3,),
 		'fk_project'               => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>32, 'notnull'=>-1, 'visible'=>-1, 'index'=>1,),
-		'fk_soc'                   => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1/*, 'help'=>"LinkToThirdparty"*/,),
+		'fk_soc'                   => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1/*, 'help'=>"LinkToThirdparty"*/,),
 		'fk_warehouse_source'      => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt source', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1, 'help'=>'HelpWarehouseStockTransferSource',),
 		'fk_warehouse_destination' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt de destination', 'enabled'=>'1', 'position'=>51, 'notnull'=>0, 'visible'=>1, 'help'=>'HelpWarehouseStockTransferDestination'),
 		'note_public'              => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 9ed1bbf1441..f5c23f4b040 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -152,11 +152,10 @@ class Projects extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index cd232061bc4..64690f90950 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -150,11 +150,10 @@ class Tasks extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/reception/class/api_receptions.class.php b/htdocs/reception/class/api_receptions.class.php
index 473650161e2..55e3fa59165 100644
--- a/htdocs/reception/class/api_receptions.class.php
+++ b/htdocs/reception/class/api_receptions.class.php
@@ -145,11 +145,10 @@ class Receptions extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/recruitment/class/api_recruitment.class.php b/htdocs/recruitment/class/api_recruitment.class.php
index cf4fa7a143e..3ffa81626fe 100644
--- a/htdocs/recruitment/class/api_recruitment.class.php
+++ b/htdocs/recruitment/class/api_recruitment.class.php
@@ -194,11 +194,10 @@ class Recruitment extends DolibarrApi
 		}
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
@@ -302,11 +301,10 @@ class Recruitment extends DolibarrApi
 		}
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 6b3fcf7eeb8..e4f6a9acb8a 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -120,11 +120,11 @@ class RecruitmentJobPosition extends CommonObject
 		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'csslist'=>'tdoverflowmax300', 'showoncombobox'=>'2', 'autofocusoncreate'=>1),
 		'qty' => array('type'=>'integer', 'label'=>'NbOfEmployeesExpected', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
 		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500', 'picto'=>'project'),
-		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php:status=1', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
+		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php:1:(statut:=:1)', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
 		'email_recruiter' => array('type'=>'varchar(255)', 'label'=>'EmailRecruiter', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>-1, 'help'=>'ToUseAGenericEmail', 'picto'=>'email'),
-		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php:t.statut = 1', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
+		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php:1:(statut:=:1)', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
 		'fk_establishment' => array('type'=>'integer:Establishment:hrm/class/establishment.class.php', 'label'=>'Establishment', 'enabled'=>'$conf->hrm->enabled', 'position'=>56, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'establishment.rowid',),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'WorkPlace', 'enabled'=>'$conf->societe->enabled', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'css'=>'maxwidth500', 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner", 'picto'=>'company'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:((status:=:1) AND (entity:IN:__SHARED_ENTITIES__))', 'label'=>'WorkPlace', 'enabled'=>'$conf->societe->enabled', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'css'=>'maxwidth500', 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner", 'picto'=>'company'),
 		'date_planned' => array('type'=>'date', 'label'=>'DateExpected', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
 		'remuneration_suggested' => array('type'=>'varchar(255)', 'label'=>'Remuneration', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>1,),
 		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>3,),
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 68bba46a3cb..88e9398f5fa 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -225,11 +225,10 @@ class Contacts extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index db7eec3096e..ff958729d6a 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -203,11 +203,10 @@ class Thirdparties extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
index f2036edda88..3bf9cf3f982 100644
--- a/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
+++ b/htdocs/supplier_proposal/class/api_supplier_proposals.class.php
@@ -140,11 +140,10 @@ class Supplierproposals extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index e7930569bdd..c27d9195683 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -251,11 +251,10 @@ class Tickets extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index 747d4ab3286..781de4d23cd 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -100,11 +100,10 @@ class Users extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
@@ -544,11 +543,10 @@ class Users extends DolibarrApi
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/htdocs/zapier/class/api_zapier.class.php b/htdocs/zapier/class/api_zapier.class.php
index 56ab923435d..3db40064473 100644
--- a/htdocs/zapier/class/api_zapier.class.php
+++ b/htdocs/zapier/class/api_zapier.class.php
@@ -198,11 +198,10 @@ class Zapier extends DolibarrApi
 		}
 		if ($sqlfilters) {
 			$errormessage = '';
-			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilters, $errormessage);
+			if ($errormessage) {
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
-			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 12c8683bb8f..d910a9f9d57 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -167,6 +167,34 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		print __METHOD__."\n";
 	}
 
+
+	/**
+	 * testDolForgeCriteriaCallback
+	 *
+	 * @return boolean
+	 */
+	public function testDolForgeCriteriaCallback()
+	{
+		global $conf, $langs;
+
+		// An attempt for SQL injection
+		$filter='if(now()=sysdate()%2Csleep(6)%2C0)';
+		$sql = forgeSQLFromUniversalSearchCriteria($filter);
+		$this->assertEquals($sql, '1 = 3');
+
+		// A real search string
+		$filter='(((statut:=:1) or (entity:in:__AAA__)) and (abc:<:2.0) and (abc:!=:1.23))';
+		$sql = forgeSQLFromUniversalSearchCriteria($filter);
+		$this->assertEquals($sql, ' AND (((statut = 1 or entity IN (__AAA__)) and abc < 2 and abc = 1.23))');
+
+		$filter="(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.date_creation:<:'2016-01-01 12:30:00') or (t.nature:is:NULL)";
+		$sql = forgeSQLFromUniversalSearchCriteria($filter);
+		$this->assertEquals($sql, " AND (t.ref LIKE 'SO-%' or t.date_creation < '20160101' or t.date_creation < 0 or t.nature IS NULL)");
+
+		return true;
+	}
+
+
 	/**
 	 * testDolClone
 	 *

From 014aec72c22479ea92acedec0486b0a664e76415 Mon Sep 17 00:00:00 2001
From: Philippe GRAND <philippe.grand@atoo-net.com>
Date: Sun, 26 Feb 2023 11:12:06 +0100
Subject: [PATCH 147/300] fix : Warning: Undefined array key height in
 /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/core/lib/pdf.lib.php
 on line 2513

---
 htdocs/core/lib/pdf.lib.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 206fbb7b1c4..97425c00465 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -2510,6 +2510,8 @@ function pdf_getSizeForImage($realpath)
 	$maxheight = (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT) ? 32 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 	$tmp = dol_getImageSize($realpath);
+	$width = 0;
+    $height = 0;
 	if ($tmp['height']) {
 		$width = (int) round($maxheight * $tmp['width'] / $tmp['height']); // I try to use maxheight
 		if ($width > $maxwidth) {	// Pb with maxheight, so i use maxwidth

From 9f2c450953487606627a2efbf6eca60bef5230f4 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Sun, 26 Feb 2023 10:17:38 +0000
Subject: [PATCH 148/300] Fixing style errors.

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

diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 97425c00465..49e0672e462 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -2511,7 +2511,7 @@ function pdf_getSizeForImage($realpath)
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 	$tmp = dol_getImageSize($realpath);
 	$width = 0;
-    $height = 0;
+	$height = 0;
 	if ($tmp['height']) {
 		$width = (int) round($maxheight * $tmp['width'] / $tmp['height']); // I try to use maxheight
 		if ($width > $maxwidth) {	// Pb with maxheight, so i use maxwidth

From 32ba0acb320f21d192f315ebcc700f05e7e9cdb6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 26 Feb 2023 12:03:55 +0100
Subject: [PATCH 149/300] Fix navigation

---
 htdocs/comm/mailing/cibles.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 106d6c3d12a..fae7df654b0 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -542,7 +542,7 @@ if ($object->fetch($id) >= 0) {
 
 		$massactionbutton = '';
 
-		print_barre_liste($langs->trans("MailSelectedRecipients"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $morehtmlcenter, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit);
+		print_barre_liste($langs->trans("MailSelectedRecipients"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $morehtmlcenter, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit, 0, 0, 1);
 
 		print '</form>';
 

From d97725173bcd4a18ed6190b4f82a0013492b5828 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 26 Feb 2023 12:45:13 +0100
Subject: [PATCH 150/300] Fix sql error

---
 htdocs/core/lib/functions.lib.php       | 2 +-
 htdocs/partnership/partnership_card.php | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 835c81c7131..232cf479a1d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -11546,7 +11546,7 @@ function forgeSQLFromUniversalSearchCriteria($filter, &$error = '')
 		return '1 = 3';		// Bad syntax of the search string, we force a SQL not found
 	}
 
-	return " AND (".preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $filter).")";
+	return " AND (".preg_replace_callback('/'.$regexstring.'/i', 'dolForgeCriteriaCallback', $filter).")";
 }
 
 /**
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 2cb57ee44aa..b544ad94fc7 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -564,9 +564,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
 			}
 
-			if ($object->status == $object::STATUS_DRAFT) {
-				print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
-			}
+			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// Back to draft
 			if ($object->status != $object::STATUS_DRAFT) {

From ac410a45185163a9ece5e1266e4c9680c3bb2ef8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 26 Feb 2023 12:59:25 +0100
Subject: [PATCH 151/300] Fix missing url to check

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

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 15d75f20cb3..013323f3193 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -372,7 +372,7 @@ class Partnership extends CommonObject
 		$sql = 'SELECT p.rowid, p.ref, p.fk_type, p.fk_soc, p.fk_member, p.status';
 		$sql .= ', p.entity, p.date_partnership_start, p.date_partnership_end, p.date_creation';
 		$sql .= ', p.fk_user_creat, p.tms, p.fk_user_modif, p.fk_user_modif';
-		$sql .= ', p.note_private, p.note_public';
+		$sql .= ', p.note_private, p.note_public, p.url_to_check';
 		$sql .= ', p.last_main_doc, p.count_last_url_check_error, p.last_check_backlink, p.reason_decline_or_cancel';
 		$sql .= ', p.import_key, p.model_pdf';
 		$sql .= ', pt.code as type_code, pt.label as type_label';
@@ -380,7 +380,7 @@ class Partnership extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_partnership_type as pt ON p.fk_type = pt.rowid';
 
 		if ($id) {
-			$sql .= " WHERE p.rowid=".((int) $id);
+			$sql .= " WHERE p.rowid = ".((int) $id);
 		} else {
 			$sql .= " WHERE p.entity IN (0,".getEntity('partnership').")"; // Dont't use entity if you use rowid
 		}
@@ -427,6 +427,7 @@ class Partnership extends CommonObject
 				$this->reason_decline_or_cancel 	= $obj->reason_decline_or_cancel;
 				$this->import_key 					= $obj->import_key;
 				$this->model_pdf 					= $obj->model_pdf;
+				$this->url_to_check 				= $obj->url_to_check;
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels

From bf544bef63f824c3bb2f022be2edd30315ce1542 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 26 Feb 2023 13:13:58 +0100
Subject: [PATCH 152/300] css

---
 htdocs/modulebuilder/template/myobject_list.php | 2 +-
 htdocs/partnership/partnership_list.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 075813eaed9..abef03f283e 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -415,7 +415,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 // Example : Adding jquery code
 // print '<script type="text/javascript">
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index a795d8d33f4..5a3ac47411b 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -463,7 +463,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 
 if ($managedfor == "member") {
 	if ($memberid > 0 && $user->hasRight('adherent', 'lire')) {

From f23de5580917ebaa47890ce5bf4c918a61ca9e9b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 26 Feb 2023 19:28:11 +0100
Subject: [PATCH 153/300] FIX #24041

---
 htdocs/comm/action/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 97d8b077dbc..a8bbf1c8a2d 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1192,7 +1192,7 @@ if ($action == 'create') {
 	print '<input type="hidden" name="donotclearsession" value="1">';
 	print '<input type="hidden" name="page_y" value="">';
 	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : dol_htmlentities($_SERVER["HTTP_REFERER"])).'">';
+		print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : '').'">';
 	}
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 		print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">';
@@ -1722,7 +1722,7 @@ if ($id > 0) {
 		print '<input type="hidden" name="ref_ext" value="'.$object->ref_ext.'">';
 		print '<input type="hidden" name="page_y" value="">';
 		if ($backtopage) {
-			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : dol_htmlentities($_SERVER["HTTP_REFERER"])).'">';
+			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : '').'">';
 		}
 		if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && ! preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
 			print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';

From 849656935f9f8fd5044a9863a1b7cbf30fa8bdbc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 26 Feb 2023 20:34:29 +0100
Subject: [PATCH 154/300] Fix warning

---
 htdocs/core/lib/files.lib.php | 104 +++++++++++++++++-----------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 23659cd769b..66ce2f87b67 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -2545,54 +2545,54 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity])) {
 		// Wrapping pour les apercu factures
-		if ($fuser->rights->facture->{$lire}) {
+		if ($fuser->hasRight('facture', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/'.$original_file;
 	} elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity])) {
 		// Wrapping pour les apercu propal
-		if ($fuser->rights->propal->{$lire}) {
+		if ($fuser->hasRight('propal', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
 	} elseif ($modulepart == 'apercucommande' && !empty($conf->commande->multidir_output[$entity])) {
 		// Wrapping pour les apercu commande
-		if ($fuser->rights->commande->{$lire}) {
+		if ($fuser->hasRight('commande', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
 	} elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output)) {
 		// Wrapping pour les apercu intervention
-		if ($fuser->rights->ficheinter->{$lire}) {
+		if ($fuser->hasRight('ficheinter', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->multidir_output[$entity])) {
 		// Wrapping pour les apercu contrat
-		if ($fuser->rights->contrat->{$lire}) {
+		if ($fuser->hasRight('contrat', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->contrat->multidir_output[$entity].'/'.$original_file;
 	} elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output)) {
 		// Wrapping pour les apercu supplier proposal
-		if ($fuser->rights->supplier_proposal->{$lire}) {
+		if ($fuser->hasRight('supplier_proposal', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->supplier_proposal->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output)) {
 		// Wrapping pour les apercu supplier order
-		if ($fuser->rights->fournisseur->commande->{$lire}) {
+		if ($fuser->hasRight('fournisseur', 'commande', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output)) {
 		// Wrapping pour les apercu supplier invoice
-		if ($fuser->rights->fournisseur->facture->{$lire}) {
+		if ($fuser->hasRight('fournisseur', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'holiday') && !empty($conf->holiday->dir_output)) {
-		if ($fuser->rights->holiday->{$read} || !empty($fuser->rights->holiday->readall) || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('holiday', $read) || !empty($fuser->rights->holiday->readall) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 			// If we known $id of holiday, call checkUserAccessToObject to check permission on properties and hierarchy of leave request
 			if ($refname && empty($fuser->rights->holiday->readall) && !preg_match('/^specimen/i', $original_file)) {
@@ -2604,7 +2604,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->holiday->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'expensereport') && !empty($conf->expensereport->dir_output)) {
-		if ($fuser->rights->expensereport->{$lire} || !empty($fuser->rights->expensereport->readall) || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('expensereport', $lire) || !empty($fuser->rights->expensereport->readall) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 			// If we known $id of expensereport, call checkUserAccessToObject to check permission on properties and hierarchy of expense report
 			if ($refname && empty($fuser->rights->expensereport->readall) && !preg_match('/^specimen/i', $original_file)) {
@@ -2617,72 +2617,72 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output)) {
 		// Wrapping pour les apercu expense report
-		if ($fuser->rights->expensereport->{$lire}) {
+		if ($fuser->hasRight('expensereport', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity])) {
 		// Wrapping pour les images des stats propales
-		if ($fuser->rights->propal->{$lire}) {
+		if ($fuser->hasRight('propal', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->propal->multidir_temp[$entity].'/'.$original_file;
 	} elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp)) {
 		// Wrapping pour les images des stats commandes
-		if ($fuser->rights->commande->{$lire}) {
+		if ($fuser->hasRight('commande', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->commande->dir_temp.'/'.$original_file;
 	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output)) {
-		if ($fuser->rights->fournisseur->commande->{$lire}) {
+		if ($fuser->hasRight('fournisseur', 'commande', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	} elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp)) {
 		// Wrapping pour les images des stats factures
-		if ($fuser->rights->facture->{$lire}) {
+		if ($fuser->hasRight('facture', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->facture->dir_temp.'/'.$original_file;
 	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output)) {
-		if ($fuser->rights->fournisseur->facture->{$lire}) {
+		if ($fuser->hasRight('fournisseur', 'facture', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->facture->dir_temp.'/'.$original_file;
 	} elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp)) {
 		// Wrapping pour les images des stats expeditions
-		if ($fuser->rights->expedition->{$lire}) {
+		if ($fuser->hasRight('expedition', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_temp.'/'.$original_file;
 	} elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp)) {
 		// Wrapping pour les images des stats expeditions
-		if ($fuser->rights->deplacement->{$lire}) {
+		if ($fuser->hasRight('deplacement', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->deplacement->dir_temp.'/'.$original_file;
 	} elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp)) {
 		// Wrapping pour les images des stats expeditions
-		if ($fuser->rights->adherent->{$lire}) {
+		if ($fuser->hasRight('adherent', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->adherent->dir_temp.'/'.$original_file;
 	} elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp)) {
 		// Wrapping pour les images des stats produits
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) {
+		if ($fuser->hasRight('produit', $lire) || $fuser->hasRight('service', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = (!empty($conf->product->multidir_temp[$entity]) ? $conf->product->multidir_temp[$entity] : $conf->service->multidir_temp[$entity]).'/'.$original_file;
 	} elseif (in_array($modulepart, array('tax', 'tax-vat', 'tva')) && !empty($conf->tax->dir_output)) {
 		// Wrapping for taxes
-		if ($fuser->rights->tax->charges->{$lire}) {
+		if ($fuser->hasRight('tax', 'charges', $lire)) {
 			$accessallowed = 1;
 		}
 		$modulepartsuffix = str_replace('tax-', '', $modulepart);
 		$original_file = $conf->tax->dir_output.'/'.($modulepartsuffix != 'tax' ? $modulepartsuffix.'/' : '').$original_file;
 	} elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) {
 		// Wrapping for events
-		if ($fuser->rights->agenda->myactions->{$read}) {
+		if ($fuser->hasRight('agenda', 'myactions', $read)) {
 			$accessallowed = 1;
 			// If we known $id of project, call checkUserAccessToObject to check permission on the given agenda event on properties and assigned users
 			if ($refname && !preg_match('/^specimen/i', $original_file)) {
@@ -2766,85 +2766,85 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
 			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		}
-		if ($fuser->rights->societe->{$lire}) {
+		if ($fuser->hasRight('societe', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->societe->multidir_output[$entity].'/contact/'.$original_file;
 	} elseif (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->multidir_output[$entity])) {
 		// Wrapping for invoices
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('facture', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('invoice').")";
 	} elseif ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity])) {
 		// Wrapping for mass actions
-		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('propal', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} elseif ($modulepart == 'massfilesarea_orders') {
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('commande', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} elseif ($modulepart == 'massfilesarea_sendings') {
-		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('expedition', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} elseif ($modulepart == 'massfilesarea_invoices') {
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('facture', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} elseif ($modulepart == 'massfilesarea_expensereport') {
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('facture', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} elseif ($modulepart == 'massfilesarea_interventions') {
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('ficheinter', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output)) {
-		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('supplier_proposal', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} elseif ($modulepart == 'massfilesarea_supplier_order') {
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('fournisseur', 'commande', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} elseif ($modulepart == 'massfilesarea_supplier_invoice') {
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('fournisseur', 'facture', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output)) {
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('contrat', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} elseif (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output)) {
 		// Wrapping for interventions
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('ficheinter', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	} elseif ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output)) {
 		// Wrapping pour les deplacements et notes de frais
-		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('deplacement', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->deplacement->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	} elseif (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity])) {
 		// Wrapping pour les propales
-		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('propal', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
@@ -2858,7 +2858,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('order').")";
 	} elseif ($modulepart == 'project' && !empty($conf->project->dir_output)) {
 		// Wrapping pour les projets
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('projet', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 			// If we known $id of project, call checkUserAccessToObject to check permission on properties and contact of project
 			if ($refname && !preg_match('/^specimen/i', $original_file)) {
@@ -2871,7 +2871,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file = $conf->project->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	} elseif ($modulepart == 'project_task' && !empty($conf->project->dir_output)) {
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('projet', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 			// If we known $id of project, call checkUserAccessToObject to check permission on properties and contact of project
 			if ($refname && !preg_match('/^specimen/i', $original_file)) {
@@ -2906,7 +2906,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	} elseif ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output)) {
 		// Wrapping pour les rapport de paiements
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('facture', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		if ($fuser->socid > 0) {
@@ -2922,26 +2922,26 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file = $conf->accounting->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'expedition' || $modulepart == 'shipment') && !empty($conf->expedition->dir_output)) {
 		// Wrapping pour les expedition
-		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('expedition', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/".(strpos('sending/', $original_file) === 0 ? '' : 'sending/').$original_file;
 		//$original_file = $conf->expedition->dir_output."/".$original_file;
 	} elseif (($modulepart == 'livraison' || $modulepart == 'delivery') && !empty($conf->expedition->dir_output)) {
 		// Delivery Note Wrapping
-		if ($fuser->rights->expedition->delivery->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('expedition', 'delivery', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/".(strpos('receipt/', $original_file) === 0 ? '' : 'receipt/').$original_file;
 	} elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) {
 		// Wrapping pour les actions
-		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('agenda', 'myactions', $read) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp)) {
 		// Wrapping pour les actions
-		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('agenda', 'allactions', $read) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_temp."/".$original_file;
@@ -2950,7 +2950,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) {
 			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		}
-		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i', $original_file)) {
+		if (($fuser->hasRight('produit', $lire) || $fuser->hasRight('service', $lire)) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		if (isModEnabled("product")) {
@@ -2963,7 +2963,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) {
 			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		}
-		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i', $original_file)) {
+		if (($fuser->hasRight('produit', $lire)) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		if (isModEnabled('productbatch')) {
@@ -2974,7 +2974,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if (empty($entity) || empty($conf->stock->multidir_output[$entity])) {
 			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
 		}
-		if (($fuser->rights->stock->{$lire} || $fuser->rights->stock->movement->{$lire} || $fuser->rights->stock->mouvement->{$lire}) || preg_match('/^specimen/i', $original_file)) {
+		if (($fuser->hasRight('stock', $lire) || $fuser->hasRight('stock', 'movement', $lire) || $fuser->hasRight('stock', 'mouvement', $lire)) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		if (isModEnabled('stock')) {
@@ -2989,26 +2989,26 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
 	} elseif ($modulepart == 'donation' && !empty($conf->don->dir_output)) {
 		// Wrapping pour les dons
-		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('don', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->don->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'dolresource' && !empty($conf->resource->dir_output)) {
 		// Wrapping pour les dons
-		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('resource', $read) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->resource->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'remisecheque' || $modulepart == 'chequereceipt') && !empty($conf->bank->dir_output)) {
 		// Wrapping pour les remises de cheques
-		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('banque', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 
 		$original_file = $conf->bank->dir_output.'/checkdeposits/'.$original_file; // original_file should contains relative path so include the get_exdir result
 	} elseif (($modulepart == 'banque' || $modulepart == 'bank') && !empty($conf->bank->dir_output)) {
 		// Wrapping for bank
-		if ($fuser->rights->banque->{$lire}) {
+		if ($fuser->hasRight('banque', $lire)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->bank->dir_output.'/'.$original_file;
@@ -3051,7 +3051,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file = $conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
 	} elseif ($modulepart == 'member' && !empty($conf->adherent->dir_output)) {
 		// Wrapping pour Foundation module
-		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->hasRight('adherent', $lire) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;

From 6734f7a6aa090c53227bb334efb1e68124c38968 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 03:34:49 +0100
Subject: [PATCH 155/300] Debug v17 Fix #24054

---
 htdocs/accountancy/bookkeeping/list.php         | 17 +++++++++++++----
 .../class/accountancyexport.class.php           |  8 ++++++--
 htdocs/langs/en_US/accountancy.lang             |  7 ++++---
 htdocs/theme/eldy/global.inc.php                | 15 ++++++++-------
 htdocs/theme/md/style.css.php                   |  6 +++---
 5 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 086a5acd918..609a6923fea 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -694,7 +694,7 @@ if (!empty($sortfield)) {
 // Export into a file with format defined into setup (FEC, CSV, ...)
 // Must be after definition of $sql
 if ($action == 'export_fileconfirm' && $user->hasRight('accounting', 'mouvements', 'export')) {
-	// TODO Replace the fetchAll to get all ->line followed by call to ->export(). It consumes too much memory on large export.
+	// TODO Replace the fetchAll to get all ->line followed by call to ->export(). It currently consumes too much memory on large export.
 	// Replace this with the query($sql) and loop on each line to export them.
 	$result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter, 'AND', (empty($conf->global->ACCOUNTING_REEXPORT) ? 0 : 1));
 
@@ -817,6 +817,15 @@ $formconfirm = '';
 if ($action == 'export_file') {
 	$form_question = array();
 
+	$form_question['notexportlettering'] = array(
+		'name' => 'notexportlettering',
+		'type' => 'other',
+		'label' => '',		// TODO  Use Selectmodelcsv and show a select combo
+		'value' => $langs->trans('Modelcsv').' : <b>'.$listofformat[$formatexportset].'</b>'
+	);
+
+	$form_question['separator0'] = array('name'=>'separator0', 'type'=>'separator');
+
 	if (getDolGlobalInt("ACCOUNTING_ENABLE_LETTERING")) {
 		// If 1, we check by default.
 		$checked = !empty($conf->global->ACCOUNTING_DEFAULT_NOT_EXPORT_LETTERING) ? 'true' : 'false';
@@ -827,7 +836,7 @@ if ($action == 'export_file') {
 			'value' => $checked,
 		);
 
-		$form_question['separator'] = array('name'=>'separator', 'type'=>'separator');
+		$form_question['separator1'] = array('name'=>'separator1', 'type'=>'separator');
 	}
 
 	// If 1 or not set, we check by default.
@@ -854,7 +863,7 @@ if ($action == 'export_file') {
 		$form_question['separator3'] = array('name'=>'separator3', 'type'=>'separator');
 	}
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', $langs->trans('ConfirmExportFile'), 'export_fileconfirm', $form_question, '', 1, 350, 600);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans("ExportFilteredList").'...', $langs->trans('ConfirmExportFile'), 'export_fileconfirm', $form_question, '', 1, 350, 600);
 }
 
 //if ($action == 'delbookkeepingyear') {
@@ -1303,7 +1312,7 @@ while ($i < min($num, $limit)) {
 		$accountingjournal = new AccountingJournal($db);
 		$result = $accountingjournal->fetch('', $line->code_journal);
 		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
-		print '<td class="center">'.$journaltoshow.'</td>';
+		print '<td class="center tdoverflowmax150">'.$journaltoshow.'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index c8924a8fba6..a1e86d7c7d6 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -1016,7 +1016,9 @@ class AccountancyExport
 				print $line->code_journal . $separator;
 
 				// FEC:JournalLib
-				print dol_string_unaccent($langs->transnoentities($line->journal_label)) . $separator;
+				$labeljournal = dol_string_unaccent($langs->transnoentities($line->journal_label));
+				$labeljournal = dol_string_nospecial($labeljournal, ' ');
+				print $labeljournal . $separator;
 
 				// FEC:EcritureNum
 				print $line->piece_num . $separator;
@@ -1147,7 +1149,9 @@ class AccountancyExport
 				print $line->code_journal . $separator;
 
 				// FEC:JournalLib
-				print dol_string_unaccent($langs->transnoentities($line->journal_label)) . $separator;
+				$labeljournal = dol_string_unaccent($langs->transnoentities($line->journal_label));
+				$labeljournal = dol_string_nospecial($labeljournal, ' ');
+				print $labeljournal . $separator;
 
 				// FEC:EcritureNum
 				print $line->piece_num . $separator;
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 801618352aa..72524d359c2 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -166,9 +166,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Enable combo list for subsidiary account (may be slow
 ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
-ACCOUNTING_SELL_JOURNAL=Sales journal (sales and returns)
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal (purchase and returns)
-ACCOUNTING_BANK_JOURNAL=Cash journal (receipts and disbursements)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=General journal
 ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
@@ -236,6 +236,7 @@ ConfirmDeleteMvt=This will delete all lines in accountancy for the year/month an
 ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
+InventoryJournal=Inventory journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
 VATAccountNotDefined=Account for VAT not defined
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 5c99c56c1d0..081ba5faddc 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1570,11 +1570,12 @@ table[summary="list_of_modules"] .fa-cog {
 	height: 100px;
 }
 
-.maxscreenheightless200 {
-	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(500, $_SESSION['dol_screenheight'] - 200) : 700; ?>px;	/* we guarantee height of 500 */
+.ls -alrt
+vi  {
+	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(500, (int) $_SESSION['dol_screenheight'] - 200) : 700; ?>px;	/* we guarantee height of 500 */
 }
 .maxscreenheightless300 {
-	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(400, $_SESSION['dol_screenheight'] - 300) : 700; ?>px;	/* we guarantee height of 500 */
+	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(400, (int) $_SESSION['dol_screenheight'] - 300) : 700; ?>px;	/* we guarantee height of 500 */
 }
 
 
@@ -4527,13 +4528,13 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 	.thumbstat {
 		flex: 1 1 110px;
 		margin-bottom: 8px;
-		min-width: <?php echo isset($_SESSION['dol_screenwidth']) ?min(160, round($_SESSION['dol_screenwidth'] / 2 - 20)) : 150; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
+		min-width: <?php echo isset($_SESSION['dol_screenwidth']) ?min(160, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 150; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
 	}
 	.thumbstat150 {
 		flex: 1 1 110px;
 		margin-bottom: 8px;
-		min-width: <?php echo isset($_SESSION['dol_screenwidth']) ?min(160, round($_SESSION['dol_screenwidth'] / 2 - 20)) : 160; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
-		max-width: <?php echo isset($_SESSION['dol_screenwidth']) ?min(161, round($_SESSION['dol_screenwidth'] / 2 - 20)) : 161; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
+		min-width: <?php echo isset($_SESSION['dol_screenwidth']) ?min(160, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 160; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
+		max-width: <?php echo isset($_SESSION['dol_screenwidth']) ?min(161, round((int) $_SESSION['dol_screenwidth'] / 2 - 20)) : 161; ?>px;	/* on screen < 320, we guaranty to have 2 columns */
 		/* width: ...px; If I use with, there is trouble on size of flex boxes solved with min + (max that is a little bit higer than min) */
 	}
 	.dashboardlineindicator {
@@ -5862,7 +5863,7 @@ pre#editfilecontentaceeditorid {
 /* ============================================================================== */
 
 div.scroll2 {
-	width: <?php print isset($_SESSION['dol_screenwidth']) ?max($_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
+	width: <?php print isset($_SESSION['dol_screenwidth']) ?max((int) $_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
 }
 
 div#GanttChartDIVglisthead, div#GanttChartDIVgcharthead {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 93b501885fe..c1805401385 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1789,10 +1789,10 @@ table[summary="list_of_modules"] .fa-cog {
 }
 
 .maxscreenheightless200 {
-	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(500, $_SESSION['dol_screenheight'] - 200) : 700; ?>px;	/* we guarantee height of 500 */
+	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(500, (int) $_SESSION['dol_screenheight'] - 200) : 700; ?>px;	/* we guarantee height of 500 */
 }
 .maxscreenheightless300 {
-	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(400, $_SESSION['dol_screenheight'] - 300) : 700; ?>px;	/* we guarantee height of 500 */
+	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(400, (int) $_SESSION['dol_screenheight'] - 300) : 700; ?>px;	/* we guarantee height of 500 */
 }
 
 tr.nobottom td {
@@ -5845,7 +5845,7 @@ pre#editfilecontentaceeditorid {
 /* ============================================================================== */
 
 div.scroll2 {
-	width: <?php print isset($_SESSION['dol_screenwidth']) ?max($_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
+	width: <?php print isset($_SESSION['dol_screenwidth']) ?max((int) $_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
 }
 
 div#GanttChartDIVglisthead, div#GanttChartDIVgcharthead {

From db8068d08b361b5787d518f7587cf28c4358d82f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 04:05:02 +0100
Subject: [PATCH 156/300] Transifex sync

---
 htdocs/langs/fr_FR/accountancy.lang   | 15 ++++++++-------
 htdocs/langs/fr_FR/admin.lang         | 14 +++++++++-----
 htdocs/langs/fr_FR/boxes.lang         | 23 ++++++++++++++++++++++-
 htdocs/langs/fr_FR/compta.lang        | 10 +++++-----
 htdocs/langs/fr_FR/ecm.lang           |  2 +-
 htdocs/langs/fr_FR/errors.lang        |  3 ++-
 htdocs/langs/fr_FR/interventions.lang |  2 +-
 htdocs/langs/fr_FR/mails.lang         |  3 ++-
 htdocs/langs/fr_FR/members.lang       |  3 +++
 htdocs/langs/fr_FR/partnership.lang   |  2 +-
 htdocs/langs/fr_FR/salaries.lang      |  2 +-
 htdocs/langs/fr_FR/ticket.lang        |  2 +-
 12 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 1657663dea8..345342421fb 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Activer la liste déroulante pour les comptes auxiliai
 ACCOUNTING_DATE_START_BINDING=Définissez une date pour commencer la liaison et le transfert en comptabilité. En dessous de cette date, les transactions ne seront jamais transférées à la comptabilité.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Sur virement comptable, quelle est la période sélectionnée par défaut
 
-ACCOUNTING_SELL_JOURNAL=Journal des ventes (ventes et retours)
-ACCOUNTING_PURCHASE_JOURNAL=Journal des achats (achats et retours)
-ACCOUNTING_BANK_JOURNAL=Journal de trésorerie (encaissements et décaissements)
+ACCOUNTING_SELL_JOURNAL=Journal des ventes
+ACCOUNTING_PURCHASE_JOURNAL=Journal des achats
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Journal des notes de frais
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des opérations diverses
 ACCOUNTING_HAS_NEW_JOURNAL=Journal des A-nouveaux
@@ -180,14 +180,14 @@ ACCOUNTING_RESULT_PROFIT=Compte de résultat (Profit)
 ACCOUNTING_RESULT_LOSS=Compte de résultat (perte)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal de fermeture
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable de virement interne
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte comptable par défaut pour les virements internes
 TransitionalAccount=Compte transitoire de virement bancaire
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable d'attente
+ACCOUNTING_ACCOUNT_SUSPENSE=Compte comptable par défaut pour les opérations en attente
 DONATION_ACCOUNTINGACCOUNT=Compte comptable pour la comptabilisation des dons
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable pour la comptabilisation des adhésions des adhérents
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable par défaut pour les adhésions des adhérents (si l'adhésion est enregistrée sans facture)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte (du plan comptable) à utiliser comme compte par défaut pour enregistrer les acomptes client
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable par défaut pour enregistrer les acomptes client
 UseAuxiliaryAccountOnCustomerDeposit=Enregistrer le compte client comme compte individuel dans le grand livre auxiliaire pour les lignes d'acompte (si désactivé, le compte individuel pour les lignes d'acompte restera vide)
 ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Compte comptable par défaut pour enregistrer l'acompte fournisseur
 UseAuxiliaryAccountOnSupplierDeposit=Utiliser le compte comptable auxiliaire fournisseur dans le grand livre auxiliaire pour les lignes d'acomptes fournisseurs (si désactivé, le compte comptable auxiliaire pour les lignes d'acompte restera vide)
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Cela supprimera toutes les lignes en comptabilité pour l'anné
 ConfirmDeleteMvtPartial=Cela supprimera la transaction de la comptabilité (toutes les lignes liées à la même transaction seront supprimées)
 FinanceJournal=Journal de trésorerie
 ExpenseReportsJournal=Journal des notes de frais
+InventoryJournal=Journal d'inventaire
 DescFinanceJournal=Journal de trésorerie comprenant tous les types de paiements par compte bancaire / caisse
 DescJournalOnlyBindedVisible=Il s'agit d'une vue des éléments liés à un compte comptable et qui peuvent être enregistrés dans les journaux et le grand livre.
 VATAccountNotDefined=Compte de la TVA non défini
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index d98626a2a94..83488e787c3 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Nombre maximum de lignes dans les widgets
 AllWidgetsWereEnabled=Tous les widgets disponibles ont été activés
+WidgetAvailable=Widget available
 PositionByDefault=Position par défaut
 Position=Position
 MenusDesc=Les gestionnaires de menu définissent le contenu des deux barres de menus (la barre horizontale et la barre verticale). Il est possible de mettre un gestionnaire différent selon que l'utilisateur est interne ou externe.
@@ -374,7 +375,7 @@ DoTestSendHTML=Tester envoi HTML
 ErrorCantUseRazIfNoYearInMask=Erreur, ne peut utiliser l'option @ pour remettre à zéro en début d'année si la séquence {yy} ou {yyyy} n'est pas dans le masque.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erreur, ne peut utiliser l'option @ si la séquence {yy}{mm} ou {yyyy}{mm} n'est pas dans le masque.
 UMask=Masque des nouveaux fichiers sous Unix/Linux/BSD/Mac.
-UMaskExplanation=Ce paramètre permet de définir les droits des fichiers créés sur le serveur par Dolibarr (lors d'envois par exemple).<br>Ce doit être la valeur octale (par exemple 0666 signifie lecture/écriture pour tous).<br>Ce paramètre n'a aucun effet sur un serveur Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Voir le wiki pour le détail de tous les contributeurs et leur organisation
 UseACacheDelay= Délai de mise en cache de l'export en secondes (0 ou vide pour aucun cache)
 DisableLinkToHelpCenter=Cacher le lien «<b>Besoin d'aide ou assistance</b>» sur la page de connexion
@@ -663,7 +664,7 @@ Module2900Desc=Capacités de conversion GeoIP Maxmind
 Module3200Name=Archives/Logs Inaltérables
 Module3200Desc=Active la journalisation de certains événements métiers dans une log/archive inaltérable. Les événements sont archivés en temps réel. L'archive est une table d'événements chaînés qui peut être lu uniquement et exporté. Ce module permet d'être compatible avec les exigences des lois de certains pays (comme par exemple la loi Finance 2016 ou norme 525 en France).
 Module3300Name=Module Builder
-Module3200Desc=Active la journalisation de certains événements métiers dans une log/archive inaltérable. Les événements sont archivés en temps réel. L'archive est une table d'événements chaînés qui peut être lu uniquement et exporté. Ce module permet d'être compatible avec les exigences des lois de certains pays (comme par exemple la loi Finance 2016 ou norme 525 en France).
+Module3300Desc=Un outil RAD (Rapid Application Development - low-code et no-code) pour aider les développeurs ou les utilisateurs avancés à construire leur propre module/application.
 Module3400Name=Réseaux sociaux
 Module3400Desc=Activez les champs de réseaux sociaux dans les tiers et les adresses (skype, twitter, facebook, ...).
 Module4000Name=GRH
@@ -705,7 +706,7 @@ Module62000Desc=Ajouts de fonctionnalités pour gérer les incoterms
 Module63000Name=Ressources
 Module63000Desc=Gère les ressources (imprimantes, voitures, salles...). les ressources peuvent être affectées à des événements.
 Module66000Name=Activer l'authentification OAuth2
-Module66000Desc=Fournit un outil pour générer et gérer les jetons OAuth2
+Module66000Desc=Fournir un outil pour générer et gérer des jetons OAuth2. Le jeton peut ensuite être utilisé par d'autres modules.
 Module94160Name=Réceptions
 Permission11=Lire les factures (et paiements) clients
 Permission12=Créer/modifier les factures clients
@@ -1236,7 +1237,7 @@ SetupDescription4=<a href="%s"> %s -> %s </a><br> <br>Ce logiciel est un ensembl
 SetupDescription5=Les autres entrées de configuration gèrent des paramètres facultatifs.
 SetupDescriptionLink= <a href="%s"> %s - %s </a>
 SetupDescription3b=Paramètres de base utilisés pour personnaliser le comportement par défaut de votre application (par exemple pour les fonctionnalités liées au pays).
-SetupDescription4b=Ce logiciel est une suite de nombreux modules/applications. Les modules correspondants à vos besoins doivent être activés et configurés. Les entrées de menu apparaîtront avec l'activation de ces modules.
+SetupDescription4b=Ce logiciel est une suite de nombreux modules/applications. Les modules correspondants à vos besoins doivent être activés. Les entrées de menu apparaîtront avec l'activation de ces modules.
 AuditedSecurityEvents=Événements de sécurité audités
 NoSecurityEventsAreAduited=Aucun événement de sécurité n'est audité. Vous pouvez les activer à partir du menu %s
 Audit=Événements de sécurité
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Utiliser un mode mémoire faible
 ExportUseLowMemoryModeHelp=Utilisez le mode mémoire faible pour générer le fichier dump (la compression se fait via un pipe plutôt que dans la mémoire PHP). Cette méthode ne permet pas de vérifier que le fichier est complet et le message d'erreur ne peut pas être signalé en cas d'échec. Utilisez ce mode si vous avez des erreurs dues à un manque de mémoire.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface pour déclencher un appel d'URL externe suite à un événement Dolibarr
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Configuration du webhook
 Settings = Paramètres
 WebhookSetupPage = Page de configuration du webhook
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Attention :  le module %sa conf
 WarningModuleHasChangedSecurityCsrfParameter=Attention : le module %sa désactivé la sécurisation CSRF de votre instance. Cette action est suspecte et votre installation pourrait ne plus être sécurisée. Veuillez contacter l'auteur du module pour obtenir des explications.
 EMailsInGoingDesc=La réception des e-mails est gérée par le module %s. Vous devez l'activer et le configurer si vous avez besoin de prendre en charge messages entrants.
 MAIN_IMAP_USE_PHPIMAP=Utiliser la librairie PHP-IMAP pour la prise en charge IMAP, à la place du support IMAP natif de PHP. Ceci permet également l'utilisation d'une connexion OAuth2 pour IMAP (le module OAuth doit aussi être activé).
+MAIN_CHECKBOX_LEFT_COLUMN=Afficher la colonne de sélection de champ et de ligne à gauche (à droite par défaut)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 085026a0761..6e237c8692e 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -118,6 +118,27 @@ BoxCustomersOutstandingBillReached=Clients dont l'en-cours de facturation est d
 UsersHome=Accueil des utilisateurs et groupes
 MembersHome=Accueil des adhérents
 ThirdpartiesHome=Accueil des tiers
+productindex=Home products and services
+mrpindex=Home MRP
+commercialindex=Home commercial
+projectsindex=Home projects
+invoiceindex=Home invoices
+hrmindex=Home invoices
 TicketsHome=Accueil des tickets
-AccountancyHome=Espace Comptabilité
+stockindex=Home stocks
+sendingindex=Home shippings
+receptionindex=Home receivings
+activityindex=Home activity
+proposalindex=Home proposal
+ordersindex=Home orders
+orderssuppliersindex=Home orders suppliers
+contractindex=Home contracts
+interventionindex=Home interventions
+suppliersproposalsindex=Home suppliers proposals
+donationindex=Home donations
+specialexpensesindex=Home specials expenses
+expensereportindex=Home expensereport
+mailingindex=Home mailing
+opensurveyindex=Home opensurvey
+AccountancyHome=Accueil de la comptabilité
 ValidatedProjects=Projets validés
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 7b039cba206..d39abffd706 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -246,12 +246,12 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=Le rapport de chiffre d'affa
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Le rapport de Chiffre d'affaires encaissé par taux de TVA n'est pas disponible. Ce rapport est uniquement disponible pour le chiffre d'affaires facturé.
 CalculationMode=Mode de calcul
 AccountancyJournal=Code journal comptable
-ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable à utiliser comme compte par défaut pour la TVA sur les ventes (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
-ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable à utiliser comme compte par défaut pour la TVA sur les achats (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
-ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable à utiliser comme compte par défaut pour le paiement de la TVA
-ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable utilisé pour les tiers "clients"
+ACCOUNTING_VAT_SOLD_ACCOUNT=Compte comptable par défaut pour la TVA sur les ventes (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
+ACCOUNTING_VAT_BUY_ACCOUNT=Compte comptable par défaut pour la TVA sur les achats (utilisé s'il n'est pas défini dans la configuration du dictionnaire TVA)
+ACCOUNTING_VAT_PAY_ACCOUNT=Compte comptable par défaut pour le paiement de la TVA
+ACCOUNTING_ACCOUNT_CUSTOMER=Compte comptable par défaut pour les tiers "clients"
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Le compte comptable dédié défini sur la fiche tiers sera utilisé pour l'affectation du compte auxiliaire uniquement. Celui-ci sera utilisé pour la comptabilité générale et comme valeur par défaut de la comptabilité auxiliaire si le compte comptable client dédié du ties n'est pas défini. 
-ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable utilisé pour les tiers "fournisseurs"
+ACCOUNTING_ACCOUNT_SUPPLIER=Compte comptable par défaut pour les tiers "fournisseurs"
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Le compte de comptabilité dédié défini sur la fiche Tiers sera utilisé pour la comptabilité auxiliaire uniquement. Celui-ci sera utilisé pour le grand livre et comme valeur par défaut de la comptabilité auxiliaire si le compte de comptabilité fournisseur dédié au tiers n'est pas défini.
 ConfirmCloneTax=Confirmer le clonage de la charge sociale/fiscale
 ConfirmCloneVAT=Confirmer le clonage d'une déclaration de TVA
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index e728b754dcf..cc4912214d0 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=Espace GED
 ECMAreaDesc=L'espace GED (Gestion Électronique de Documents) vous permet de stocker, partager et chercher rapidement tout type de documents dans Dolibarr.
 ECMAreaDesc2a=* Les répertoires manuels peuvent être utilisés pour enregistrer des documents non liés à un élément particulier.
 ECMAreaDesc2b=* Les répertoires automatiques sont remplis automatiquement lors de l'ajout de documents depuis la page d'un élément.
-ECMAreaDesc3=* Les répertoires des médias sont des fichiers dans le sous-répertoire <b> /medias </b> du répertoire des documents, lisibles par tout le monde sans avoir besoin d'être connecté et pas besoin d'avoir le fichier partagé explicitement. Il est utilisé pour stocker des fichiers image à partir d'un module d'e-mailing ou de site Web.
+ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=Le répertoire <b>%s</b> a été effacé.
 ECMSectionWasCreated=Le répertoire <b>%s</b> a été créé.
 ECMSearchByKeywords=Recherche par mots-clés
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 5948fedc37a..43c686cd698 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -262,6 +262,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Erreur, le paramètre <b> %s </b>
 ErrorLoginDateValidity=Erreur, cet identifiant est hors de la plage de date de validité
 ErrorValueLength=La longueur du champ <b>%s</b> doit être supérieure à <b>%s</b>
 ErrorReservedKeyword=Le terme '<b>%s</b>' est un mot clé réservé
+ErrorFilenameReserved=The filename <b>%s</b> can't be used as it is a reserved and protected command.
 ErrorNotAvailableWithThisDistribution=Non disponible dans cette distribution
 ErrorPublicInterfaceNotEnabled=L’interface publique n’a pas été activée
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=La langue d'une nouvelle page, si elle est la traduction d'une autre page, doit être définie
@@ -308,7 +309,7 @@ ErrorExistingPermission = La permission <b>%s</b> pour l'objet <b>%s</b> existe
 ErrorFieldExist=La valeur pour <b>%s</b> existe déjà
 ErrorEqualModule=Module invalide dans <b>%s</b>.
 ErrorFieldValue=La valeur pour <b>%s</b> est incorrecte
-ErrorCoherenceMenu=<b>%s</b>est requise lorsque <b>%</b> vaut LEFT
+ErrorCoherenceMenu=<b>%s</b> is required when <b>%s</b> is 'left'
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
index 9ef05378f60..d8f580ff25b 100644
--- a/htdocs/langs/fr_FR/interventions.lang
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Masque les heures et les minutes du champ de la da
 InterventionStatistics=Statistiques des interventions
 NbOfinterventions=Nb de fiches d'intervention
 NumberOfInterventionsByMonth=Nb de fiches d'intervention par mois (date de validation)
-AmountOfInteventionNotIncludedByDefault=Le total des interventions 'nest pas inclus par défaut dans les profits (dans la plupart des cas, les feuilles de temps totalisent le temps passé). Activez l'option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT à 1 dans Accueil > Condiguration > Divers
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Id intervention
 InterRef=Intervention ref.
 InterDateCreation=Date création intervention
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 84bceb74a4e..dd5cc418d66 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts par poste/fonction
 MailingModuleDescEmailsFromFile=E-mails à partir d'un fichier
 MailingModuleDescEmailsFromUser=E-mails entrés par l'utilisateur
 MailingModuleDescDolibarrUsers=Utilisateurs avec e-mail
-MailingModuleDescThirdPartiesByCategories=Tiers (par catégories/tags)
+MailingModuleDescThirdPartiesByCategories=Tiers
 SendingFromWebInterfaceIsNotAllowed=L'envoyer depuis l'interface Web n'est pas autorisé.
 EmailCollectorFilterDesc=Tous les filtres doivent correspondre pour qu'un e-mail soit collecté
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Enregistrement créé par le Collecteur d'e-mails
 DefaultBlacklistMailingStatus=Valeur par défaut du champ '%s' lors de la création d'un nouveau contact
 DefaultStatusEmptyMandatory=Vide mais obligatoire
 WarningLimitSendByDay=ATTENTION : La configuration ou le contrat de votre instance limite votre nombre d'e-mails par jour à <b> %s </b> . Essayer d'en envoyer plus peut entraîner le ralentissement ou la suspension de votre instance. Veuillez contacter votre support si vous avez besoin d'un quota plus élevé.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 4192a038508..1d27ca89964 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -4,6 +4,8 @@ MemberCard=Fiche adhérent
 SubscriptionCard=Fiche cotisation
 Member=Adhérent
 Members=Adhérents
+NoRecordedMembers=No recorded members
+NoRecordedMembersByType=No recorded members
 ShowMember=Afficher fiche adhérent
 UserNotLinkedToMember=Utilisateur non lié à un adhérent
 ThirdpartyNotLinkedToMember=Tiers non lié à un adhérent
@@ -233,3 +235,4 @@ CreateDolibarrThirdPartyDesc=Un tiers est l'entité juridique qui sera utilisée
 MemberFirstname=Prénom du membre
 MemberLastname=Nom de famille du membre
 MemberCodeDesc=Code membre, unique pour tous les membres
+NoRecordedMembers=No recorded members
diff --git a/htdocs/langs/fr_FR/partnership.lang b/htdocs/langs/fr_FR/partnership.lang
index b12f139abc9..58c1725a5d1 100644
--- a/htdocs/langs/fr_FR/partnership.lang
+++ b/htdocs/langs/fr_FR/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Partenariat : Vérifiez le backlink référent
 # Menu
 #
 NewPartnership=Nouveau partenariat
-NewPartnershipbyWeb=Votre demande de partenariat a été ajouté avec succès. Nous vous recontacterons surement d'ici peu...
+NewPartnershipbyWeb=Your partnership request has been added successfully. We may contact you soon...
 ListOfPartnerships=Listes des partenariats
 
 #
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 939f83f96c6..0631a97fa4b 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable utilisé par défaut pour les tiers "utilisateurs"
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte comptable par défaut pour les tiers "salariés"
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Le compte dédié défini sur la fiche utilisateur sera utilisé en tant que compte comptable de tiers (Compte auxiliaire).
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable par défaut pour les paiements de salaires
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Par défaut, laissez vide l’option "Créer automatiquement un paiement complet" lors de la création d’un salaire
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index f33c00f2143..6e09597b26e 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Créé par
 NewTicket=Nouveau ticket
 SubjectAnswerToTicket=Réponse ticket
 TicketTypeRequest=Type de demande
-TicketCategory=Catégorisation du ticket
+TicketCategory=Ticket group
 SeeTicket=Voir le ticket
 TicketMarkedAsRead=Le ticket a été marqué comme lu
 TicketReadOn=Lu

From 06422a5d03febd0304ed777f9aa80be93f960ddb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 04:24:12 +0100
Subject: [PATCH 157/300] Fix message if no record found

---
 htdocs/comm/mailing/cibles.php              | 10 +++++++---
 htdocs/comm/mailing/class/mailing.class.php |  6 ++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 282718b219b..b378ff2b033 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -714,9 +714,13 @@ if ($object->fetch($id) >= 0) {
 				$i++;
 			}
 		} else {
-			if ($object->statut < 2) {
-				print '<tr><td colspan="9" class="opacitymedium">';
-				print $langs->trans("NoTargetYet");
+			if ($object->statut < $object::STATUS_SENTPARTIALY) {
+				print '<tr><td colspan="9">';
+				print '<span class="opacitymedium">'.$langs->trans("NoTargetYet").'</span>';
+				print '</td></tr>';
+			} else {
+				print '<tr><td colspan="9">';
+				print '<span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span>';
 				print '</td></tr>';
 			}
 		}
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 7ae756630cb..75bfce98496 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -191,6 +191,12 @@ class Mailing extends CommonObject
 	public $substitutionarrayfortest;
 
 
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_SENTPARTIALY = 2;
+	const STATUS_SENTCOMPLETELY = 3;
+
+
 	/**
 	 *  Constructor
 	 *

From e836cc4f55fcd4fb3c2b7c0fbf7db8896abf86e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 27 Feb 2023 10:24:24 +0100
Subject: [PATCH 158/300] use hasRight

---
 htdocs/commande/class/commande.class.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 86325cf8e37..c332848434a 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -332,14 +332,14 @@ class Commande extends CommonOrder
 		'note_public' =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>155),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'PDFTemplate', 'enabled'=>1, 'visible'=>0, 'position'=>160),
 		//'facture' =>array('type'=>'tinyint(4)', 'label'=>'ParentInvoice', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
-		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'$conf->banque->enabled', 'visible'=>-1, 'position'=>170),
+		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'isModEnabled("banque")', 'visible'=>-1, 'position'=>170),
 		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'MulticurrencyID', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
 		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
 		'deposit_percent' =>array('type'=>'varchar(63)', 'label'=>'DepositPercent', 'enabled'=>1, 'visible'=>-1, 'position'=>181),
 		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
 		'date_livraison' =>array('type'=>'date', 'label'=>'DateDeliveryPlanned', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
 		'fk_shipping_method' =>array('type'=>'integer', 'label'=>'ShippingMethod', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-		'fk_warehouse' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Fk warehouse', 'enabled'=>'$conf->stock->enabled', 'visible'=>-1, 'position'=>200),
+		'fk_warehouse' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Fk warehouse', 'enabled'=>'isModEnabled("stock")', 'visible'=>-1, 'position'=>200),
 		'fk_availability' =>array('type'=>'integer', 'label'=>'Availability', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
 		'fk_input_reason' =>array('type'=>'integer', 'label'=>'InputReason', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
 		//'fk_delivery_address' =>array('type'=>'integer', 'label'=>'DeliveryAddress', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
@@ -2531,7 +2531,7 @@ class Commande extends CommonOrder
 
 		$remise = price2num($remise);
 
-		if ($user->rights->commande->creer) {
+		if ($user->hasRight('commande', 'creer')) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2591,7 +2591,7 @@ class Commande extends CommonOrder
 	public function set_date($user, $date, $notrigger = 0)
 	{
 		// phpcs:enable
-		if ($user->rights->commande->creer) {
+		if ($user->hasRight('commande', 'creer')) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2663,7 +2663,7 @@ class Commande extends CommonOrder
 	 */
 	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
-		if ($user->rights->commande->creer) {
+		if ($user->hasRight('commande', 'creer')) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2922,7 +2922,7 @@ class Commande extends CommonOrder
 	public function set_ref_client($user, $ref_client, $notrigger = 0)
 	{
 		// phpcs:enable
-		if ($user->rights->commande->creer) {
+		if ($user->hasRight('commande', 'creer')) {
 			$error = 0;
 
 			$this->db->begin();
@@ -3174,17 +3174,17 @@ class Commande extends CommonOrder
 
 			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
 
-			$total_ht  = $tabprice[0];
+			$total_ht = $tabprice[0];
 			$total_tva = $tabprice[1];
 			$total_ttc = $tabprice[2];
 			$total_localtax1 = $tabprice[9];
 			$total_localtax2 = $tabprice[10];
-			$pu_ht  = $tabprice[3];
+			$pu_ht = $tabprice[3];
 			$pu_tva = $tabprice[4];
 			$pu_ttc = $tabprice[5];
 
 			// MultiCurrency
-			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_ht = $tabprice[16];
 			$multicurrency_total_tva = $tabprice[17];
 			$multicurrency_total_ttc = $tabprice[18];
 			$pu_ht_devise = $tabprice[19];

From 2daa9b2dba7281b20642a3fabfec3c1b07e00b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Mon, 27 Feb 2023 10:34:28 +0100
Subject: [PATCH 159/300] user hasRight

---
 htdocs/bom/tpl/linkedobjectblock.tpl.php        | 2 +-
 htdocs/commande/class/commande.class.php        | 2 +-
 htdocs/commande/tpl/linkedobjectblock.tpl.php   | 2 +-
 htdocs/contrat/card.php                         | 2 +-
 htdocs/core/boxes/box_commandes.php             | 2 +-
 htdocs/core/boxes/box_graph_orders_permonth.php | 2 +-
 htdocs/expedition/shipment.php                  | 2 +-
 htdocs/fichinter/document.php                   | 2 +-
 htdocs/fichinter/info.php                       | 2 +-
 htdocs/fichinter/note.php                       | 2 +-
 htdocs/product/stats/commande.php               | 2 +-
 htdocs/resource/element_resource.php            | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/htdocs/bom/tpl/linkedobjectblock.tpl.php b/htdocs/bom/tpl/linkedobjectblock.tpl.php
index 1765e9a84c1..d00340a1322 100644
--- a/htdocs/bom/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/bom/tpl/linkedobjectblock.tpl.php
@@ -64,7 +64,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	print '</td>';
 	echo '<td class="linkedcol-date">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
 	echo '<td class="linkedcol-amount right">';
-	if ($user->rights->commande->lire) {
+	if ($user->hasRight('commande', 'lire')) {
 		$total = $total + $objectlink->total_ht;
 		echo price($objectlink->total_ht);
 	}
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index c332848434a..1c72f0ef4ff 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2463,7 +2463,7 @@ class Commande extends CommonOrder
 	{
 		$remise = trim($remise) ?trim($remise) : 0;
 
-		if ($user->rights->commande->creer) {
+		if ($user->hasRight('commande', 'creer')) {
 			$error = 0;
 
 			$this->db->begin();
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index a6a1fde3851..323ef0aefa6 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -55,7 +55,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '<td class="linkedcol-ref">'.$objectlink->ref_client.'</td>';
 	echo '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
 	echo '<td class="linkedcol-amount right">';
-	if ($user->rights->commande->lire) {
+	if ($user->hasRight('commande', 'lire')) {
 		$total = $total + $objectlink->total_ht;
 		echo price($objectlink->total_ht);
 	}
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 4c8e50624c2..1653bd06c08 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2123,7 +2123,7 @@ if ($action == 'create') {
 
 				if (isModEnabled('commande') && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices) {
 					$langs->load("orders");
-					if ($user->rights->commande->creer) {
+					if ($user->hasRight('commande', 'creer')) {
 						print dolGetButtonAction($langs->trans('CreateOrder'), '', 'default', DOL_URL_ROOT.'/commande/card.php?action=create&token='.newToken().'&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id, '', true, $params);
 					} else {
 						$params['attr']['title'] = $langs->trans("NotEnoughPermissions");
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index f5764c8a575..f0534728aad 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -85,7 +85,7 @@ class box_commandes extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."CustomerOrders", $max));
 
-		if ($user->rights->commande->lire) {
+		if ($user->hasRight('commande', 'lire')) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 0d8f41bc6ea..47b10fa5749 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -103,7 +103,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
 		}
 
-		if ($user->rights->commande->lire) {
+		if ($user->hasRight('commande', 'lire')) {
 			$langs->load("orders");
 
 			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index c61249877a3..325559882d8 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -517,7 +517,7 @@ if ($id > 0 || !empty($ref)) {
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
 			print $langs->trans('IncotermLabel');
 			print '<td><td class="right">';
-			if ($user->rights->commande->creer) {
+			if ($user->hasRight('commande', 'creer')) {
 				print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm&token='.newToken().'">'.img_edit().'</a>';
 			} else {
 				print '&nbsp;';
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 3b4721d63a0..52d1019d755 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -127,7 +127,7 @@ if ($object->id) {
 	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->commande->creer) {
+		if ($user->hasRight('commande', 'creer')) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index da1af1d613b..77e31705790 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -82,7 +82,7 @@ $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl
 if (isModEnabled('project')) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	if ($user->rights->commande->creer) {
+	if ($user->hasRight('commande', 'creer')) {
 		if ($action != 'classify') {
 			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 93bd60e519b..f80f08a44bc 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -92,7 +92,7 @@ if ($id > 0 || !empty($ref)) {
 	if (isModEnabled('project')) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->commande->creer) {
+		if ($user->hasRight('commande', 'creer')) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index 1df4f70c063..d5854fdc702 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -136,7 +136,7 @@ if ($id > 0 || !empty($ref)) {
 		print dol_get_fiche_end();
 
 
-		if ($user->rights->commande->lire) {
+		if ($user->hasRight('commande', 'lire')) {
 			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client, c.rowid, d.total_ht as total_ht, c.ref,";
 			$sql .= " c.ref_client,";
 			$sql .= " c.date_commande, c.fk_statut as statut, c.facture, c.rowid as commandeid, d.rowid, d.qty";
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index f69b82727f0..d1631d94d94 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -541,7 +541,7 @@ if (!$ret) {
 			if (isModEnabled('project')) {
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-				if ($user->rights->commande->creer) {
+				if ($user->hasRight('commande', 'creer')) {
 					if ($action != 'classify') {
 						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $fichinter->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 						$morehtmlref .= ' : ';

From 256ce217d051e0891708ff3c6760217f7b48f078 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 12:08:24 +0100
Subject: [PATCH 160/300] Fix regression

---
 htdocs/theme/eldy/global.inc.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 081ba5faddc..70485bacee4 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1570,8 +1570,7 @@ table[summary="list_of_modules"] .fa-cog {
 	height: 100px;
 }
 
-.ls -alrt
-vi  {
+maxscreenheightless200 {
 	max-height: <?php echo isset($_SESSION['dol_screenheight']) ? max(500, (int) $_SESSION['dol_screenheight'] - 200) : 700; ?>px;	/* we guarantee height of 500 */
 }
 .maxscreenheightless300 {

From 7ae7f2481a22e02501147ec83025820bd4bf6dcd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 14:29:34 +0100
Subject: [PATCH 161/300] Fix css

---
 htdocs/theme/eldy/global.inc.php |  3 ++-
 htdocs/theme/md/style.css.php    | 10 ++++++++--
 htdocs/website/index.php         |  4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 70485bacee4..e58cc663987 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5265,6 +5265,7 @@ span[phptag] {
 .websitebar .button.bordertransp {
 	color: unset;
 	text-decoration: unset !important;
+	margin: 0px 4px 0px 4px  !important
 }
 
 .websitebar {
@@ -5312,7 +5313,7 @@ span[phptag] {
 .websiteinputurl {
 	display: inline-block;
 	vertical-align: middle;
-	line-height: 28px;
+	line-height: 26px;
 }
 .websiteiframenoborder {
 	border: 0px;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index c1805401385..e13811967f1 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -5264,6 +5264,12 @@ span[phptag] {
 	font-weight: normal;
 	color: #444 !important;
 }
+.websitebar .button.bordertransp {
+	color: unset;
+	text-decoration: unset !important;
+	/* margin: 0px 4px 0px 4px  !important */
+}
+
 .websitebar {
 	border-bottom: 1px solid #ccc;
 	background: #eee;
@@ -5303,7 +5309,7 @@ span[phptag] {
 .websiteinputurl {
 	display: inline-block;
 	vertical-align: top;
-	line-height: 28px;
+	line-height: 26px;
 }
 .websiteiframenoborder {
 	border: 0px;
@@ -5324,7 +5330,7 @@ span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled im
 .websitehelp {
 	vertical-align: middle;
 	float: right;
-	padding-top: 8px;
+	padding-top: 5px;
 }
 .websiteselectionsection {
 	border-left: 1px solid #bbb;
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 271c139b667..070cefd3e8f 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -2959,7 +2959,7 @@ if (!GETPOST('hide_websitemenu')) {
 					$url = $_SERVER["PHP_SELF"].'?action=deletesite&token='.newToken().'&website='.urlencode($website->ref);
 				}
 			}
-			print '<a href="'.$url.'" class="buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>';
+			print '<a href="'.$url.'" class="button buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>';
 
 			// Regenerate all pages
 			print '<a href="'.$_SERVER["PHP_SELF"].'?action=regeneratesite&token='.newToken().'&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="far fa-hdd"></span></a>';
@@ -3361,7 +3361,7 @@ if (!GETPOST('hide_websitemenu')) {
 					$title = '';
 					$url = $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&pageid='.((int) $websitepage->id).'&website='.urlencode($website->ref);	// action=delete for webpage, deletesite for website
 				}
-				print '<a href="'.$url.'" class="buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>';
+				print '<a href="'.$url.'" class="button buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>';
 			}
 		}
 

From 3355867712201724e8783261f73749c288cee239 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 14:38:09 +0100
Subject: [PATCH 162/300] Trans

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

diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index b5dbfd656b6..f5b5d3fca91 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -41,7 +41,7 @@ STRIPE_LIVE_WEBHOOK_KEY=Webhook live key
 ONLINE_PAYMENT_WAREHOUSE=Stock to use for stock decrease when online payment is done<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice ?)
 StripeLiveEnabled=Stripe live enabled (otherwise test/sandbox mode)
 StripeImportPayment=Import Stripe payments
-ExampleOfTestCreditCard=Example of credit card for SEPA test: %s => valid, %s => error CVC, %s => expired, %s => charge fails
+ExampleOfTestCreditCard=Example of credit card for a test payment: %s => valid, %s => error CVC, %s => expired, %s => charge fails
 ExampleOfTestBankAcountForSEPA=Example of bank account BAN for direct debit test: %s
 StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)

From 14d6c5fbdb188f0e14d252bb921c9e8733d27887 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 15:02:01 +0100
Subject: [PATCH 163/300] Add missing column for the bank account for SEPA
 payments

---
 htdocs/compta/prelevement/card.php            |  9 ++++--
 .../install/mysql/migration/17.0.0-18.0.0.sql |  1 +
 .../mysql/tables/llx_prelevement_bons.sql     | 31 ++++++++++---------
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 33a4409bac9..7ccac69b21a 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -210,8 +210,13 @@ if ($id > 0 || $ref) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-	$acc = new Account($db);
-	$result = $acc->fetch(($object->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT));
+	if ($object->fk_bank_account > 0) {
+		$acc = new Account($db);
+		$result = $acc->fetch($object->fk_bank_account);
+	} else {	// For backward compatibility
+		$acc = new Account($db);
+		$result = $acc->fetch(($object->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT));
+	}
 
 	print '<tr><td class="titlefieldcreate">';
 	$labelofbankfield = "BankToReceiveWithdraw";
diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index 1e5c82672cc..9c2643688dd 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -73,6 +73,7 @@ ALTER TABLE llx_bank_account ADD COLUMN owner_zip varchar(25);
 ALTER TABLE llx_bank_account ADD COLUMN owner_town varchar(50);
 ALTER TABLE llx_bank_account ADD COLUMN owner_country_id integer DEFAULT NULL;
 
+ALTER TABLE llx_prelevement_bons ADD COLUMN fk_bank_account integer DEFAULT NULL;
 
 ALTER TABLE llx_supplier_proposal ADD UNIQUE INDEX uk_supplier_proposal_ref (ref, entity);
 
diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
index fc7f3f2f538..086791db825 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql
@@ -20,24 +20,25 @@
 --
 -- Direct debit or credit orders
 --
+-- statut 0 : draft
 -- statut 1 : sent to the bank
 -- statut 2 : paid
 --
 create table llx_prelevement_bons
 (
-  rowid          integer AUTO_INCREMENT PRIMARY KEY,
-  type           varchar(16) DEFAULT 'debit-order',				-- 'debit-order' or 'bank-transfer'
-  ref            varchar(12),        -- reference
-  entity         integer DEFAULT 1 NOT NULL, -- multi company id
-  datec          datetime,           -- date de creation
-  amount         double(24,8) DEFAULT 0, -- montant total du prelevement
-  statut         smallint DEFAULT 0, -- statut
-  credite        smallint DEFAULT 0, -- indique si le prelevement a ete credite
-  note           text,
-  date_trans     datetime,           -- date de transmission a la banque
-  method_trans   smallint,           -- methode de transmission
-  fk_user_trans  integer,            -- user qui a effectue la transmission
-  date_credit    datetime,           -- date de credit sur le compte
-  fk_user_credit integer             -- user qui a remonte l'info de credit
-
+  rowid           integer AUTO_INCREMENT PRIMARY KEY,
+  type            varchar(16) DEFAULT 'debit-order',				-- 'debit-order' or 'bank-transfer'
+  ref             varchar(12),        -- reference
+  entity          integer DEFAULT 1 NOT NULL, -- multi company id
+  datec           datetime,           -- date de creation
+  amount          double(24,8) DEFAULT 0, -- montant total du prelevement
+  statut          smallint DEFAULT 0, -- statut
+  credite         smallint DEFAULT 0, -- indique si le prelevement a ete credite
+  note            text,
+  date_trans      datetime,           -- date de transmission a la banque
+  method_trans    smallint,           -- methode de transmission
+  fk_user_trans   integer,            -- user qui a effectue la transmission
+  date_credit     datetime,           -- date de credit sur le compte
+  fk_user_credit  integer,            -- user qui a remonte l'info de credit
+  fk_bank_account integer DEFAULT NULL
 )ENGINE=innodb;

From 4fdb158c41bf2714ee8dd8b8ce09dc200541033a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 15:07:46 +0100
Subject: [PATCH 164/300] Fix warning

---
 htdocs/compta/prelevement/factures.php    | 4 ++--
 htdocs/compta/prelevement/fiche-rejet.php | 4 ++--
 htdocs/compta/prelevement/fiche-stat.php  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 0ed75b5c3b8..d731acea3b5 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -105,7 +105,7 @@ if ($id > 0 || $ref) {
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
 		print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
 
-		if ($object->date_trans <> 0) {
+		if (!empty($object->date_trans)) {
 			$muser = new User($db);
 			$muser->fetch($object->user_trans);
 
@@ -116,7 +116,7 @@ if ($id > 0 || $ref) {
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if ($object->date_credit <> 0) {
+		if (!empty($object->date_credit)) {
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
 			print dol_print_date($object->date_credit, 'day');
 			print '</td></tr>';
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index de9eb46631c..76a628bac4b 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -100,7 +100,7 @@ if ($id > 0 || $ref) {
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
 		print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
 
-		if ($object->date_trans <> 0) {
+		if (!empty($object->date_trans)) {
 			$muser = new User($db);
 			$muser->fetch($object->user_trans);
 
@@ -111,7 +111,7 @@ if ($id > 0 || $ref) {
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if ($object->date_credit <> 0) {
+		if (!empty($object->date_credit)) {
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
 			print dol_print_date($object->date_credit, 'day');
 			print '</td></tr>';
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 3b15676792e..ac7959b795a 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -94,7 +94,7 @@ if ($id > 0 || $ref) {
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
 		print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
 
-		if ($object->date_trans <> 0) {
+		if (!empty($object->date_trans)) {
 			$muser = new User($db);
 			$muser->fetch($object->user_trans);
 
@@ -105,7 +105,7 @@ if ($id > 0 || $ref) {
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if ($object->date_credit <> 0) {
+		if (!empty($object->date_credit)) {
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
 			print dol_print_date($object->date_credit, 'day');
 			print '</td></tr>';

From f60c6395463409b530167ab026a5c132f6db4d9a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 15:11:52 +0100
Subject: [PATCH 165/300] css

---
 htdocs/compta/prelevement/fiche-rejet.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 76a628bac4b..8f480742b51 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -242,7 +242,7 @@ if ($resql) {
 			$i++;
 		}
 	} else {
-		print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		print '<tr><td colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 	}
 
 	if ($num > 0) {

From 570748ad790184577c29145e0b85d724dcfa676d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 15:58:15 +0100
Subject: [PATCH 166/300] NEW Support different bank account for several direct
 debit payments

---
 htdocs/compta/facture/prelevement.php         |  35 +-
 htdocs/compta/prelevement/card.php            |   3 +-
 .../class/bonprelevement.class.php            | 101 ++--
 htdocs/core/class/commoninvoice.class.php     | 488 +++++++++---------
 4 files changed, 340 insertions(+), 287 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 782e16ec71b..c4ec203eb97 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -1,4 +1,6 @@
 <?php
+use Stripe\BankAccount;
+
 /* Copyright (C) 2002-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004       Eric Seigne				<eric.seigne@ryxeo.com>
  * Copyright (C) 2004-2016  Laurent Destailleur		<eldy@users.sourceforge.net>
@@ -138,7 +140,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	// Payment with Direct Debit Stripe
+	// Make payment with Direct Debit Stripe
 	if ($action == 'sepastripepayment' && $usercancreate) {
 		$result = $object->makeStripeSepaRequest($user, GETPOST('did', 'int'), 'direct-debit', 'facture');
 		if ($result < 0) {
@@ -153,7 +155,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	// payments conditions
+	// Set payments conditions
 	if ($action == 'setconditions' && $usercancreate) {
 		$object->fetch($id);
 		$object->cond_reglement_code = 0; // To clean property
@@ -915,7 +917,7 @@ if ($object->id > 0) {
 	// Past requests
 
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande, pfd.date_traite, pfd.fk_prelevement_bons, pfd.amount,";
-	$sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status,";
+	$sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status, pb.fk_bank_account,";
 	$sql .= " u.rowid as user_id, u.email, u.lastname, u.firstname, u.login, u.statut as user_status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
@@ -929,16 +931,16 @@ if ($object->id > 0) {
 	$sql .= " AND pfd.type = 'ban'";
 	$sql .= " ORDER BY pfd.date_demande DESC";
 
-	$result = $db->query($sql);
-	if ($result) {
-		$num = $db->num_rows($result);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
 		$numclosed = $num;
 		$i = 0;
 
 		$tmpuser = new User($db);
 
 		while ($i < $num) {
-			$obj = $db->fetch_object($result);
+			$obj = $db->fetch_object($resql);
 
 			$tmpuser->id = $obj->user_id;
 			$tmpuser->login = $obj->login;
@@ -975,9 +977,26 @@ if ($object->id > 0) {
 				$withdrawreceipt->date_creation = $db->jdate($obj->datec);
 				$withdrawreceipt->statut = $obj->status;
 				$withdrawreceipt->status = $obj->status;
+				$withdrawreceipt->fk_bank_account = $obj->fk_bank_account;
 				//$withdrawreceipt->credite = $db->jdate($obj->credite);
 
 				print $withdrawreceipt->getNomUrl(1);
+				print ' ';
+				print $withdrawreceipt->getLibStatut(2);
+
+				// Show the bank account
+				$fk_bank_account = $withdrawreceipt->fk_bank_account;
+				if (empty($fk_bank_account)) {
+					$fk_bank_account = ($object->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+				}
+				if ($fk_bank_account > 0) {
+					$bankaccount = new Account($db);
+					$result = $bankaccount->fetch($fk_bank_account);
+					if ($result > 0) {
+						print ' - ';
+						print $bankaccount->getNomUrl(1);
+					}
+				}
 			}
 			print "</td>\n";
 
@@ -995,7 +1014,7 @@ if ($object->id > 0) {
 			print '<tr class="oddeven"><td colspan="7"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 
-		$db->free($result);
+		$db->free($resql);
 	} else {
 		dol_print_error($db);
 	}
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 7ccac69b21a..675aeb965e7 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -215,7 +215,8 @@ if ($id > 0 || $ref) {
 		$result = $acc->fetch($object->fk_bank_account);
 	} else {	// For backward compatibility
 		$acc = new Account($db);
-		$result = $acc->fetch(($object->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT));
+		$fk_bank_account = ($object->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+		$result = $acc->fetch($fk_bank_account);
 	}
 
 	print '<tr><td class="titlefieldcreate">';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 70836cb50cf..64f359e4f7a 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -92,6 +92,7 @@ class BonPrelevement extends CommonObject
 	public $user_credit;
 
 	public $type;
+	public $fk_bank_account;	// The bank the receipt is generated for
 
 	const STATUS_DRAFT = 0;
 	const STATUS_TRANSFERED = 1;
@@ -299,6 +300,7 @@ class BonPrelevement extends CommonObject
 		$sql .= ", p.date_credit as date_credit";
 		$sql .= ", p.fk_user_credit";
 		$sql .= ", p.type";
+		$sql .= ", p.fk_bank_account";
 		$sql .= ", p.statut as status";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 		$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
@@ -328,6 +330,7 @@ class BonPrelevement extends CommonObject
 				$this->user_credit    = $obj->fk_user_credit;
 
 				$this->type           = $obj->type;
+				$this->fk_bank_account = $obj->fk_bank_account;
 
 				$this->status         = $obj->status;
 				$this->statut         = $obj->status; // For backward compatibility
@@ -369,7 +372,7 @@ class BonPrelevement extends CommonObject
 
 			$this->db->begin();
 
-			$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
+			$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
 			$sql .= " SET fk_user_credit = ".$user->id;
 			$sql .= ", statut = ".self::STATUS_CREDITED;
 			$sql .= ", date_credit = '".$this->db->idate($date)."'";
@@ -383,8 +386,12 @@ class BonPrelevement extends CommonObject
 				$subject = $langs->trans("InfoCreditSubject", $this->ref);
 				$message = $langs->trans("InfoCreditMessage", $this->ref, dol_print_date($date, 'dayhour'));
 
-				//Add payment of withdrawal into bank
-				$bankaccount = ($this->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+				// Add payment of withdrawal into bank
+				$fk_bank_account = $this->fk_bank_account;
+				if (empty($fk_bank_account)) {
+					$fk_bank_account = ($this->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+				}
+
 				$facs = array();
 				$amounts = array();
 				$amountsperthirdparty = array();
@@ -455,7 +462,7 @@ class BonPrelevement extends CommonObject
 							$modeforaddpayment = 'payment';
 						}
 
-						$result = $paiement->addPaymentToBank($user, $modeforaddpayment, '(WithdrawalPayment)', $bankaccount, '', '');
+						$result = $paiement->addPaymentToBank($user, $modeforaddpayment, '(WithdrawalPayment)', $fk_bank_account, '', '');
 						if ($result < 0) {
 							$error++;
 							$this->error = $paiement->error;
@@ -742,17 +749,18 @@ class BonPrelevement extends CommonObject
 	 *  - Link the order with the prelevement_demande lines
 	 *  TODO delete params banque and agence when not necessary
 	 *
-	 *	@param 	int		$banque			dolibarr mysoc bank
-	 *	@param	int		$agence			dolibarr mysoc bank office (guichet)
-	 *	@param	string	$mode			real=do action, simu=test only
-	 *  @param	string	$format			FRST, RCUR or ALL
-	 *  @param  string  $executiondate	Date to execute the transfer
-	 *  @param	int	    $notrigger		Disable triggers
-	 *  @param	string	$type			'direct-debit' or 'bank-transfer'
-	 *  @param	int		$did			ID of an existing payment request. If $did is defined, no entry
-	 *	@return	int						<0 if KO, No of invoice included into file if OK
+	 *	@param 	int		$banque				dolibarr mysoc bank
+	 *	@param	int		$agence				dolibarr mysoc bank office (guichet)
+	 *	@param	string	$mode				real=do action, simu=test only
+	 *  @param	string	$format				FRST, RCUR or ALL
+	 *  @param  string  $executiondate		Date to execute the transfer
+	 *  @param	int	    $notrigger			Disable triggers
+	 *  @param	string	$type				'direct-debit' or 'bank-transfer'
+	 *  @param	int		$did				ID of an existing payment request. If $did is defined, no entry
+	 *  @param	int		$fk_bank_account	Bank account ID the receipt is generated for. Will use the ID into the setup of module Direct Debit or Credit Transfer if 0.
+	 *	@return	int							<0 if KO, No of invoice included into file if OK
 	 */
-	public function create($banque = 0, $agence = 0, $mode = 'real', $format = 'ALL', $executiondate = '', $notrigger = 0, $type = 'direct-debit', $did = 0)
+	public function create($banque = 0, $agence = 0, $mode = 'real', $format = 'ALL', $executiondate = '', $notrigger = 0, $type = 'direct-debit', $did = 0, $fk_bank_account = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs, $user;
@@ -762,6 +770,7 @@ class BonPrelevement extends CommonObject
 		require_once DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php";
 		require_once DOL_DOCUMENT_ROOT."/societe/class/societe.class.php";
 
+		// Check params
 		if ($type != 'bank-transfer') {
 			if (empty($format)) {
 				$this->error = 'ErrorBadParametersForDirectDebitFileCreate';
@@ -769,6 +778,11 @@ class BonPrelevement extends CommonObject
 			}
 		}
 
+		// Clean params
+		if (empty($fk_bank_account)) {
+			$fk_bank_account = ($type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+		}
+
 		$error = 0;
 
 		$datetimeprev = dol_now('gmt');
@@ -969,12 +983,13 @@ class BonPrelevement extends CommonObject
 
 					// Create withdraw order in database
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_bons (";
-					$sql .= "ref, entity, datec, type";
+					$sql .= "ref, entity, datec, type, fk_bank_account";
 					$sql .= ") VALUES (";
 					$sql .= "'".$this->db->escape($ref)."'";
 					$sql .= ", ".((int) $conf->entity);
 					$sql .= ", '".$this->db->idate($now)."'";
 					$sql .= ", '".($type == 'bank-transfer' ? 'bank-transfer' : 'debit-order')."'";
+					$sql .= ", ".((int) $fk_bank_account);
 					$sql .= ")";
 
 					$resql = $this->db->query($sql);
@@ -1055,12 +1070,8 @@ class BonPrelevement extends CommonObject
 					$this->date_echeance = $datetimeprev;
 					$this->reference_remise = $ref;
 
-					$id = $conf->global->PRELEVEMENT_ID_BANKACCOUNT;
-					if ($type == 'bank-transfer') {
-						$id = $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT;
-					}
 					$account = new Account($this->db);
-					if ($account->fetch($id) > 0) {
+					if ($account->fetch($fk_bank_account) > 0) {
 						$this->emetteur_code_banque        = $account->code_banque;
 						$this->emetteur_code_guichet       = $account->code_guichet;
 						$this->emetteur_numero_compte      = $account->number;
@@ -1382,16 +1393,22 @@ class BonPrelevement extends CommonObject
 	 * File is generated with name this->filename
 	 *
 	 * @param	string	$format				FRST, RCUR or ALL
-	 * @param 	string 	$executiondate		Date to execute transfer
+	 * @param 	int 	$executiondate		Timestamp date to execute transfer
 	 * @param	string	$type				'direct-debit' or 'bank-transfer'
+	 * @param	int		$fk_bank_account	Bank account ID the receipt is generated for. Will use the ID into the setup of module Direct Debit or Credit Transfer if 0.
 	 * @return	int							>=0 if OK, <0 if KO
 	 */
-	public function generate($format = 'ALL', $executiondate = '', $type = 'direct-debit')
+	public function generate($format = 'ALL', $executiondate = 0, $type = 'direct-debit', $fk_bank_account = 0)
 	{
 		global $conf, $langs, $mysoc;
 
 		//TODO: Optimize code to read lines in a single function
 
+		// Clean params
+		if (empty($fk_bank_account)) {
+			$fk_bank_account = ($type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+		}
+
 		$result = 0;
 
 		dol_syslog(get_class($this)."::generate build file=".$this->filename." type=".$type);
@@ -1486,7 +1503,7 @@ class BonPrelevement extends CommonObject
 
 				// Define $fileEmetteurSection. Start of bloc PmtInf. Will contains all $nbtotalDrctDbtTxInf
 				if ($result != -2) {
-					$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $nbtotalDrctDbtTxInf, $this->total, $CrLf, $format, $type);
+					$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $nbtotalDrctDbtTxInf, $this->total, $CrLf, $format, $type, $fk_bank_account);
 				}
 
 				/**
@@ -2041,31 +2058,36 @@ class BonPrelevement extends CommonObject
 	 *	Write sender of request (me).
 	 *  Note: The tag PmtInf is opened here but closed into caller
 	 *
-	 *	@param	Conf	$configuration	conf
-	 *	@param	int     $ladate			Date
-	 *	@param	int		$nombre			0 or 1
-	 *	@param	float	$total			Total
-	 *	@param	string	$CrLf			End of line character
-	 *  @param	string	$format			FRST or RCUR or ALL
-	 *  @param	string	$type			'direct-debit' or 'bank-transfer'
-	 *	@return	string					String with SEPA Sender
+	 *	@param	Conf	$configuration		conf
+	 *	@param	int     $ladate				Date
+	 *	@param	int		$nombre				0 or 1
+	 *	@param	float	$total				Total
+	 *	@param	string	$CrLf				End of line character
+	 *  @param	string	$format				FRST or RCUR or ALL
+	 *  @param	string	$type				'direct-debit' or 'bank-transfer'
+	 *  @param	int		$fk_bank_account	Bank account ID the receipt is generated for. Will use the ID into the setup of module Direct Debit or Credit Transfer if 0.
+	 *	@return	string						String with SEPA Sender
 	 *  @see EnregEmetteur()
 	 */
-	public function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf = '\n', $format = 'FRST', $type = 'direct-debit')
+	public function EnregEmetteurSEPA($configuration, $ladate, $nombre, $total, $CrLf = '\n', $format = 'FRST', $type = 'direct-debit', $fk_bank_account = 0)
 	{
 		// phpcs:enable
 		// SEPA INITIALISATION
 		global $conf;
 
+		// Clean parameters
 		$dateTime_YMD = dol_print_date($ladate, '%Y%m%d');
 		$dateTime_ETAD = dol_print_date($ladate, '%Y-%m-%d');
 		$dateTime_YMDHMS = dol_print_date($ladate, '%Y-%m-%dT%H:%M:%S');
 
+		// Clean params
+		if (empty($fk_bank_account)) {
+			$fk_bank_account = ($type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+		}
+
 		// Get data of bank account
-		//$id = $configuration->global->PRELEVEMENT_ID_BANKACCOUNT;
-		$id = ($type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
 		$account = new Account($this->db);
-		if ($account->fetch($id) > 0) {
+		if ($account->fetch($fk_bank_account) > 0) {
 			$this->emetteur_code_banque = $account->code_banque;
 			$this->emetteur_code_guichet = $account->code_guichet;
 			$this->emetteur_numero_compte = $account->number;
@@ -2081,8 +2103,7 @@ class BonPrelevement extends CommonObject
 
 		// Get pending payments
 		$sql = "SELECT rowid, ref";
-		$sql .= " FROM";
-		$sql .= " ".MAIN_DB_PREFIX."prelevement_bons as pb";
+		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as pb";
 		$sql .= " WHERE pb.rowid = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
@@ -2294,10 +2315,10 @@ class BonPrelevement extends CommonObject
 	}
 
 	/**
-	 *    Return status label of object
+	 *  Return status label of object
 	 *
-	 *    @param    int		$mode   0=Label, 1=Picto + label, 2=Picto, 3=Label + Picto
-	 * 	  @return	string     		Label
+	 *  @param  int		$mode       0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 * 	@return	string     			Label
 	 */
 	public function getLibStatut($mode = 0)
 	{
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 677b7c1017a..34eaf847f2c 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -900,7 +900,7 @@ abstract class CommonInvoice extends CommonObject
 		dol_syslog(get_class($this)."::makeStripeSepaRequest start", LOG_DEBUG);
 
 		if ($this->statut > self::STATUS_DRAFT && $this->paye == 0) {
-			// Get the default payment mode for BAN payment
+			// Get the default payment mode for BAN payment of the third party
 			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$bac = new CompanyBankAccount($this->db);	// table societe_rib
 			$result = $bac->fetch(0, $this->socid, 1, 'ban');
@@ -974,295 +974,307 @@ abstract class CommonInvoice extends CommonObject
 						$amountstripe = $amountstripe * 100;
 					}
 
+					$fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');
+					if (!($fk_bank_account > 0)) {
+						$error++;
+						$errorforinvoice++;
+						dol_syslog("Error no bank account defined for Stripe payments", LOG_ERR);
+						$this->errors[] = "Error bank account for Stripe payments not defined into Stripe module";
+					}
+
 					$this->db->begin();
 
 					// Create a prelevement_bon
 					$bon = new BonPrelevement($this->db);
-					if (empty($obj->fk_prelevement_bons)) {
-						// This create record into llx_prelevment_bons and update link with llx_prelevement_demande
-						$nbinvoices = $bon->create(0, 0, 'real', 'ALL', '', 0, 'direct-debit', $did);
-						if ($nbinvoices <= 0) {
+					if (!$error) {
+						if (empty($obj->fk_prelevement_bons)) {
+							// This create record into llx_prelevment_bons and update link with llx_prelevement_demande
+							$nbinvoices = $bon->create(0, 0, 'real', 'ALL', '', 0, 'direct-debit', $did, $fk_bank_account);
+							if ($nbinvoices <= 0) {
+								$error++;
+								$errorforinvoice++;
+								dol_syslog("Error on BonPrelevement creation", LOG_ERR);
+								$this->errors[] = "Error on BonPrelevement creation";
+							}
+							/*
+							if (!$error) {
+								// Update the direct debit payment request of the processed request to save the id of the prelevement_bon
+								$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";
+								$sql .= " fk_prelevement_bons = ".((int) $bon->id);
+								$sql .= " WHERE rowid = ".((int) $did);
+
+								$result = $this->db->query($sql);
+								if ($result < 0) {
+									$error++;
+									$this->errors[] = "Error on updateing fk_prelevement_bons to ".$bon->id;
+								}
+							}
+							*/
+						} else {
 							$error++;
 							$errorforinvoice++;
-							dol_syslog("Error on BonPrelevement creation", LOG_ERR);
-							$this->errors[] = "Error on BonPrelevement creation";
+							dol_syslog("Error Line already part of a bank payment order", LOG_ERR);
+							$this->errors[] = "The line is already included into a bank payment order. Delete the bank payment order first.";
 						}
-						/*
-						if (!$error) {
-							// Update the direct debit payment request of the processed request to save the id of the prelevement_bon
-							$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_demande SET";
-							$sql .= " fk_prelevement_bons = ".((int) $bon->id);
-							$sql .= " WHERE rowid = ".((int) $did);
-
-							$result = $this->db->query($sql);
-							if ($result < 0) {
-								$error++;
-								$this->errors[] = "Error on updateing fk_prelevement_bons to ".$bon->id;
-							}
-						}
-						*/
-					} else {
-						$error++;
-						$errorforinvoice++;
-						dol_syslog("Error Line already part of a bank payment order", LOG_ERR);
-						$this->errors[] = "The line is already included into a bank payment order. Delete the bank payment order first.";
 					}
 
-					if (!$error && $amountstripe > 0) {
-						try {
-							//var_dump($companypaymentmode);
-							dol_syslog("We will try to pay with companypaymentmodeid=" . $companypaymentmode->id . " stripe_card_ref=" . $companypaymentmode->stripe_card_ref . " mode=" . $companypaymentmode->status, LOG_DEBUG);
+					if (!$error) {
+						if ($amountstripe > 0) {
+							try {
+								//var_dump($companypaymentmode);
+								dol_syslog("We will try to pay with companypaymentmodeid=" . $companypaymentmode->id . " stripe_card_ref=" . $companypaymentmode->stripe_card_ref . " mode=" . $companypaymentmode->status, LOG_DEBUG);
 
-							$thirdparty = new Societe($this->db);
-							$resultthirdparty = $thirdparty->fetch($this->socid);
+								$thirdparty = new Societe($this->db);
+								$resultthirdparty = $thirdparty->fetch($this->socid);
 
-							include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php';        // This include the include of htdocs/stripe/config.php
-							// So it inits or erases the $stripearrayofkeysbyenv
-							$stripe = new Stripe($this->db);
+								include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php';        // This include the include of htdocs/stripe/config.php
+								// So it inits or erases the $stripearrayofkeysbyenv
+								$stripe = new Stripe($this->db);
 
-							dol_syslog("makeStripeSepaRequest Current Stripe environment is " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']);
+								dol_syslog("makeStripeSepaRequest Current Stripe environment is " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key']);
 
-							$stripearrayofkeys = $stripearrayofkeysbyenv[$servicestatus];
-							\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
+								$stripearrayofkeys = $stripearrayofkeysbyenv[$servicestatus];
+								\Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 
 
-							dol_syslog("makeStripeSepaRequest get stripe connet account", LOG_DEBUG);
-							$stripeacc = $stripe->getStripeAccount($service, $this->socid);								// Get Stripe OAuth connect account if it exists (no network access here)
-							dol_syslog("makeStripeSepaRequest get stripe connect account return " . json_encode($stripeacc), LOG_DEBUG);
+								dol_syslog("makeStripeSepaRequest get stripe connet account", LOG_DEBUG);
+								$stripeacc = $stripe->getStripeAccount($service, $this->socid);								// Get Stripe OAuth connect account if it exists (no network access here)
+								dol_syslog("makeStripeSepaRequest get stripe connect account return " . json_encode($stripeacc), LOG_DEBUG);
 
-							$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0);
-							if (empty($customer) && !empty($stripe->error)) {
-								$this->errors[] = $stripe->error;
-							}
+								$customer = $stripe->customerStripe($thirdparty, $stripeacc, $servicestatus, 0);
+								if (empty($customer) && !empty($stripe->error)) {
+									$this->errors[] = $stripe->error;
+								}
 
-							// $nbhoursbetweentries = (empty($conf->global->SELLYOURSAAS_NBHOURSBETWEENTRIES) ? 49 : $conf->global->SELLYOURSAAS_NBHOURSBETWEENTRIES);				// Must have more that 48 hours + 1 between each try (so 1 try every 3 daily batch)
-							// $nbdaysbeforeendoftries = (empty($conf->global->SELLYOURSAAS_NBDAYSBEFOREENDOFTRIES) ? 35 : $conf->global->SELLYOURSAAS_NBDAYSBEFOREENDOFTRIES);
-							$postactionmessages = [];
+								// $nbhoursbetweentries = (empty($conf->global->SELLYOURSAAS_NBHOURSBETWEENTRIES) ? 49 : $conf->global->SELLYOURSAAS_NBHOURSBETWEENTRIES);				// Must have more that 48 hours + 1 between each try (so 1 try every 3 daily batch)
+								// $nbdaysbeforeendoftries = (empty($conf->global->SELLYOURSAAS_NBDAYSBEFOREENDOFTRIES) ? 35 : $conf->global->SELLYOURSAAS_NBDAYSBEFOREENDOFTRIES);
+								$postactionmessages = [];
 
-							if ($resultthirdparty > 0 && !empty($customer)) {
-								if (!$error) {	// Payment was not canceled
-									$sepaMode = false;
-									$stripecard = null;
-									if ($companypaymentmode->type == 'ban') {
-										$sepaMode = true;
-										// Check into societe_rib if a payment mode for Stripe and ban payment exists
-										// To make a Stripe SEPA payment request, we must have the payment mode source already saved into societe_rib and retreived with ->sepaStripe
-										// The payment mode source is created when we create the bank account on Stripe with paymentmodes.php?action=create
-										$stripecard = $stripe->sepaStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
-									}
-
-									if ($stripecard) {  // Can be src_... (for sepa) or pm_... (new card mode). Note that card_... (old card mode) should not happen here.
-										$FULLTAG = 'DID='.$did.'-INV=' . $this->id . '-CUS=' . $thirdparty->id;
-										$description = 'Stripe payment from makeStripeSepaRequest: ' . $FULLTAG . ' did='.$did.' ref=' . $this->ref;
-
-										$stripefailurecode = '';
-										$stripefailuremessage = '';
-										$stripefailuredeclinecode = '';
-
-										// Using new SCA method
-										dol_syslog("* Create payment on SEPA " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
-
-										// Create payment intent and charge payment (confirmnow = true)
-										$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $this, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1, 1, $did);
-
-										$charge = new stdClass();
-
-										if ($paymentintent->status === 'succeeded' || $paymentintent->status === 'processing') {
-											$charge->status = 'ok';
-											$charge->id = $paymentintent->id;
-											$charge->customer = $customer->id;
-										} elseif ($paymentintent->status === 'requires_action') {
-											//paymentintent->status may be => 'requires_action' (no error in such a case)
-											dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
-
-											$charge->status = 'failed';
-											$charge->customer = $customer->id;
-											$charge->failure_code = $stripe->code;
-											$charge->failure_message = $stripe->error;
-											$charge->failure_declinecode = $stripe->declinecode;
-											$stripefailurecode = $stripe->code;
-											$stripefailuremessage = 'Action required. Contact the support at ';// . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
-											$stripefailuredeclinecode = $stripe->declinecode;
-										} else {
-											dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
-
-											$charge->status = 'failed';
-											$charge->customer = $customer->id;
-											$charge->failure_code = $stripe->code;
-											$charge->failure_message = $stripe->error;
-											$charge->failure_declinecode = $stripe->declinecode;
-											$stripefailurecode = $stripe->code;
-											$stripefailuremessage = $stripe->error;
-											$stripefailuredeclinecode = $stripe->declinecode;
+								if ($resultthirdparty > 0 && !empty($customer)) {
+									if (!$error) {	// Payment was not canceled
+										$sepaMode = false;
+										$stripecard = null;
+										if ($companypaymentmode->type == 'ban') {
+											$sepaMode = true;
+											// Check into societe_rib if a payment mode for Stripe and ban payment exists
+											// To make a Stripe SEPA payment request, we must have the payment mode source already saved into societe_rib and retreived with ->sepaStripe
+											// The payment mode source is created when we create the bank account on Stripe with paymentmodes.php?action=create
+											$stripecard = $stripe->sepaStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
 										}
 
-										//var_dump("stripefailurecode=".$stripefailurecode." stripefailuremessage=".$stripefailuremessage." stripefailuredeclinecode=".$stripefailuredeclinecode);
-										//exit;
+										if ($stripecard) {  // Can be src_... (for sepa) or pm_... (new card mode). Note that card_... (old card mode) should not happen here.
+											$FULLTAG = 'DID='.$did.'-INV=' . $this->id . '-CUS=' . $thirdparty->id;
+											$description = 'Stripe payment from makeStripeSepaRequest: ' . $FULLTAG . ' did='.$did.' ref=' . $this->ref;
 
+											$stripefailurecode = '';
+											$stripefailuremessage = '';
+											$stripefailuredeclinecode = '';
 
-										// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
-										if (empty($charge) || $charge->status == 'failed') {
-											dol_syslog('Failed to charge payment mode ' . $stripecard->id . ' stripefailurecode=' . $stripefailurecode . ' stripefailuremessage=' . $stripefailuremessage . ' stripefailuredeclinecode=' . $stripefailuredeclinecode, LOG_WARNING);
+											// Using new SCA method
+											dol_syslog("* Create payment on SEPA " . $stripecard->id . ", amounttopay=" . $amounttopay . ", amountstripe=" . $amountstripe . ", FULLTAG=" . $FULLTAG, LOG_DEBUG);
 
-											// Save a stripe payment was in error
-											$this->stripechargeerror++;
+											// Create payment intent and charge payment (confirmnow = true)
+											$paymentintent = $stripe->getPaymentIntent($amounttopay, $currency, $FULLTAG, $description, $this, $customer->id, $stripeacc, $servicestatus, 0, 'automatic', true, $stripecard->id, 1, 1, $did);
 
-											$error++;
-											$errorforinvoice++;
-											$errmsg = $langs->trans("FailedToChargeCard");
-											if (!empty($charge)) {
-												if ($stripefailuredeclinecode == 'authentication_required') {
-													$errauthenticationmessage = $langs->trans("ErrSCAAuthentication");
-													$errmsg = $errauthenticationmessage;
-												} elseif (in_array($stripefailuredeclinecode, ['insufficient_funds', 'generic_decline'])) {
-													$errmsg .= ': ' . $charge->failure_code;
-													$errmsg .= ($charge->failure_message ? ' - ' : '') . ' ' . $charge->failure_message;
-													if (empty($stripefailurecode)) {
-														$stripefailurecode = $charge->failure_code;
-													}
-													if (empty($stripefailuremessage)) {
-														$stripefailuremessage = $charge->failure_message;
-													}
-												} else {
-													$errmsg .= ': failure_code=' . $charge->failure_code;
-													$errmsg .= ($charge->failure_message ? ' - ' : '') . ' failure_message=' . $charge->failure_message;
-													if (empty($stripefailurecode)) {
-														$stripefailurecode = $charge->failure_code;
-													}
-													if (empty($stripefailuremessage)) {
-														$stripefailuremessage = $charge->failure_message;
-													}
-												}
+											$charge = new stdClass();
+
+											if ($paymentintent->status === 'succeeded' || $paymentintent->status === 'processing') {
+												$charge->status = 'ok';
+												$charge->id = $paymentintent->id;
+												$charge->customer = $customer->id;
+											} elseif ($paymentintent->status === 'requires_action') {
+												//paymentintent->status may be => 'requires_action' (no error in such a case)
+												dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
+
+												$charge->status = 'failed';
+												$charge->customer = $customer->id;
+												$charge->failure_code = $stripe->code;
+												$charge->failure_message = $stripe->error;
+												$charge->failure_declinecode = $stripe->declinecode;
+												$stripefailurecode = $stripe->code;
+												$stripefailuremessage = 'Action required. Contact the support at ';// . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
+												$stripefailuredeclinecode = $stripe->declinecode;
 											} else {
-												$errmsg .= ': ' . $stripefailurecode . ' - ' . $stripefailuremessage;
-												$errmsg .= ($stripefailuredeclinecode ? ' - ' . $stripefailuredeclinecode : '');
+												dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
+
+												$charge->status = 'failed';
+												$charge->customer = $customer->id;
+												$charge->failure_code = $stripe->code;
+												$charge->failure_message = $stripe->error;
+												$charge->failure_declinecode = $stripe->declinecode;
+												$stripefailurecode = $stripe->code;
+												$stripefailuremessage = $stripe->error;
+												$stripefailuredeclinecode = $stripe->declinecode;
 											}
 
-											$description = 'Stripe payment ERROR from makeStripeSepaRequest: ' . $FULLTAG;
-											$postactionmessages[] = $errmsg . ' (' . $stripearrayofkeys['publishable_key'] . ')';
-											$this->errors[] = $errmsg;
+											//var_dump("stripefailurecode=".$stripefailurecode." stripefailuremessage=".$stripefailuremessage." stripefailuredeclinecode=".$stripefailuredeclinecode);
+											//exit;
+
+
+											// Return $charge = array('id'=>'ch_XXXX', 'status'=>'succeeded|pending|failed', 'failure_code'=>, 'failure_message'=>...)
+											if (empty($charge) || $charge->status == 'failed') {
+												dol_syslog('Failed to charge payment mode ' . $stripecard->id . ' stripefailurecode=' . $stripefailurecode . ' stripefailuremessage=' . $stripefailuremessage . ' stripefailuredeclinecode=' . $stripefailuredeclinecode, LOG_WARNING);
+
+												// Save a stripe payment was in error
+												$this->stripechargeerror++;
+
+												$error++;
+												$errorforinvoice++;
+												$errmsg = $langs->trans("FailedToChargeCard");
+												if (!empty($charge)) {
+													if ($stripefailuredeclinecode == 'authentication_required') {
+														$errauthenticationmessage = $langs->trans("ErrSCAAuthentication");
+														$errmsg = $errauthenticationmessage;
+													} elseif (in_array($stripefailuredeclinecode, ['insufficient_funds', 'generic_decline'])) {
+														$errmsg .= ': ' . $charge->failure_code;
+														$errmsg .= ($charge->failure_message ? ' - ' : '') . ' ' . $charge->failure_message;
+														if (empty($stripefailurecode)) {
+															$stripefailurecode = $charge->failure_code;
+														}
+														if (empty($stripefailuremessage)) {
+															$stripefailuremessage = $charge->failure_message;
+														}
+													} else {
+														$errmsg .= ': failure_code=' . $charge->failure_code;
+														$errmsg .= ($charge->failure_message ? ' - ' : '') . ' failure_message=' . $charge->failure_message;
+														if (empty($stripefailurecode)) {
+															$stripefailurecode = $charge->failure_code;
+														}
+														if (empty($stripefailuremessage)) {
+															$stripefailuremessage = $charge->failure_message;
+														}
+													}
+												} else {
+													$errmsg .= ': ' . $stripefailurecode . ' - ' . $stripefailuremessage;
+													$errmsg .= ($stripefailuredeclinecode ? ' - ' . $stripefailuredeclinecode : '');
+												}
+
+												$description = 'Stripe payment ERROR from makeStripeSepaRequest: ' . $FULLTAG;
+												$postactionmessages[] = $errmsg . ' (' . $stripearrayofkeys['publishable_key'] . ')';
+												$this->errors[] = $errmsg;
+											} else {
+												dol_syslog('Successfuly request direct debit ' . $stripecard->id);
+
+												$postactionmessages[] = 'Success to request direct debit (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
+
+												// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments
+												// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.
+												$this->stripechargedone++;
+
+												// Default description used for label of event. Will be overwrite by another value later.
+												$description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
+											}
+
+											$object = $this;
+
+											// Track an event
+											if (empty($charge) || $charge->status == 'failed') {
+												$actioncode = 'PAYMENT_STRIPE_KO';
+												$extraparams = $stripefailurecode;
+												$extraparams .= (($extraparams && $stripefailuremessage) ? ' - ' : '') . $stripefailuremessage;
+												$extraparams .= (($extraparams && $stripefailuredeclinecode) ? ' - ' : '') . $stripefailuredeclinecode;
+											} else {
+												$actioncode = 'PAYMENT_STRIPE_OK';
+												$extraparams = '';
+											}
 										} else {
-											dol_syslog('Successfuly request direct debit ' . $stripecard->id);
+											$error++;
+											$errorforinvoice++;
+											dol_syslog("No direct debit payment method found for this stripe customer " . $customer->id, LOG_WARNING);
+											$this->errors[] = 'Failed to get direct debit payment method for stripe customer = ' . $customer->id;
 
-											$postactionmessages[] = 'Success to request direct debit (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
+											$description = 'Failed to find or use the payment mode - no credit card defined for the customer account';
+											$stripefailurecode = 'BADPAYMENTMODE';
+											$stripefailuremessage = 'Failed to find or use the payment mode - no credit card defined for the customer account';
+											$postactionmessages[] = $description . ' (' . $stripearrayofkeys['publishable_key'] . ')';
 
-											// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments
-											// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.
-											$this->stripechargedone++;
+											$object = $this;
 
-											// Default description used for label of event. Will be overwrite by another value later.
-											$description = 'Stripe payment request OK (' . $charge->id . ') from makeStripeSepaRequest: ' . $FULLTAG;
-										}
-
-										$object = $this;
-
-										// Track an event
-										if (empty($charge) || $charge->status == 'failed') {
 											$actioncode = 'PAYMENT_STRIPE_KO';
-											$extraparams = $stripefailurecode;
-											$extraparams .= (($extraparams && $stripefailuremessage) ? ' - ' : '') . $stripefailuremessage;
-											$extraparams .= (($extraparams && $stripefailuredeclinecode) ? ' - ' : '') . $stripefailuredeclinecode;
-										} else {
-											$actioncode = 'PAYMENT_STRIPE_OK';
 											$extraparams = '';
 										}
 									} else {
-										$error++;
-										$errorforinvoice++;
-										dol_syslog("No direct debit payment method found for this stripe customer " . $customer->id, LOG_WARNING);
-										$this->errors[] = 'Failed to get direct debit payment method for stripe customer = ' . $customer->id;
-
-										$description = 'Failed to find or use the payment mode - no credit card defined for the customer account';
-										$stripefailurecode = 'BADPAYMENTMODE';
-										$stripefailuremessage = 'Failed to find or use the payment mode - no credit card defined for the customer account';
-										$postactionmessages[] = $description . ' (' . $stripearrayofkeys['publishable_key'] . ')';
+										// If error because payment was canceled for a logical reason, we do nothing (no event added)
+										$description = '';
+										$stripefailurecode = '';
+										$stripefailuremessage = '';
 
 										$object = $this;
 
-										$actioncode = 'PAYMENT_STRIPE_KO';
+										$actioncode = '';
 										$extraparams = '';
 									}
-								} else {
-									// If error because payment was canceled for a logical reason, we do nothing (no event added)
-									$description = '';
-									$stripefailurecode = '';
-									$stripefailuremessage = '';
+								} else {	// Else of the   if ($resultthirdparty > 0 && ! empty($customer)) {
+									if ($resultthirdparty <= 0) {
+										dol_syslog('SellYourSaasUtils Failed to load customer for thirdparty_id = ' . $thirdparty->id, LOG_WARNING);
+										$this->errors[] = 'Failed to load customer for thirdparty_id = ' . $thirdparty->id;
+									} else { // $customer stripe not found
+										dol_syslog('SellYourSaasUtils Failed to get Stripe customer id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'], LOG_WARNING);
+										$this->errors[] = 'Failed to get Stripe customer id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'];
+									}
+									$error++;
+									$errorforinvoice++;
+
+									$description = 'Failed to find or use your payment mode (no payment mode for this customer id)';
+									$stripefailurecode = 'BADPAYMENTMODE';
+									$stripefailuremessage = 'Failed to find or use your payment mode (no payment mode for this customer id)';
+									$postactionmessages = [];
 
 									$object = $this;
 
-									$actioncode = '';
+									$actioncode = 'PAYMENT_STRIPE_KO';
 									$extraparams = '';
 								}
-							} else {	// Else of the   if ($resultthirdparty > 0 && ! empty($customer)) {
-								if ($resultthirdparty <= 0) {
-									dol_syslog('SellYourSaasUtils Failed to load customer for thirdparty_id = ' . $thirdparty->id, LOG_WARNING);
-									$this->errors[] = 'Failed to load customer for thirdparty_id = ' . $thirdparty->id;
-								} else { // $customer stripe not found
-									dol_syslog('SellYourSaasUtils Failed to get Stripe customer id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'], LOG_WARNING);
-									$this->errors[] = 'Failed to get Stripe customer id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'];
+
+								if ($description) {
+									dol_syslog("* Record event for credit transfer or direct debit request result - " . $description);
+									require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+									// Insert record of payment (success or error)
+									$actioncomm = new ActionComm($this->db);
+
+									$actioncomm->type_code = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+									$actioncomm->code = 'AC_' . $actioncode;
+									$actioncomm->label = $description;
+									$actioncomm->note_private = join(",\n", $postactionmessages);
+									$actioncomm->fk_project = $this->fk_project;
+									$actioncomm->datep = $now;
+									$actioncomm->datef = $now;
+									$actioncomm->percentage = -1;   // Not applicable
+									$actioncomm->socid = $thirdparty->id;
+									$actioncomm->contactid = 0;
+									$actioncomm->authorid = $user->id;   // User saving action
+									$actioncomm->userownerid = $user->id;	// Owner of action
+									// Fields when action is a real email (content is already into note)
+									/*$actioncomm->email_msgid = $object->email_msgid;
+									 $actioncomm->email_from  = $object->email_from;
+									 $actioncomm->email_sender= $object->email_sender;
+									 $actioncomm->email_to    = $object->email_to;
+									 $actioncomm->email_tocc  = $object->email_tocc;
+									 $actioncomm->email_tobcc = $object->email_tobcc;
+									 $actioncomm->email_subject = $object->email_subject;
+									 $actioncomm->errors_to   = $object->errors_to;*/
+									$actioncomm->fk_element = $this->id;
+									$actioncomm->elementtype = $this->element;
+									$actioncomm->extraparams = dol_trunc($extraparams, 250);
+
+									$actioncomm->create($user);
 								}
+
+								$this->description = $description;
+								$this->postactionmessages = $postactionmessages;
+							} catch (Exception $e) {
 								$error++;
 								$errorforinvoice++;
-
-								$description = 'Failed to find or use your payment mode (no payment mode for this customer id)';
-								$stripefailurecode = 'BADPAYMENTMODE';
-								$stripefailuremessage = 'Failed to find or use your payment mode (no payment mode for this customer id)';
-								$postactionmessages = [];
-
-								$object = $this;
-
-								$actioncode = 'PAYMENT_STRIPE_KO';
-								$extraparams = '';
+								dol_syslog('Error ' . $e->getMessage(), LOG_ERR);
+								$this->errors[] = 'Error ' . $e->getMessage();
 							}
-
-							if ($description) {
-								dol_syslog("* Record event for credit transfer or direct debit request result - " . $description);
-								require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-
-								// Insert record of payment (success or error)
-								$actioncomm = new ActionComm($this->db);
-
-								$actioncomm->type_code = 'AC_OTH_AUTO';		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-								$actioncomm->code = 'AC_' . $actioncode;
-								$actioncomm->label = $description;
-								$actioncomm->note_private = join(",\n", $postactionmessages);
-								$actioncomm->fk_project = $this->fk_project;
-								$actioncomm->datep = $now;
-								$actioncomm->datef = $now;
-								$actioncomm->percentage = -1;   // Not applicable
-								$actioncomm->socid = $thirdparty->id;
-								$actioncomm->contactid = 0;
-								$actioncomm->authorid = $user->id;   // User saving action
-								$actioncomm->userownerid = $user->id;	// Owner of action
-								// Fields when action is a real email (content is already into note)
-								/*$actioncomm->email_msgid = $object->email_msgid;
-								 $actioncomm->email_from  = $object->email_from;
-								 $actioncomm->email_sender= $object->email_sender;
-								 $actioncomm->email_to    = $object->email_to;
-								 $actioncomm->email_tocc  = $object->email_tocc;
-								 $actioncomm->email_tobcc = $object->email_tobcc;
-								 $actioncomm->email_subject = $object->email_subject;
-								 $actioncomm->errors_to   = $object->errors_to;*/
-								$actioncomm->fk_element = $this->id;
-								$actioncomm->elementtype = $this->element;
-								$actioncomm->extraparams = dol_trunc($extraparams, 250);
-
-								$actioncomm->create($user);
-							}
-
-							$this->description = $description;
-							$this->postactionmessages = $postactionmessages;
-						} catch (Exception $e) {
+						} else {	// If remain to pay is null
 							$error++;
 							$errorforinvoice++;
-							dol_syslog('Error ' . $e->getMessage(), LOG_ERR);
-							$this->errors[] = 'Error ' . $e->getMessage();
+							dol_syslog("Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?", LOG_WARNING);
+							$this->errors[] = "Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?";
 						}
-					} else {	// If remain to pay is null
-						$error++;
-						$errorforinvoice++;
-						dol_syslog("Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?", LOG_WARNING);
-						$this->errors[] = "Remain to pay is null for the invoice " . $this->id . " " . $this->ref . ". Why is the invoice not classified 'Paid' ?";
 					}
 
 					// Set status of the order to "Transferred" with method 'api'

From 848e9df241705be65288ff17d677be225404d555 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 16:09:52 +0100
Subject: [PATCH 167/300] Debug v18

---
 htdocs/compta/prelevement/card.php        | 13 +++++++------
 htdocs/compta/prelevement/factures.php    |  9 ++++++++-
 htdocs/compta/prelevement/fiche-rejet.php |  9 ++++++++-
 htdocs/compta/prelevement/fiche-stat.php  |  9 ++++++++-
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 675aeb965e7..7642898b952 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -210,12 +210,13 @@ if ($id > 0 || $ref) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-	if ($object->fk_bank_account > 0) {
-		$acc = new Account($db);
-		$result = $acc->fetch($object->fk_bank_account);
-	} else {	// For backward compatibility
-		$acc = new Account($db);
-		$fk_bank_account = ($object->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+	// Get bank account for the payment
+	$acc = new Account($db);
+	$fk_bank_account = $object->fk_bank_account;
+	if (empty($fk_bank_account)) {
+		$fk_bank_account = ($object->type == 'bank-transfer' ? getDolGlobalInt('PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT') : getDolGlobalInt('PRELEVEMENT_ID_BANKACCOUNT'));
+	}
+	if ($fk_bank_account > 0) {
 		$result = $acc->fetch($fk_bank_account);
 	}
 
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index cc416d7d530..6b7c1aca8e9 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -129,8 +129,15 @@ if ($id > 0 || $ref) {
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent tableforfield">';
 
+		// Get bank account for the payment
 		$acc = new Account($db);
-		$result = $acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+		$fk_bank_account = $object->fk_bank_account;
+		if (empty($fk_bank_account)) {
+			$fk_bank_account = ($object->type == 'bank-transfer' ? getDolGlobalInt('PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT') : getDolGlobalInt('PRELEVEMENT_ID_BANKACCOUNT'));
+		}
+		if ($fk_bank_account > 0) {
+			$result = $acc->fetch($fk_bank_account);
+		}
 
 		print '<tr><td class="titlefieldcreate">';
 		$labelofbankfield = "BankToReceiveWithdraw";
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index de9eb46631c..a14038e3d93 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -124,8 +124,15 @@ if ($id > 0 || $ref) {
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent tableforfield">';
 
+		// Get bank account for the payment
 		$acc = new Account($db);
-		$result = $acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+		$fk_bank_account = $object->fk_bank_account;
+		if (empty($fk_bank_account)) {
+			$fk_bank_account = ($object->type == 'bank-transfer' ? getDolGlobalInt('PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT') : getDolGlobalInt('PRELEVEMENT_ID_BANKACCOUNT'));
+		}
+		if ($fk_bank_account > 0) {
+			$result = $acc->fetch($fk_bank_account);
+		}
 
 		print '<tr><td class="titlefieldcreate">';
 		$labelofbankfield = "BankToReceiveWithdraw";
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 3b15676792e..8898ebafd65 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -118,8 +118,15 @@ if ($id > 0 || $ref) {
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border centpercent tableforfield">';
 
+		// Get bank account for the payment
 		$acc = new Account($db);
-		$result = $acc->fetch($conf->global->PRELEVEMENT_ID_BANKACCOUNT);
+		$fk_bank_account = $object->fk_bank_account;
+		if (empty($fk_bank_account)) {
+			$fk_bank_account = ($object->type == 'bank-transfer' ? getDolGlobalInt('PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT') : getDolGlobalInt('PRELEVEMENT_ID_BANKACCOUNT'));
+		}
+		if ($fk_bank_account > 0) {
+			$result = $acc->fetch($fk_bank_account);
+		}
 
 		print '<tr><td class="titlefieldcreate">';
 		$labelofbankfield = "BankToReceiveWithdraw";

From c7f666e03851c2d6c1b00bb0987336f8fb12a7a8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 17:26:03 +0100
Subject: [PATCH 168/300] Doc

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 189bcd41004..59281317804 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -211,6 +211,8 @@ Following changes may create regressions for some external modules, but were nec
 * Rename the substitution for "project label" instead of "project title" in substitution variables
 * You must use "$objectoffield" to manipulate the current object inside the formulare of computed custom extrafields instead of $obj/$object.
 * Making a global search is sending the parameter using always the name search_all (instead of sometimes sall and search_all)
+* The property $url_last_version must be public if defined into module descriptor files;
+
 
 ***** ChangeLog for 16.0.4 compared to 16.0.3 *****
 

From eb16050918fa929d6d8865414b132532fb8fc235 Mon Sep 17 00:00:00 2001
From: Anthony Berton <anthony.berton@bb2a.fr>
Date: Mon, 27 Feb 2023 17:26:21 +0100
Subject: [PATCH 169/300] FIX - php8 warnning localtaxes_type

---
 htdocs/comm/propal/class/propal.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 46f06614941..5b382a4cb62 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -917,8 +917,8 @@ class Propal extends CommonObject
 			$this->line->tva_tx = $txtva;
 			$this->line->localtax1_tx		= $txlocaltax1;
 			$this->line->localtax2_tx		= $txlocaltax2;
-			$this->line->localtax1_type		= $localtaxes_type[0];
-			$this->line->localtax2_type		= $localtaxes_type[2];
+			$this->line->localtax1_type 	= empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
+			$this->line->localtax2_type 	= empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 			$this->line->remise_percent		= $remise_percent;
 			$this->line->subprice			= $pu_ht;
 			$this->line->info_bits			= $info_bits;

From 4bf7c6f84ce8587a657531de0f7ffca3f92b4fa4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 20:03:50 +0100
Subject: [PATCH 170/300] NEW Can modify bank account of sepa payment (if file
 not sent yet)

---
 htdocs/compta/prelevement/card.php            |  83 +++++++++-----
 .../class/bonprelevement.class.php            | 104 +++++++++++++++---
 htdocs/compta/prelevement/factures.php        |   5 +-
 htdocs/compta/prelevement/fiche-rejet.php     |   5 +-
 htdocs/compta/prelevement/fiche-stat.php      |   5 +-
 htdocs/core/class/html.form.class.php         |   6 +-
 6 files changed, 161 insertions(+), 47 deletions(-)

diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 7642898b952..727b3b85f48 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -71,11 +71,22 @@ $type = $object->type;
 
 if ($type == 'bank-transfer') {
 	$result = restrictedArea($user, 'paymentbybanktransfer', '', '', '');
+
+	$permissiontoadd = $user->hasRight('paymentbybanktransfer', 'read');
+	$permissiontosend = $user->hasRight('paymentbybanktransfer', 'send');
+	$permissiontocreditdebit = $user->hasRight('paymentbybanktransfer', 'debit');
+	$permissiontodelete = $user->hasRight('paymentbybanktransfer', 'read');
 } else {
 	$result = restrictedArea($user, 'prelevement', '', '', 'bons');
+
+	$permissiontoadd = $user->hasRight('prelevement', 'bons', 'read');
+	$permissiontosend = $user->hasRight('prelevement', 'bons', 'send');
+	$permissiontocreditdebit = $user->hasRight('prelevement', 'bons', 'credit');
+	$permissiontodelete = $user->hasRight('prelevement', 'bons', 'read');
 }
 
 
+
 /*
  * Actions
  */
@@ -87,20 +98,13 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if ($action == 'confirm_delete') {
-		$savtype = $object->type;
-		$res = $object->delete($user);
-		if ($res > 0) {
-			if ($savtype == 'bank-transfer') {
-				header("Location: ".DOL_URL_ROOT.'/compta/paymentbybanktransfer/index.php');
-			} else {
-				header("Location: ".DOL_URL_ROOT.'/compta/prelevement/index.php');
-			}
-			exit;
-		}
+	if ($action == 'setbankaccount' && $permissiontoadd) {
+		$object->oldcopy = dol_clone($object);
+		$object->fk_bank_account = GETPOST('fk_bank_account', 'int');
+		$object->update($user);
 	}
 
-	if ($action == 'infotrans' && (($user->rights->prelevement->bons->send && $object->type != 'bank-transfer') || ($user->rights->paymentbybanktransfer->send && $object->type == 'bank-transfer'))) {
+	if ($action == 'infotrans' && $permissiontosend) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
@@ -133,7 +137,7 @@ if (empty($reshook)) {
 	}
 
 	// Set direct debit order to credited, create payment and close invoices
-	if ($action == 'infocredit' && (($user->rights->prelevement->bons->credit && $object->type != 'bank-transfer') || ($user->rights->paymentbybanktransfer->debit && $object->type == 'bank-transfer'))) {
+	if ($action == 'infocredit' && $permissiontocreditdebit) {
 		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 		if (($object->type != 'bank-transfer' && $object->statut == BonPrelevement::STATUS_CREDITED) || ($object->type == 'bank-transfer' && $object->statut == BonPrelevement::STATUS_DEBITED)) {
@@ -147,6 +151,19 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
+
+	if ($action == 'confirm_delete' && $permissiontodelete) {
+		$savtype = $object->type;
+		$res = $object->delete($user);
+		if ($res > 0) {
+			if ($savtype == 'bank-transfer') {
+				header("Location: ".DOL_URL_ROOT.'/compta/paymentbybanktransfer/index.php');
+			} else {
+				header("Location: ".DOL_URL_ROOT.'/compta/prelevement/index.php');
+			}
+			exit;
+		}
+	}
 }
 
 
@@ -179,13 +196,6 @@ if ($id > 0 || $ref) {
 
 	print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
 
-	// Status
-	/*
-	print '<tr><td>'.$langs->trans('Status').'</td>';
-	print '<td>'.$object->getLibStatut(1).'</td>';
-	print '</tr>';
-	*/
-
 	if (!empty($object->date_trans)) {
 		$muser = new User($db);
 		$muser->fetch($object->user_trans);
@@ -220,20 +230,43 @@ if ($id > 0 || $ref) {
 		$result = $acc->fetch($fk_bank_account);
 	}
 
-	print '<tr><td class="titlefieldcreate">';
+	// Bank account
 	$labelofbankfield = "BankToReceiveWithdraw";
 	if ($object->type == 'bank-transfer') {
 		$labelofbankfield = 'BankToPayCreditTransfer';
 	}
-	print $langs->trans($labelofbankfield);
+	//print $langs->trans($labelofbankfield);
+	$caneditbank = $permissiontoadd;
+	if ($object->status != $object::STATUS_DRAFT) {
+		$caneditbank = 0;
+	}
+	/*
+	print '<tr><td class="titlefieldcreate">';
+	print $form->editfieldkey($langs->trans($labelofbankfield), 'fk_bank_account', $acc->id, $object, $caneditbank);
 	print '</td>';
 	print '<td>';
-	if ($acc->id > 0) {
-		print $acc->getNomUrl(1);
-	}
+	print $form->editfieldval($langs->trans($labelofbankfield), 'fk_bank_account', $acc->id, $acc, $caneditbank, 'string', '', null, null, '', 1, 'getNomUrl');
 	print '</td>';
 	print '</tr>';
+	*/
+	print '<tr><td class="nowrap">';
+	print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
+	print $form->textwithpicto($langs->trans("BankAccount"), $langs->trans($labelofbankfield));
+	print '<td>';
+	if (($action != 'editbankaccount') && $caneditbank) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editfkbankaccount&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+	}
+	print '</tr></table>';
+	print '</td><td>';
+	if ($action == 'editfkbankaccount') {
+		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $fk_bank_account, 'fk_bank_account', 0);
+	} else {
+		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $fk_bank_account, 'none');
+	}
+	print "</td>";
+	print '</tr>';
 
+	// Donwload file
 	print '<tr><td class="titlefieldcreate">';
 	$labelfororderfield = 'WithdrawalFile';
 	if ($object->type == 'bank-transfer') {
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 64f359e4f7a..7d7127fc6ba 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -70,13 +70,11 @@ class BonPrelevement extends CommonObject
 	public $emetteur_bic;
 	public $emetteur_ics;
 
-	public $date_trans;
 	public $user_trans;
-	public $method_trans;
+	public $user_credit;
 
 	public $total;
 	public $fetched;
-	public $statut; // 0-Wait, 1-Trans, 2-Done
 	public $labelStatus = array();
 
 	public $factures = array();
@@ -84,15 +82,6 @@ class BonPrelevement extends CommonObject
 	public $invoice_in_error = array();
 	public $thirdparty_in_error = array();
 
-	public $amount;
-	public $note;
-	public $datec;
-
-	public $date_credit;
-	public $user_credit;
-
-	public $type;
-	public $fk_bank_account;	// The bank the receipt is generated for
 
 	const STATUS_DRAFT = 0;
 	const STATUS_TRANSFERED = 1;
@@ -100,6 +89,83 @@ class BonPrelevement extends CommonObject
 	const STATUS_DEBITED = 2;		// STATUS_CREDITED and STATUS_DEBITED is same. Difference is in ->type
 
 
+	/**
+	 *  'type' field format:
+	 *  	'integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]',
+	 *  	'select' (list of values are in 'options'),
+	 *  	'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]',
+	 *  	'chkbxlst:...',
+	 *  	'varchar(x)',
+	 *  	'text', 'text:none', 'html',
+	 *   	'double(24,8)', 'real', 'price',
+	 *  	'date', 'datetime', 'timestamp', 'duration',
+	 *  	'boolean', 'checkbox', 'radio', 'array',
+	 *  	'mail', 'phone', 'url', 'password', 'ip'
+	 *		Note: Filter must be a Dolibarr filter syntax string. Example: "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.status:!=:0) or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'picto' is code of a picto to show before value in forms
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM' or 'isModEnabled("multicurrency")' ...)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'alwayseditable' says if field can be modified also when status is not draft ('1' or '0')
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *	'validate' is 1 if need to validate with $this->validateField()
+	 *  'copytoclipboard' is 1 or 2 to allow to add a picto to copy value into clipboard (1=picto after label, 2=picto after value)
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>0,),
+		'ref' => array('type'=>'varchar(12)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflowmax150', 'showoncombobox'=>'1',),
+		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>25, 'notnull'=>0, 'visible'=>-1,),
+		'amount' => array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>-1,),
+		'statut' => array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>'1', 'position'=>500, 'notnull'=>0, 'visible'=>-1, 'arrayofkeyval'=>array(0=>'Wait', 1=>'Transfered', 2=>'Credited')),
+		'credite' => array('type'=>'smallint(6)', 'label'=>'Credite', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>-1,),
+		'note' => array('type'=>'text', 'label'=>'Note', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>-1,),
+		'date_trans' => array('type'=>'datetime', 'label'=>'Datetrans', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>-1,),
+		'method_trans' => array('type'=>'smallint(6)', 'label'=>'Methodtrans', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1,),
+		'fk_user_trans' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkusertrans', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>-1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150',),
+		'date_credit' => array('type'=>'datetime', 'label'=>'Datecredit', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-1,),
+		'fk_user_credit' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fkusercredit', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>-1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150',),
+		'type' => array('type'=>'varchar(16)', 'label'=>'Type', 'enabled'=>'1', 'position'=>75, 'notnull'=>0, 'visible'=>-1,),
+		'fk_bank_account' => array('type'=>'integer', 'label'=>'Fkbankaccount', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1, 'css'=>'maxwidth500 widthcentpercentminusxx',),
+	);
+	public $rowid;
+	public $ref;
+	public $datec;
+	public $amount;
+	public $statut;
+	public $credite;
+	public $note;
+	public $date_trans;
+	public $method_trans;
+	public $fk_user_trans;
+	public $date_credit;
+	public $fk_user_credit;
+	public $type;
+	public $fk_bank_account;
+	// END MODULEBUILDER PROPERTIES
+
+
+
 	/**
 	 *	Constructor
 	 *
@@ -291,8 +357,6 @@ class BonPrelevement extends CommonObject
 	 */
 	public function fetch($rowid, $ref = '')
 	{
-		global $conf;
-
 		$sql = "SELECT p.rowid, p.ref, p.amount, p.note";
 		$sql .= ", p.datec as dc";
 		$sql .= ", p.date_trans as date_trans";
@@ -347,6 +411,18 @@ class BonPrelevement extends CommonObject
 		}
 	}
 
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Set direct debit or credit transfer order to "paid" status.
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index f2a66f0d475..4c3d26720c3 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -139,12 +139,13 @@ if ($id > 0 || $ref) {
 			$result = $acc->fetch($fk_bank_account);
 		}
 
-		print '<tr><td class="titlefieldcreate">';
 		$labelofbankfield = "BankToReceiveWithdraw";
 		if ($object->type == 'bank-transfer') {
 			$labelofbankfield = 'BankToPayCreditTransfer';
 		}
-		print $langs->trans($labelofbankfield);
+
+		print '<tr><td class="titlefieldcreate">';
+		print $form->textwithpicto($langs->trans("BankAccount"), $langs->trans($labelofbankfield));
 		print '</td>';
 		print '<td>';
 		if ($acc->id > 0) {
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index f6e86ee2f6a..7e80874745c 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -134,12 +134,13 @@ if ($id > 0 || $ref) {
 			$result = $acc->fetch($fk_bank_account);
 		}
 
-		print '<tr><td class="titlefieldcreate">';
 		$labelofbankfield = "BankToReceiveWithdraw";
 		if ($object->type == 'bank-transfer') {
 			$labelofbankfield = 'BankToPayCreditTransfer';
 		}
-		print $langs->trans($labelofbankfield);
+
+		print '<tr><td class="titlefieldcreate">';
+		print $form->textwithpicto($langs->trans("BankAccount"), $langs->trans($labelofbankfield));
 		print '</td>';
 		print '<td>';
 		if ($acc->id > 0) {
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 8626b3e3a84..efaab1532f8 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -128,12 +128,13 @@ if ($id > 0 || $ref) {
 			$result = $acc->fetch($fk_bank_account);
 		}
 
-		print '<tr><td class="titlefieldcreate">';
 		$labelofbankfield = "BankToReceiveWithdraw";
 		if ($object->type == 'bank-transfer') {
 			$labelofbankfield = 'BankToPayCreditTransfer';
 		}
-		print $langs->trans($labelofbankfield);
+
+		print '<tr><td class="titlefieldcreate">';
+		print $form->textwithpicto($langs->trans("BankAccount"), $langs->trans($labelofbankfield));
 		print '</td>';
 		print '<td>';
 		if ($acc->id > 0) {
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 74d7e1eaf85..4cb98acbe45 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -94,7 +94,7 @@ class Form
 	 * @param   string	$text			Text of label or key to translate
 	 * @param   string	$htmlname		Name of select field ('edit' prefix will be added)
 	 * @param   string	$preselected    Value to show/edit (not used in this function)
-	 * @param	object	$object			Object
+	 * @param	object	$object			Object (on the page we show)
 	 * @param	boolean	$perm			Permission to allow button to edit parameter. Set it to 0 to have a not edited field.
 	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker' 'checkbox:ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)
 	 * @param	string	$moreparam		More param to add on a href URL.
@@ -194,7 +194,7 @@ class Form
 	 * @param	string	$text			Text of label (not used in this function)
 	 * @param	string	$htmlname		Name of select field
 	 * @param	string	$value			Value to show/edit
-	 * @param	object	$object			Object
+	 * @param	object	$object			Object (that we want to show)
 	 * @param	boolean	$perm			Permission to allow button to edit parameter
 	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols%', 'datepicker' ('day' do not work, don't know why), 'dayhour' or 'datehourpicker', 'ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols', 'select;xkey:xval,ykey:yval,...')
 	 * @param	string	$editvalue		When in edit mode, use this value as $value instead of value (for example, you can provide here a formated price instead of numeric value). Use '' to use same than $value
@@ -303,6 +303,8 @@ class Form
 						$arraylist[$tmpkey] = $tmp[1];
 					}
 					$ret .= $this->selectarray($htmlname, $arraylist, $value);
+				} elseif (preg_match('/^link/', $typeofdata)) {
+					// TODO Not yet implemented. See code for extrafields
 				} elseif (preg_match('/^ckeditor/', $typeofdata)) {
 					$tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols:uselocalbrowser
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

From 49a403b4a578d88ba163a68939f92e472bbcf631 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 27 Feb 2023 20:34:49 +0100
Subject: [PATCH 171/300] NEW Can select the export format during export of
 journals

---
 htdocs/accountancy/bookkeeping/list.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index ff69fbc688b..0fbb2764ae6 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -729,6 +729,7 @@ if ($action == 'export_fileconfirm' && $user->hasRight('accounting', 'mouvements
 		// Export files then exit
 		$accountancyexport = new AccountancyExport($db);
 
+		$formatexport = GETPOST('formatexport', 'int');
 		$notexportlettering = GETPOST('notexportlettering', 'alpha');
 
 		if (!empty($notexportlettering)) {
@@ -745,7 +746,7 @@ if ($action == 'export_fileconfirm' && $user->hasRight('accounting', 'mouvements
 		$withAttachment = !empty(trim(GETPOST('notifiedexportfull', 'alphanohtml'))) ? 1 : 0;
 
 		// Output data on screen or download
-		$result = $accountancyexport->export($object->lines, $formatexportset, $withAttachment);
+		$result = $accountancyexport->export($object->lines, $formatexport, $withAttachment);
 
 		$error = 0;
 		if ($result < 0) {
@@ -856,11 +857,13 @@ $formconfirm = '';
 if ($action == 'export_file') {
 	$form_question = array();
 
-	$form_question['notexportlettering'] = array(
-		'name' => 'notexportlettering',
-		'type' => 'other',
-		'label' => '',		// TODO  Use Selectmodelcsv and show a select combo
-		'value' => $langs->trans('Modelcsv').' : <b>'.$listofformat[$formatexportset].'</b>'
+	$form_question['formatexport'] = array(
+		'name' => 'formatexport',
+		'type' => 'select',
+		'label' => $langs->trans('Modelcsv'),		// TODO  Use Selectmodelcsv and show a select combo
+		'values' => $listofformat,
+		'default' => $formatexportset,
+		'morecss' => 'minwidth200 maxwidth200'
 	);
 
 	$form_question['separator0'] = array('name'=>'separator0', 'type'=>'separator');

From 1b77abcb8ac21bffee0764a5871cff18093c837e Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 28 Feb 2023 00:00:54 +0100
Subject: [PATCH 172/300] Update official French list of legal form update in
 september 2022

---
 .../mysql/data/llx_c_forme_juridique.sql      | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index af625035804..93dfa941189 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -109,26 +109,18 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '228', 'VO
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '229', 'VS0  - Vennootschap met sociaal oogmerk');
 
 
--- France: Extrait de https://www.insee.fr/fr/information/2028129
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'11','Artisan Commerçant (EI)');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'12','Commerçant (EI)');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'13','Artisan (EI)');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'14','Officier public ou ministériel');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'15','Profession libérale (EI)');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'16','Exploitant agricole');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'17','Agent commercial');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'18','Associé Gérant de société');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'19','Personne physique');
+-- France: Catégories niveau II - Extrait de https://www.insee.fr/fr/information/2028129 - Dernière mise à jour Septembre 2022
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'00','Organisme de placement collectif en valeurs mobilières sans personnalité morale');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'10','Entrepreneur individuel');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'21','Indivision');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'22','Société créée de fait');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'23','Société en participation');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'24','Société coopérative d''interet collectif (SCIC)');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'25','Société coopérative de production à responsabilité limitée (SCOP)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'24','Fiducie');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'27','Paroisse hors zone concordataire');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'29','Groupement de droit privé non doté de la personnalité morale');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'28','Assujetti unique à la TVA');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'29','Autre groupement de droit privé non doté de la personnalité morale');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'31','Personne morale de droit étranger, immatriculée au RCS');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'32','Personne morale de droit étranger, non immatriculée au RCS');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'35','Régime auto-entrepreneur');
 
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'41','Etablissement public ou régie à caractère industriel ou commercial');
 
@@ -136,18 +128,16 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'51','Soci
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'52','Société en nom collectif');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'53','Société en commandite');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'54','Société à responsabilité limitée (SARL)');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'55','Société anonyme à conseil d administration');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'55','Société anonyme à conseil d''administration');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'56','Société anonyme à directoire');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'57','Société par actions simplifiée (SAS)');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'58','Entreprise Unipersonnelle à Responsabilité Limitée (EURL)');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'59','Société par actions simplifiée unipersonnelle (SASU)');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'60','Entreprise Individuelle à Responsabilité Limitée (EIRL)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'58','Société européenne');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'61','Caisse d''épargne et de prévoyance');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'62','Groupement d''intérêt économique (GIE)');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'63','Société coopérative agricole');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'64','Société non commerciale d assurances');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'64','Société d''assurance mutuelle');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'65','Société civile');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'69','Personnes de droit privé inscrites au RCS');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'69','Autre personne morale de droit privé inscrite au RCS');
 
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'71','Administration de l état');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'72','Collectivité territoriale');
@@ -163,7 +153,7 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'85','Organ
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'91','Syndicat de propriétaires');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'92','Association loi 1901 ou assimilé');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'93','Fondation');
-insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'99','Personne morale de droit privé');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'99','Autre personne morale de droit privé');
 
 
 -- Germany

From 04ff41adc3a100cd5621bda027fe413d927945e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 28 Feb 2023 08:56:38 +0100
Subject: [PATCH 173/300] doc

---
 .../action/class/actioncommreminder.class.php    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index eb0d464777a..71b438b1a8a 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -72,7 +72,6 @@ class ActionCommReminder extends CommonObject
 	 *  'showoncombobox' if field must be shown into the label of combobox
 	 */
 
-	// BEGIN MODULEBUILDER PROPERTIES
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
@@ -101,6 +100,10 @@ class ActionCommReminder extends CommonObject
 	public $entity;
 
 	public $dateremind;
+
+	/**
+	 * @var string reminder type email, browser, sms
+	 */
 	public $typeremind;
 
 	/**
@@ -108,7 +111,14 @@ class ActionCommReminder extends CommonObject
 	 */
 	public $fk_user;
 
+	/**
+	 * @var int offset value
+	 */
 	public $offsetvalue;
+
+	/**
+	 * @var string y, m, d, w, h, i
+	 */
 	public $offsetunit;
 
 	/**
@@ -131,10 +141,6 @@ class ActionCommReminder extends CommonObject
 	 */
 	public $fk_email_template;
 
-	// END MODULEBUILDER PROPERTIES
-
-
-
 	/**
 	 * Constructor
 	 *

From afae14d914f477649ed27d9f2de1c78ac1184013 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2023 10:39:39 +0100
Subject: [PATCH 174/300] Fix CSP Policy

---
 htdocs/admin/system/security.php           | 12 ++++-
 htdocs/bookcal/availabilities_agenda.php   | 21 --------
 htdocs/bookcal/availabilities_card.php     | 22 --------
 htdocs/bookcal/availabilities_document.php | 21 --------
 htdocs/bookcal/availabilities_list.php     | 22 --------
 htdocs/bookcal/availabilities_note.php     | 21 --------
 htdocs/bookcal/booking_agenda.php          | 21 --------
 htdocs/bookcal/booking_card.php            | 22 --------
 htdocs/bookcal/booking_document.php        | 21 --------
 htdocs/bookcal/booking_list.php            | 22 --------
 htdocs/bookcal/booking_note.php            | 21 --------
 htdocs/core/website.inc.php                | 58 +++++++++++++++-----
 htdocs/main.inc.php                        | 63 +++++++++++++++++-----
 13 files changed, 105 insertions(+), 242 deletions(-)

diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 91de4341b49..c185878e658 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -574,13 +574,21 @@ print '<br>';
 print '<strong>MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL</strong> = '.(empty($conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 0)</span>' : $conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL)."<br>";
 print '<br>';
 
-print '<strong>MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src *; img-src * data:; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline';\")</span><br>";
+$examplecsprule = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
+print '<strong>MAIN_SECURITY_FORCECSPRO</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCECSPRO) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCECSPRO).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").': "'.$examplecsprule.'")</span><br>';
+print '<br>';
+
+$examplecsprule = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
+print '<strong>MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").': "'.$examplecsprule.'")</span><br>';
 print '<br>';
 
 print '<strong>MAIN_SECURITY_FORCERP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCERP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCERP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"same-origin\" so browser doesn't send any referrer when going into another web site domain)</span><br>";
 print '<br>';
 
-print '<strong>WEBSITE_MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self' 'unsafe-inline'; style-src https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src * data:;\")</span><br>";
+print '<strong>WEBSITE_MAIN_SECURITY_FORCECSPRO</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCECSPRO) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCECSPRO).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self' 'unsafe-inline'; style-src https://cdnjs.cloudflare.com *.googleapis.com; script-src *.transifex.com *.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src * data:;\")</span><br>";
+print '<br>';
+
+print '<strong>WEBSITE_MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self' 'unsafe-inline'; style-src https://cdnjs.cloudflare.com *.googleapis.com; script-src *.transifex.com *.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src * data:;\")</span><br>";
 print '<br>';
 
 print '<strong>WEBSITE_MAIN_SECURITY_FORCERP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCERP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCERP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"strict-origin-when-cross-origin\")</span><br>";
diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php
index e9bf8c2b3be..09bfede4687 100644
--- a/htdocs/bookcal/availabilities_agenda.php
+++ b/htdocs/bookcal/availabilities_agenda.php
@@ -22,27 +22,6 @@
  *  \brief      Tab of events on Availabilities
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index ba39d276b46..47134abb8ce 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -22,28 +22,6 @@
  *		\brief      Page to create/edit/view availabilities
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-//if (! defined('NOSESSION'))     		     define('NOSESSION', '1');				    // Disable session
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php
index 4c175674f2b..a1802665a97 100644
--- a/htdocs/bookcal/availabilities_document.php
+++ b/htdocs/bookcal/availabilities_document.php
@@ -22,27 +22,6 @@
  *  \brief      Tab for documents linked to Availabilities
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 17a8259210e..261d716d305 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -22,28 +22,6 @@
  *		\brief      List page for availabilities
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-//if (! defined('NOSESSION'))                define('NOSESSION', '1');					// On CLI mode, no need to use web sessions
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/bookcal/availabilities_note.php b/htdocs/bookcal/availabilities_note.php
index 0102cb9a415..a4cfcc58f98 100644
--- a/htdocs/bookcal/availabilities_note.php
+++ b/htdocs/bookcal/availabilities_note.php
@@ -22,27 +22,6 @@
  *  \brief      Tab for notes on Availabilities
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
 require '../main.inc.php';
 dol_include_once('/bookcal/class/availabilities.class.php');
diff --git a/htdocs/bookcal/booking_agenda.php b/htdocs/bookcal/booking_agenda.php
index dca5126d2b0..01c2df66f63 100644
--- a/htdocs/bookcal/booking_agenda.php
+++ b/htdocs/bookcal/booking_agenda.php
@@ -22,27 +22,6 @@
  *  \brief      Tab of events on Booking
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/bookcal/booking_card.php b/htdocs/bookcal/booking_card.php
index a6e7d01a533..f1f8890ea8f 100644
--- a/htdocs/bookcal/booking_card.php
+++ b/htdocs/bookcal/booking_card.php
@@ -22,28 +22,6 @@
  *		\brief      Page to create/edit/view booking
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-//if (! defined('NOSESSION'))     		     define('NOSESSION', '1');				    // Disable session
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/bookcal/booking_document.php b/htdocs/bookcal/booking_document.php
index 28594c66c09..0224f96adfb 100644
--- a/htdocs/bookcal/booking_document.php
+++ b/htdocs/bookcal/booking_document.php
@@ -22,27 +22,6 @@
  *  \brief      Tab for documents linked to Booking
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php
index 9d29e61ba63..7c039b9bc04 100644
--- a/htdocs/bookcal/booking_list.php
+++ b/htdocs/bookcal/booking_list.php
@@ -22,28 +22,6 @@
  *		\brief      List page for booking
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-//if (! defined('NOSESSION'))                define('NOSESSION', '1');					// On CLI mode, no need to use web sessions
-
 // Load Dolibarr environment
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
diff --git a/htdocs/bookcal/booking_note.php b/htdocs/bookcal/booking_note.php
index 5cdd2886616..03d0c186b10 100644
--- a/htdocs/bookcal/booking_note.php
+++ b/htdocs/bookcal/booking_note.php
@@ -22,27 +22,6 @@
  *  \brief      Tab for notes on Booking
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
 require '../main.inc.php';
 dol_include_once('/bookcal/class/booking.class.php');
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 2bdc9080b78..b934f333b1a 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -107,20 +107,58 @@ if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 	// X-XSS-Protection
 	//header("X-XSS-Protection: 1");      		// XSS filtering protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
 
-	// Content-Security-Policy
-	if (!defined('WEBSITE_MAIN_SECURITY_FORCECSP')) {
-		// The constant WEBSITE_MAIN_SECURITY_FORCECSP should never be defined by page, but the variable used just after may be
-
+	// Content-Security-Policy-Report-Only
+	if (!defined('WEBSITE_MAIN_SECURITY_FORCECSPRO')) {
 		// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
-		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
-		$contentsecuritypolicy = getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCECSP');
+		// For example: to restrict to only local resources, except for css (cloudflare+google), and js (transifex + google tags) and object/iframe (youtube)
+		// default-src 'self'; style-src: https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src: https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: *;
+		// For example, to restrict everything to itself except img that can be on other servers:
+		// default-src 'self'; img-src *;
+		// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
+		// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
+		//
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
+		$contentsecuritypolicy = getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCECSPRO');
 
 		if (!is_object($hookmanager)) {
 			$hookmanager = new HookManager($db);
 		}
 		$hookmanager->initHooks(array("main"));
 
-		$parameters = array('contentsecuritypolicy'=>$contentsecuritypolicy);
+		$parameters = array('contentsecuritypolicy'=>$contentsecuritypolicy, 'mode'=>'reportonly');
+		$result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters); // Note that $action and $object may have been modified by some hooks
+		if ($result > 0) {
+			$contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
+		} else {
+			$contentsecuritypolicy .= $hookmanager->resPrint; // Concat CSP
+		}
+
+		if (!empty($contentsecuritypolicy)) {
+			header("Content-Security-Policy-Report-Only: ".$contentsecuritypolicy);
+		}
+	}
+
+	// Content-Security-Policy
+	if (!defined('WEBSITE_MAIN_SECURITY_FORCECSP')) {
+		// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
+		// For example: to restrict to only local resources, except for css (cloudflare+google), and js (transifex + google tags) and object/iframe (youtube)
+		// default-src 'self'; style-src: https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src: https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: *;
+		// For example, to restrict everything to itself except img that can be on other servers:
+		// default-src 'self'; img-src *;
+		// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
+		// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
+		//
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
+		$contentsecuritypolicy = getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCECSP');
+
+		if (!is_object($hookmanager)) {
+			$hookmanager = new HookManager($db);
+		}
+		$hookmanager->initHooks(array("main"));
+
+		$parameters = array('contentsecuritypolicy'=>$contentsecuritypolicy, 'mode'=>'active');
 		$result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters); // Note that $action and $object may have been modified by some hooks
 		if ($result > 0) {
 			$contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
@@ -129,12 +167,6 @@ if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 		}
 
 		if (!empty($contentsecuritypolicy)) {
-			// For example: to restrict to only local resources, except for css (cloudflare+google), and js (transifex + google tags) and object/iframe (youtube)
-			// default-src 'self'; style-src: https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src: https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: *;
-			// For example, to restrict everything to itself except img that can be on other servers:
-			// default-src 'self'; img-src *;
-			// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
-			// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
 			header("Content-Security-Policy: ".$contentsecuritypolicy);
 		}
 	}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 31aa054d4b2..20b73126656 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1462,13 +1462,21 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 	// X-XSS-Protection
 	//header("X-XSS-Protection: 1");      		// XSS filtering protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
 
-	// Content-Security-Policy
-	if (!defined('MAIN_SECURITY_FORCECSP')) {
+	// Content-Security-Policy-Report-Only
+	if (!defined('MAIN_SECURITY_FORCECSPRO')) {
 		// If CSP not forced from the page
 
 		// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
-		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
-		$contentsecuritypolicy = getDolGlobalString('MAIN_SECURITY_FORCECSP');
+		// For example: to restrict to only local resources, except for css (cloudflare+google), and js (transifex + google tags) and object/iframe (youtube)
+		// default-src 'self'; style-src: https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src: https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: *;
+		// For example, to restrict everything to itself except img that can be on other servers:
+		// default-src 'self'; img-src *;
+		// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
+		// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
+		//
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
+		$contentsecuritypolicy = getDolGlobalString('MAIN_SECURITY_FORCECSPRO');
 
 		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
@@ -1476,7 +1484,44 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 		}
 		$hookmanager->initHooks(array("main"));
 
-		$parameters = array('contentsecuritypolicy'=>$contentsecuritypolicy);
+		$parameters = array('contentsecuritypolicy'=>$contentsecuritypolicy, 'mode'=>'reportonly');
+		$result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters); // Note that $action and $object may have been modified by some hooks
+		if ($result > 0) {
+			$contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
+		} else {
+			$contentsecuritypolicy .= $hookmanager->resPrint; // Concat CSP
+		}
+
+		if (!empty($contentsecuritypolicy)) {
+			header("Content-Security-Policy-Report-Only: ".$contentsecuritypolicy);
+		}
+	} else {
+		header("Content-Security-Policy: ".constant('MAIN_SECURITY_FORCECSPRO'));
+	}
+
+	// Content-Security-Policy
+	if (!defined('MAIN_SECURITY_FORCECSP')) {
+		// If CSP not forced from the page
+
+		// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
+		// For example: to restrict to only local resources, except for css (cloudflare+google), and js (transifex + google tags) and object/iframe (youtube)
+		// default-src 'self'; style-src: https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src: https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: *;
+		// For example, to restrict everything to itself except img that can be on other servers:
+		// default-src 'self'; img-src *;
+		// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
+		// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
+		//
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
+		$contentsecuritypolicy = getDolGlobalString('MAIN_SECURITY_FORCECSP');
+
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($db);
+		}
+		$hookmanager->initHooks(array("main"));
+
+		$parameters = array('contentsecuritypolicy'=>$contentsecuritypolicy, 'mode'=>'active');
 		$result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters); // Note that $action and $object may have been modified by some hooks
 		if ($result > 0) {
 			$contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
@@ -1485,14 +1530,6 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 		}
 
 		if (!empty($contentsecuritypolicy)) {
-			// For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
-			// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: https://static.example.com
-			// For example, to restrict everything to one domain, except 'object', ...:
-			// default-src https://cdn.example.net; object-src 'none'
-			// For example, to restrict everything to itself except img that can be on other servers:
-			// default-src 'self'; img-src *;
-			// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
-			// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
 			header("Content-Security-Policy: ".$contentsecuritypolicy);
 		}
 	} else {

From be49df370ae4539bbf12737dd82c76f00874f897 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2023 11:42:47 +0100
Subject: [PATCH 175/300] css

---
 htdocs/comm/action/list.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 6e4903ae25b..3a48ec66223 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -1010,7 +1010,8 @@ while ($i < $imaxinloop) {
 
 	// User owner
 	if (!empty($arrayfields['owner']['checked'])) {
-		print '<td class="tdoverflowmax150"' . ($event_owner_style != '' ? ' style="'.$event_owner_style.'"' : '') . '>'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
+		//print '<td class="tdoverflowmax150"' . ($event_owner_style != '' ? ' style="'.$event_owner_style.'"' : '') . '>';
+		print '<td class="tdoverflowmax150">';
 		if ($obj->fk_user_action > 0 && !isset($cache_user_list[$obj->fk_user_action])) {
 			$userstatic = new User($db);
 			$res = $userstatic->fetch($obj->fk_user_action);

From d3cfa1050e8a2f496bc00cf426bcf2dcfe1cceb8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2023 13:32:00 +0100
Subject: [PATCH 176/300] Fix deployment of metapackages

---
 htdocs/admin/modules.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 953d8f85a68..75187346558 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -205,6 +205,7 @@ if ($action == 'install') {
 
 				dol_syslog("Uncompress of module file is a success.");
 
+				// We check if this is a metapackage
 				$modulenamearrays = array();
 				if (dol_is_file($modulenamedir.'/metapackage.conf')) {
 					// This is a meta package
@@ -214,6 +215,7 @@ if ($action == 'install') {
 				$modulenamearrays[$modulename] = $modulename;
 				//var_dump($modulenamearrays);exit;
 
+				// Lop on each packacge of the metapackage
 				foreach ($modulenamearrays as $modulenameval) {
 					if (strpos($modulenameval, '#') === 0) {
 						continue; // Discard comments
@@ -227,13 +229,14 @@ if ($action == 'install') {
 
 					// Now we install the module
 					if (!$error) {
-						@dol_delete_dir_recursive($dirins.'/'.$modulenameval); // delete the zip file
-						dol_syslog("We copy now directory ".$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval." into target dir ".$dirins.'/'.$modulenameval);
-						$result = dolCopyDir($modulenamedir, $dirins.'/'.$modulenameval, '0444', 1);
+						@dol_delete_dir_recursive($dirins.'/'.$modulenameval); // delete the target directory
+						$submodulenamedir = $conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulenameval;
+						dol_syslog("We copy now directory ".$submodulenamedir." into target dir ".$dirins.'/'.$modulenameval);
+						$result = dolCopyDir($submodulenamedir, $dirins.'/'.$modulenameval, '0444', 1);
 						if ($result <= 0) {
-							dol_syslog('Failed to call dolCopyDir result='.$result." with param ".$modulenamedir." and ".$dirins.'/'.$modulenameval, LOG_WARNING);
+							dol_syslog('Failed to call dolCopyDir result='.$result." with param ".$submodulenamedir." and ".$dirins.'/'.$modulenameval, LOG_WARNING);
 							$langs->load("errors");
-							setEventMessages($langs->trans("ErrorFailToCopyDir", $modulenamedir, $dirins.'/'.$modulenameval), null, 'errors');
+							setEventMessages($langs->trans("ErrorFailToCopyDir", $submodulenamedir, $dirins.'/'.$modulenameval), null, 'errors');
 							$error++;
 						}
 					}

From 6d6ba3fa83a49e24ef16f13d34e77ef0cced45a7 Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Tue, 28 Feb 2023 14:37:50 +0100
Subject: [PATCH 177/300] Fix : php 8.0 warnings + errors

---
 htdocs/compta/facture/card.php        |  4 ++--
 htdocs/compta/facture/prelevement.php |  2 +-
 htdocs/stripe/class/stripe.class.php  | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 4ea4306a465..d2117f426ca 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2129,6 +2129,7 @@ if (empty($reshook)) {
 			$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 			$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
+			$tva_npr = "";
 
 			// Define special_code for special lines
 			$special_code = 0;
@@ -2157,8 +2158,7 @@ if (empty($reshook)) {
 
 				//$tva_tx = $datapriceofproduct['tva_tx'];
 				//$tva_npr = $datapriceofproduct['tva_npr'];
-
-				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
+				$tmpvat = (float) price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
 				// Set unit price to use
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index c4ec203eb97..ae2209acacc 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -406,7 +406,7 @@ if ($object->id > 0) {
 	print '<span class="badgeneutral">';
 	print $object->getLibType();
 	print '</span>';
-	if ($object->module_source) {
+	if (!empty($object->module_source)) {
 		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')</span>';
 	}
 	if ($object->type == $object::TYPE_REPLACEMENT) {
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 207bbca63b3..c0d7f64a264 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -365,11 +365,11 @@ class Stripe extends CommonObject
 			$stripeamount = $amount;
 		}
 
-		$fee = $amount * ($conf->global->STRIPE_APPLICATION_FEE_PERCENT / 100) + $conf->global->STRIPE_APPLICATION_FEE;
-		if ($fee >= $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL && $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL > $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-			$fee = $conf->global->STRIPE_APPLICATION_FEE_MAXIMAL;
-		} elseif ($fee < $conf->global->STRIPE_APPLICATION_FEE_MINIMAL) {
-			$fee = $conf->global->STRIPE_APPLICATION_FEE_MINIMAL;
+		$fee = $amount * (getDolGlobalString("STRIPE_APPLICATION_FEE_PERCENT", '0') / 100) + getDolGlobalString("STRIPE_APPLICATION_FEE", '0');
+		if ($fee >= getDolGlobalString("STRIPE_APPLICATION_FEE_MAXIMAL", '0') && getDolGlobalString("STRIPE_APPLICATION_FEE_MAXIMAL", '0') > getDolGlobalString("STRIPE_APPLICATION_FEE_MINIMAL", '0')) {
+			$fee = getDolGlobalString("STRIPE_APPLICATION_FEE_MAXIMAL", '0');
+		} elseif ($fee < getDolGlobalString("STRIPE_APPLICATION_FEE_MINIMAL", '0')) {
+			$fee = getDolGlobalString("STRIPE_APPLICATION_FEE_MINIMAL", '0');
 		}
 		if (!in_array($currency_code, $arrayzerounitcurrency)) {
 			$stripefee = round($fee * 100);

From e198e169444313e7d7f8e280ec79c31b33851ff0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Tue, 28 Feb 2023 15:15:04 +0100
Subject: [PATCH 178/300] doc

---
 htdocs/core/class/commondocgenerator.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 26d90d54fb8..cec7408f1ca 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -80,6 +80,11 @@ abstract class CommonDocGenerator
 	 */
 	public $format;
 
+	/**
+	 * @var string pdf, odt, etc
+	 */
+	public $type;
+
 	public $page_hauteur;
 	public $page_largeur;
 	public $marge_gauche;

From d3c65e390bd46cf5002429bc24e6ec9f6d218812 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 28 Feb 2023 15:47:33 +0100
Subject: [PATCH 179/300] TODO remise_percent is a deprecated field for object
 parent

---
 htdocs/comm/propal/class/propal.class.php     | 23 ++++++-----
 htdocs/commande/class/commande.class.php      | 21 +++++++---
 htdocs/compta/facture/class/facture.class.php | 38 ++++++++++++-------
 .../asset/doc/pdf_standard_asset.modules.php  |  5 ++-
 .../commande/doc/pdf_einstein.modules.php     |  5 ++-
 .../commande/doc/pdf_eratosthene.modules.php  |  5 ++-
 .../modules/facture/doc/pdf_crabe.modules.php |  5 ++-
 .../facture/doc/pdf_sponge.modules.php        |  5 ++-
 .../modules/propale/doc/pdf_azur.modules.php  |  5 ++-
 .../modules/propale/doc/pdf_cyan.modules.php  |  5 ++-
 .../doc/pdf_eagle_proforma.modules.php        |  5 ++-
 .../doc/pdf_canelle.modules.php               |  5 ++-
 .../supplier_order/doc/pdf_cornas.modules.php |  5 ++-
 .../doc/pdf_muscadet.modules.php              |  5 ++-
 .../doc/pdf_aurore.modules.php                |  5 ++-
 15 files changed, 89 insertions(+), 53 deletions(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index d71e4a93c2f..05e8bd916fe 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -208,6 +208,10 @@ class Propal extends CommonObject
 	public $cond_reglement_code;
 	public $deposit_percent;
 	public $mode_reglement_code;
+
+	/**
+	 * @deprecated
+	 */
 	public $remise_percent;
 
 	/**
@@ -309,7 +313,7 @@ class Propal extends CommonObject
 		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
 		'fk_user_cloture' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user cloture', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
 		'price' =>array('type'=>'double', 'label'=>'Price', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		'remise_percent' =>array('type'=>'double', 'label'=>'RelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
+		//'remise_percent' =>array('type'=>'double', 'label'=>'RelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
 		//'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
 		//'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
 		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>125, 'isameasure'=>1),
@@ -1087,9 +1091,9 @@ class Propal extends CommonObject
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."propal (";
 		$sql .= "fk_soc";
 		$sql .= ", price";
-		$sql .= ", remise";
-		$sql .= ", remise_percent";
-		$sql .= ", remise_absolue";
+		$sql .= ", remise";			// deprecated
+		$sql .= ", remise_percent";	// deprecated
+		$sql .= ", remise_absolue";	// deprecated
 		$sql .= ", total_tva";
 		$sql .= ", total_ttc";
 		$sql .= ", datep";
@@ -1122,7 +1126,7 @@ class Propal extends CommonObject
 		$sql .= $this->socid;
 		$sql .= ", 0";
 		$sql .= ", ".((float) $this->remise);												// deprecated
-		$sql .= ", ".($this->remise_percent ? ((float) $this->remise_percent) : 'NULL');
+		$sql .= ", ".($this->remise_percent ? ((float) $this->remise_percent) : 'NULL');	// deprecated
 		$sql .= ", ".($this->remise_absolue ? ((float) $this->remise_absolue) : 'NULL');	// deprecated
 		$sql .= ", 0";
 		$sql .= ", 0";
@@ -1577,10 +1581,10 @@ class Propal extends CommonObject
 
 				$this->ref                  = $obj->ref;
 				$this->ref_client           = $obj->ref_client;
-				$this->remise               = $obj->remise;
-				$this->remise_percent       = $obj->remise_percent;
-				$this->remise_absolue       = $obj->remise_absolue;
-				$this->total                = $obj->total_ttc; // TODO deprecated
+				$this->remise               = $obj->remise;				// TODO deprecated
+				$this->remise_percent       = $obj->remise_percent;		// TODO deprecated
+				$this->remise_absolue       = $obj->remise_absolue;		// TODO deprecated
+				$this->total                = $obj->total_ttc;			// TODO deprecated
 				$this->total_ttc            = $obj->total_ttc;
 				$this->total_ht             = $obj->total_ht;
 				$this->total_tva            = $obj->total_tva;
@@ -2427,6 +2431,7 @@ class Propal extends CommonObject
 	 *	@param      double	$remise     Amount discount
 	 *  @param  	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return     int         		<0 if ko, >0 if ok
+	 *	@deprecated remise_percent is a deprecated field for object parent
 	 */
 	public function set_remise_percent($user, $remise, $notrigger = 0)
 	{
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 2cca732e374..f260a54fac6 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -216,8 +216,16 @@ class Commande extends CommonOrder
 	 */
 	public $fk_remise_except;
 
+	/**
+	 * @deprecated
+	 */
 	public $remise_percent;
+
+	/**
+	 * @deprecated
+	 */
 	public $remise_absolue;
+
 	public $info_bits;
 	public $rang;
 	public $special_code;
@@ -322,8 +330,8 @@ class Commande extends CommonOrder
 		'fk_user_cloture' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
 		'source' =>array('type'=>'smallint(6)', 'label'=>'Source', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
 		//'amount_ht' =>array('type'=>'double(24,8)', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
-		'remise_percent' =>array('type'=>'double', 'label'=>'RelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-		'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
+		//'remise_percent' =>array('type'=>'double', 'label'=>'RelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
+		//'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
 		//'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
 		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'VAT', 'enabled'=>1, 'visible'=>-1, 'position'=>125, 'isameasure'=>1),
 		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'LocalTax1', 'enabled'=>1, 'visible'=>-1, 'position'=>130, 'isameasure'=>1),
@@ -976,8 +984,8 @@ class Commande extends CommonOrder
 		$sql .= ", ".($this->fk_delivery_address > 0 ? ((int) $this->fk_delivery_address) : 'NULL');
 		$sql .= ", ".(!empty($this->shipping_method_id) && $this->shipping_method_id > 0 ? ((int) $this->shipping_method_id) : 'NULL');
 		$sql .= ", ".(!empty($this->warehouse_id) && $this->warehouse_id > 0 ? ((int) $this->warehouse_id) : 'NULL');
-		$sql .= ", ".($this->remise_absolue > 0 ? $this->db->escape($this->remise_absolue) : 'NULL');
-		$sql .= ", ".($this->remise_percent > 0 ? $this->db->escape($this->remise_percent) : 0);
+		$sql .= ", ".($this->remise_absolue > 0 ? $this->db->escape($this->remise_absolue) : 'NULL');	// TODO deprecated
+		$sql .= ", ".($this->remise_percent > 0 ? $this->db->escape($this->remise_percent) : 0);		// TODO deprecated
 		$sql .= ", ".(int) $this->fk_incoterms;
 		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql .= ", ".setEntity($this);
@@ -1927,8 +1935,8 @@ class Commande extends CommonOrder
 				$this->date_validation = $this->db->jdate($obj->date_valid);
 				$this->date_modification = $this->db->jdate($obj->tms);
 				$this->remise				= $obj->remise;
-				$this->remise_percent		= $obj->remise_percent;
-				$this->remise_absolue		= $obj->remise_absolue;
+				$this->remise_percent		= $obj->remise_percent;	// TODO deprecated
+				$this->remise_absolue		= $obj->remise_absolue;	// TODO deprecated
 				$this->source				= $obj->source;
 				$this->billed				= $obj->billed;
 				$this->note = $obj->note_private; // deprecated
@@ -2480,6 +2488,7 @@ class Commande extends CommonOrder
 	 * 	@param     	float		$remise		Discount (percent)
 	 * 	@param     	int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 					<0 if KO, >0 if OK
+	 *	@deprecated remise_percent is a deprecated field for object parent
 	 */
 	public function setDiscount($user, $remise, $notrigger = 0)
 	{
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index c1e5856ab87..154480578ba 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -168,8 +168,17 @@ class Facture extends CommonInvoice
 
 	// Warning: Do not set default value into property defintion. it must stay null.
 	// For example to avoid to have substition done when object is generic and not yet defined.
+
+	/**
+	 * @deprecated
+	 */
 	public $remise_absolue;
+
+	/**
+	 * @deprecated
+	 */
 	public $remise_percent;
+
 	public $total_ht;
 	public $total_tva;
 	public $total_localtax1;
@@ -325,8 +334,8 @@ class Facture extends CommonInvoice
 		'date_closing' =>array('type'=>'datetime', 'label'=>'Date closing', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
 		'paye' =>array('type'=>'smallint(6)', 'label'=>'InvoicePaidCompletely', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>80),
 		//'amount' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>85),
-		'remise_percent' =>array('type'=>'double', 'label'=>'RelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>91),
+		//'remise_percent' =>array('type'=>'double', 'label'=>'RelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
+		//'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>91),
 		//'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
 		'close_code' =>array('type'=>'varchar(16)', 'label'=>'EarlyClosingReason', 'enabled'=>1, 'visible'=>-1, 'position'=>92),
 		'close_note' =>array('type'=>'varchar(128)', 'label'=>'EarlyClosingComment', 'enabled'=>1, 'visible'=>-1, 'position'=>93),
@@ -564,8 +573,8 @@ class Facture extends CommonInvoice
 			$this->total_ttc         = $_facrec->total_ttc;
 
 			// Fields always coming from template
-			$this->remise_absolue    = $_facrec->remise_absolue;
-			$this->remise_percent    = $_facrec->remise_percent;
+			$this->remise_absolue    = $_facrec->remise_absolue;	// TODO deprecated
+			$this->remise_percent    = $_facrec->remise_percent;	// TODO deprecated
 			$this->fk_incoterms = $_facrec->fk_incoterms;
 			$this->location_incoterms = $_facrec->location_incoterms;
 
@@ -668,8 +677,8 @@ class Facture extends CommonInvoice
 		$sql .= ", type";
 		$sql .= ", fk_soc";
 		$sql .= ", datec";
-		$sql .= ", remise_absolue";
-		$sql .= ", remise_percent";
+		$sql .= ", remise_absolue";	// TODO deprecated
+		$sql .= ", remise_percent";	// TODO deprecated
 		$sql .= ", datef";
 		$sql .= ", date_pointoftax";
 		$sql .= ", note_private";
@@ -694,8 +703,8 @@ class Facture extends CommonInvoice
 		$sql .= ", '".$this->db->escape($this->type)."'";
 		$sql .= ", ".((int) $socid);
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", ".($this->remise_absolue > 0 ? $this->remise_absolue : 'NULL');
-		$sql .= ", ".($this->remise_percent > 0 ? $this->remise_percent : 'NULL');
+		$sql .= ", ".($this->remise_absolue > 0 ? $this->remise_absolue : 'NULL');	// TODO deprecated
+		$sql .= ", ".($this->remise_percent > 0 ? $this->remise_percent : 'NULL');	// TODO deprecated
 		$sql .= ", '".$this->db->idate($this->date)."'";
 		$sql .= ", ".(empty($this->date_pointoftax) ? "null" : "'".$this->db->idate($this->date_pointoftax)."'");
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
@@ -1159,8 +1168,8 @@ class Facture extends CommonInvoice
 		$facture->fk_project        = $this->fk_project;
 		$facture->cond_reglement_id = $this->cond_reglement_id;
 		$facture->mode_reglement_id = $this->mode_reglement_id;
-		$facture->remise_absolue    = $this->remise_absolue;
-		$facture->remise_percent    = $this->remise_percent;
+		$facture->remise_absolue    = $this->remise_absolue;	// TODO deprecated
+		$facture->remise_percent    = $this->remise_percent;	// TODO deprecated
 
 		$facture->origin            = $this->origin;
 		$facture->origin_id         = $this->origin_id;
@@ -2011,8 +2020,8 @@ class Facture extends CommonInvoice
 				$this->date_validation		= $this->db->jdate($obj->datev);
 				$this->date_modification = $this->db->jdate($obj->datem);
 				$this->datem = $this->db->jdate($obj->datem);
-				$this->remise_percent		= $obj->remise_percent;
-				$this->remise_absolue		= $obj->remise_absolue;
+				$this->remise_percent		= $obj->remise_percent;	// TODO deprecated
+				$this->remise_absolue		= $obj->remise_absolue;	// TODO deprecated
 				$this->total_ht				= $obj->total_ht;
 				$this->total_tva			= $obj->total_tva;
 				$this->total_localtax1		= $obj->localtax1;
@@ -2347,8 +2356,8 @@ class Facture extends CommonInvoice
 		$sql .= " date_pointoftax=".(strval($this->date_pointoftax) != '' ? "'".$this->db->idate($this->date_pointoftax)."'" : 'null').",";
 		$sql .= " date_valid=".(strval($this->date_validation) != '' ? "'".$this->db->idate($this->date_validation)."'" : 'null').",";
 		$sql .= " paye=".(isset($this->paye) ? $this->db->escape($this->paye) : 0).",";
-		$sql .= " remise_percent=".(isset($this->remise_percent) ? $this->db->escape($this->remise_percent) : "null").",";
-		$sql .= " remise_absolue=".(isset($this->remise_absolue) ? $this->db->escape($this->remise_absolue) : "null").",";
+		$sql .= " remise_percent=".(isset($this->remise_percent) ? $this->db->escape($this->remise_percent) : "null").",";	// TODO deprecated
+		$sql .= " remise_absolue=".(isset($this->remise_absolue) ? $this->db->escape($this->remise_absolue) : "null").",";	// TODO deprecated
 		$sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
 		$sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
 		$sql .= " total_tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
@@ -4252,6 +4261,7 @@ class Facture extends CommonInvoice
 	 *	@param     	double	$remise		Discount
 	 *  @param     	int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *	@return		int 		<0 if ko, >0 if ok
+	 *	@deprecated remise_percent is a deprecated field for object parent
 	 */
 	public function setDiscount($user, $remise, $notrigger = 0)
 	{
diff --git a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
index de378ee79a8..9a488112cc5 100644
--- a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -689,7 +689,8 @@ class pdf_standard_asset extends ModelePDFAsset
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if ($object->remise_percent) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					}
 					if ($object->remise_percent) {
@@ -697,7 +698,7 @@ class pdf_standard_asset extends ModelePDFAsset
 					}
 					if ($object->remise_percent) {
 						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index cb73b6fc282..c266642e1f7 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -542,7 +542,8 @@ class pdf_einstein extends ModelePDFCommandes
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if ($object->remise_percent) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					}
 					if ($object->remise_percent) {
@@ -550,7 +551,7 @@ class pdf_einstein extends ModelePDFCommandes
 					}
 					if ($object->remise_percent) {
 						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 8930481d219..c29351a7626 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -767,7 +767,8 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if ($object->remise_percent) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					}
 					if ($object->remise_percent) {
@@ -775,7 +776,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 					if ($object->remise_percent) {
 						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index af927f6d188..a39f306bc4b 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -727,7 +727,8 @@ class pdf_crabe extends ModelePDFFactures
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if ($object->remise_percent) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					}
 					if ($object->remise_percent) {
@@ -735,7 +736,7 @@ class pdf_crabe extends ModelePDFFactures
 					}
 					if ($object->remise_percent) {
 						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 5733122ec13..b40562e3846 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -865,7 +865,8 @@ class pdf_sponge extends ModelePDFFactures
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if ($object->remise_percent) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					}
 					if ($object->remise_percent) {
@@ -873,7 +874,7 @@ class pdf_sponge extends ModelePDFFactures
 					}
 					if ($object->remise_percent) {
 						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 177443153ce..0af08573555 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -653,7 +653,8 @@ class pdf_azur extends ModelePDFPropales
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if ($object->remise_percent) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					}
 					if ($object->remise_percent) {
@@ -661,7 +662,7 @@ class pdf_azur extends ModelePDFPropales
 					}
 					if ($object->remise_percent) {
 						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 65bb0c45f3a..db3bf0a9c22 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -777,7 +777,8 @@ class pdf_cyan extends ModelePDFPropales
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if ($object->remise_percent) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					}
 					if ($object->remise_percent) {
@@ -785,7 +786,7 @@ class pdf_cyan extends ModelePDFPropales
 					}
 					if ($object->remise_percent) {
 						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
index 5bff26a9d1d..38b00261525 100644
--- a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -692,9 +692,10 @@ class pdf_eagle_proforma extends ModelePDFCommandes
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					// TODO remise_percent is an obsolete field for object parent
+					/*if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 76c0ed56851..056f71e5b80 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -508,9 +508,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
 
-					if (!empty($object->remise_percent)) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if (!empty($object->remise_percent)) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 					$localtax1rate = (string) $object->lines[$i]->localtax1_tx;
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 233d18ce229..a2b08668ee2 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -706,7 +706,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if (!empty($object->remise_percent)) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if (!empty($object->remise_percent)) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					}
 					if (!empty($object->remise_percent)) {
@@ -714,7 +715,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					}
 					if (!empty($object->remise_percent)) {
 						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
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 274c348eeea..1de275141c5 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -586,7 +586,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if (!empty($object->remise_percent)) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if (!empty($object->remise_percent)) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					}
 					if (!empty($object->remise_percent)) {
@@ -594,7 +595,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					}
 					if (!empty($object->remise_percent)) {
 						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 70467c49f58..75999b554dc 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -586,7 +586,8 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) {
+					// TODO remise_percent is an obsolete field for object parent
+					/*if ($object->remise_percent) {
 						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
 					}
 					if ($object->remise_percent) {
@@ -594,7 +595,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 					}
 					if ($object->remise_percent) {
 						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
-					}
+					}*/
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 

From ebf766c2e0291498ed7898630886f46c1d8f7e8c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 28 Feb 2023 16:19:22 +0100
Subject: [PATCH 180/300] FIX deprecated just for remise_percent !

---
 htdocs/commande/class/commande.class.php      | 10 +++-------
 htdocs/compta/facture/class/facture.class.php | 18 +++++++-----------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index f260a54fac6..c52147c91d4 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -221,11 +221,7 @@ class Commande extends CommonOrder
 	 */
 	public $remise_percent;
 
-	/**
-	 * @deprecated
-	 */
 	public $remise_absolue;
-
 	public $info_bits;
 	public $rang;
 	public $special_code;
@@ -331,7 +327,7 @@ class Commande extends CommonOrder
 		'source' =>array('type'=>'smallint(6)', 'label'=>'Source', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
 		//'amount_ht' =>array('type'=>'double(24,8)', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>-1, 'position'=>105),
 		//'remise_percent' =>array('type'=>'double', 'label'=>'RelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-		//'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
+		'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
 		//'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
 		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'VAT', 'enabled'=>1, 'visible'=>-1, 'position'=>125, 'isameasure'=>1),
 		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'LocalTax1', 'enabled'=>1, 'visible'=>-1, 'position'=>130, 'isameasure'=>1),
@@ -984,7 +980,7 @@ class Commande extends CommonOrder
 		$sql .= ", ".($this->fk_delivery_address > 0 ? ((int) $this->fk_delivery_address) : 'NULL');
 		$sql .= ", ".(!empty($this->shipping_method_id) && $this->shipping_method_id > 0 ? ((int) $this->shipping_method_id) : 'NULL');
 		$sql .= ", ".(!empty($this->warehouse_id) && $this->warehouse_id > 0 ? ((int) $this->warehouse_id) : 'NULL');
-		$sql .= ", ".($this->remise_absolue > 0 ? $this->db->escape($this->remise_absolue) : 'NULL');	// TODO deprecated
+		$sql .= ", ".($this->remise_absolue > 0 ? $this->db->escape($this->remise_absolue) : 'NULL');
 		$sql .= ", ".($this->remise_percent > 0 ? $this->db->escape($this->remise_percent) : 0);		// TODO deprecated
 		$sql .= ", ".(int) $this->fk_incoterms;
 		$sql .= ", '".$this->db->escape($this->location_incoterms)."'";
@@ -1936,7 +1932,7 @@ class Commande extends CommonOrder
 				$this->date_modification = $this->db->jdate($obj->tms);
 				$this->remise				= $obj->remise;
 				$this->remise_percent		= $obj->remise_percent;	// TODO deprecated
-				$this->remise_absolue		= $obj->remise_absolue;	// TODO deprecated
+				$this->remise_absolue		= $obj->remise_absolue;
 				$this->source				= $obj->source;
 				$this->billed				= $obj->billed;
 				$this->note = $obj->note_private; // deprecated
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 154480578ba..ec4d3135b58 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -168,10 +168,6 @@ class Facture extends CommonInvoice
 
 	// Warning: Do not set default value into property defintion. it must stay null.
 	// For example to avoid to have substition done when object is generic and not yet defined.
-
-	/**
-	 * @deprecated
-	 */
 	public $remise_absolue;
 
 	/**
@@ -335,7 +331,7 @@ class Facture extends CommonInvoice
 		'paye' =>array('type'=>'smallint(6)', 'label'=>'InvoicePaidCompletely', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>80),
 		//'amount' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>85),
 		//'remise_percent' =>array('type'=>'double', 'label'=>'RelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		//'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>91),
+		'remise_absolue' =>array('type'=>'double', 'label'=>'CustomerRelativeDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>91),
 		//'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
 		'close_code' =>array('type'=>'varchar(16)', 'label'=>'EarlyClosingReason', 'enabled'=>1, 'visible'=>-1, 'position'=>92),
 		'close_note' =>array('type'=>'varchar(128)', 'label'=>'EarlyClosingComment', 'enabled'=>1, 'visible'=>-1, 'position'=>93),
@@ -573,7 +569,7 @@ class Facture extends CommonInvoice
 			$this->total_ttc         = $_facrec->total_ttc;
 
 			// Fields always coming from template
-			$this->remise_absolue    = $_facrec->remise_absolue;	// TODO deprecated
+			$this->remise_absolue    = $_facrec->remise_absolue;
 			$this->remise_percent    = $_facrec->remise_percent;	// TODO deprecated
 			$this->fk_incoterms = $_facrec->fk_incoterms;
 			$this->location_incoterms = $_facrec->location_incoterms;
@@ -677,7 +673,7 @@ class Facture extends CommonInvoice
 		$sql .= ", type";
 		$sql .= ", fk_soc";
 		$sql .= ", datec";
-		$sql .= ", remise_absolue";	// TODO deprecated
+		$sql .= ", remise_absolue";
 		$sql .= ", remise_percent";	// TODO deprecated
 		$sql .= ", datef";
 		$sql .= ", date_pointoftax";
@@ -703,7 +699,7 @@ class Facture extends CommonInvoice
 		$sql .= ", '".$this->db->escape($this->type)."'";
 		$sql .= ", ".((int) $socid);
 		$sql .= ", '".$this->db->idate($now)."'";
-		$sql .= ", ".($this->remise_absolue > 0 ? $this->remise_absolue : 'NULL');	// TODO deprecated
+		$sql .= ", ".($this->remise_absolue > 0 ? $this->remise_absolue : 'NULL');
 		$sql .= ", ".($this->remise_percent > 0 ? $this->remise_percent : 'NULL');	// TODO deprecated
 		$sql .= ", '".$this->db->idate($this->date)."'";
 		$sql .= ", ".(empty($this->date_pointoftax) ? "null" : "'".$this->db->idate($this->date_pointoftax)."'");
@@ -1168,7 +1164,7 @@ class Facture extends CommonInvoice
 		$facture->fk_project        = $this->fk_project;
 		$facture->cond_reglement_id = $this->cond_reglement_id;
 		$facture->mode_reglement_id = $this->mode_reglement_id;
-		$facture->remise_absolue    = $this->remise_absolue;	// TODO deprecated
+		$facture->remise_absolue    = $this->remise_absolue;
 		$facture->remise_percent    = $this->remise_percent;	// TODO deprecated
 
 		$facture->origin            = $this->origin;
@@ -2021,7 +2017,7 @@ class Facture extends CommonInvoice
 				$this->date_modification = $this->db->jdate($obj->datem);
 				$this->datem = $this->db->jdate($obj->datem);
 				$this->remise_percent		= $obj->remise_percent;	// TODO deprecated
-				$this->remise_absolue		= $obj->remise_absolue;	// TODO deprecated
+				$this->remise_absolue		= $obj->remise_absolue;
 				$this->total_ht				= $obj->total_ht;
 				$this->total_tva			= $obj->total_tva;
 				$this->total_localtax1		= $obj->localtax1;
@@ -2357,7 +2353,7 @@ class Facture extends CommonInvoice
 		$sql .= " date_valid=".(strval($this->date_validation) != '' ? "'".$this->db->idate($this->date_validation)."'" : 'null').",";
 		$sql .= " paye=".(isset($this->paye) ? $this->db->escape($this->paye) : 0).",";
 		$sql .= " remise_percent=".(isset($this->remise_percent) ? $this->db->escape($this->remise_percent) : "null").",";	// TODO deprecated
-		$sql .= " remise_absolue=".(isset($this->remise_absolue) ? $this->db->escape($this->remise_absolue) : "null").",";	// TODO deprecated
+		$sql .= " remise_absolue=".(isset($this->remise_absolue) ? $this->db->escape($this->remise_absolue) : "null").",";
 		$sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
 		$sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
 		$sql .= " total_tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";

From 4877c80c360c78f4bf85192948a44b0238de0a7e Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Tue, 28 Feb 2023 16:44:32 +0100
Subject: [PATCH 181/300] FIX missing "authorid" for getNomUrl link right
 access

---
 htdocs/comm/action/list.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index b5ec104d02f..8a75dbe9337 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -412,7 +412,7 @@ if ($usergroup > 0) {
 }
 $sql .= " s.nom as societe, s.rowid as socid, s.client, s.email as socemail,";
 $sql .= " a.id, a.code, a.label, a.note, a.datep as dp, a.datep2 as dp2, a.fulldayevent, a.location,";
-$sql .= ' a.fk_user_author,a.fk_user_action,';
+$sql .= ' a.fk_user_author, a.fk_user_action,';
 $sql .= " a.fk_contact, a.note, a.percent as percent,";
 $sql .= " a.fk_element, a.elementtype, a.datec, a.tms as datem,";
 $sql .= " c.code as type_code, c.libelle as type_label, c.color as type_color, c.type as type_type, c.picto as type_picto,";
@@ -916,6 +916,7 @@ while ($i < $imaxinloop) {
 	$actionstatic->note_private = dol_htmlentitiesbr($obj->note);
 	$actionstatic->datep = $db->jdate($obj->dp);
 	$actionstatic->percentage = $obj->percent;
+	$actionstatic->authorid = $obj->fk_user_author;
 
 	// Initialize $this->userassigned && this->socpeopleassigned array && this->userownerid
 	// but only if we need it

From b53a1b91129a5939dcfb1da60f6c348b5d83a80c Mon Sep 17 00:00:00 2001
From: Maximilien Rozniecki <mrozniecki@easya.solutions>
Date: Tue, 28 Feb 2023 17:02:23 +0100
Subject: [PATCH 182/300] NEW only get openned contact from liste_contact
 function, to not have acces to closed contact as mail receiver

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

diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 6bf4807ea6f..84febb58e4e 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -328,7 +328,7 @@ if ($action == 'presend') {
 	}
 
 	$contactarr = array();
-	$contactarr = $tmpobject->liste_contact(-1, 'external');
+	$contactarr = $tmpobject->liste_contact(-1, 'external', 0, '', 1);
 
 	if (is_array($contactarr) && count($contactarr) > 0) {
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

From c75182c9300603c755e1c7bfce1759c0e4c2b409 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2023 17:55:09 +0100
Subject: [PATCH 183/300] Fix building zip signature file

---
 build/generate_filelist_xml.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/generate_filelist_xml.php b/build/generate_filelist_xml.php
index b122f9b0305..45d649d90d9 100755
--- a/build/generate_filelist_xml.php
+++ b/build/generate_filelist_xml.php
@@ -46,6 +46,7 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 
 $includecustom=0;
 $includeconstants=array();
+$buildzip=0;
 
 if (empty($argv[1])) {
 	print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value] [buildzip=1]\n";
@@ -69,6 +70,9 @@ while ($i < $argc) {
 	if (!empty($result["includeconstant"])) {
 		$includeconstants[$i] = $result["includeconstant"];
 	}
+	if (!empty($result["buildzip"])) {
+		$buildzip=1;
+	}
 	if (preg_match('/includeconstant=/', strval($argv[$i]))) {
 		$tmp=explode(':', $result['includeconstant'], 3);			// $includeconstant has been set with previous parse_str()
 		if (count($tmp) != 3) {

From c235b5c5a071ebdabdaa7a6ff2892683d89420f8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2023 18:43:26 +0100
Subject: [PATCH 184/300] Fix remove a bad error_log that was sending emails

---
 htdocs/core/lib/functions.lib.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 232cf479a1d..aa7294eac75 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9030,11 +9030,9 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1'
 			}
 		}
 	} catch (Error $e) {
-		$error = 'Caught error : ';
+		$error = 'dol_eval try/catch error : ';
 		$error .= $e->getMessage();
-		//$error .= ', Trace : ';
-		//$error .= json_encode($e->getTrace());
-		error_log($error, 1);
+		dol_syslog($error);
 	}
 	if ($returnvalue) {
 		return '';

From 15d249cd4b6dac6fabbdf9a9362c805ff992e70a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Tue, 28 Feb 2023 20:35:38 +0100
Subject: [PATCH 185/300] clean code

---
 .../workstation/class/workstation.class.php   | 215 ++----------------
 1 file changed, 18 insertions(+), 197 deletions(-)

diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 14d5bab575f..ae21431db83 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2020 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+/* Copyright (C) 2017       Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2020       Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2023       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
@@ -24,8 +25,6 @@
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
 /**
  * Class for Workstation
@@ -94,7 +93,6 @@ class Workstation extends CommonObject
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 
-	// BEGIN MODULEBUILDER PROPERTIES
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
@@ -118,19 +116,29 @@ class Workstation extends CommonObject
 	public $rowid;
 	public $ref;
 	public $label;
-	public $note_public;
-	public $note_private;
+
 	public $date_creation;
 	public $tms;
 	public $fk_user_creat;
 	public $fk_user_modif;
-	public $import_key;
+
+	/**
+	 * @var int status enabled or disabled
+	 */
 	public $status;
 	public $nb_operators_required;
 	public $thm_operator_estimated;
 	public $thm_machine_estimated;
-	// END MODULEBUILDER PROPERTIES
 
+	/**
+	 * @var int[] array of ID
+	 */
+	public $resources;
+
+	/**
+	 * @var int[] array of ID
+	 */
+	public $usergroups;
 
 	/**
 	 * Constructor
@@ -155,12 +163,6 @@ class Workstation extends CommonObject
 			$this->fields['entity']['enabled'] = 0;
 		}
 
-		// Example to show how to set values of fields definition dynamically
-		/*if ($user->rights->workstation->workstation->read) {
-			$this->fields['myfield']['visible'] = 1;
-			$this->fields['myfield']['noteditable'] = 0;
-		}*/
-
 		// Unset fields that are disabled
 		foreach ($this->fields as $key => $val) {
 			if (isset($val['enabled']) && empty($val['enabled'])) {
@@ -511,132 +513,6 @@ class Workstation extends CommonObject
 		return $this->deleteLineCommon($user, $idline, $notrigger);
 	}
 
-
-	/**
-	 *	Validate object
-	 *
-	 *	@param		User	$user     		User making status change
-	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
-	 */
-	public function validate($user, $notrigger = 0)
-	{
-		global $conf, $langs;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$error = 0;
-
-		// Protection
-		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
-			return 0;
-		}
-
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->workstation->workstation->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->workstation->workstation->workstation_advance->validate))))
-		 {
-		 $this->error='NotEnoughPermissions';
-		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-		 return -1;
-		 }*/
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// Define new ref
-		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
-			$num = $this->getNextNumRef();
-		} else {
-			$num = $this->ref;
-		}
-		$this->newref = $num;
-
-		if (!empty($num)) {
-			// Validate
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql .= " SET ref = '".$this->db->escape($num)."',";
-			$sql .= " status = ".self::STATUS_VALIDATED;
-			if (!empty($this->fields['date_validation'])) {
-				$sql .= ", date_validation = '".$this->db->idate($now)."'";
-			}
-			if (!empty($this->fields['fk_user_valid'])) {
-				$sql .= ", fk_user_valid = ".$user->id;
-			}
-			$sql .= " WHERE rowid = ".((int) $this->id);
-
-			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				dol_print_error($this->db);
-				$this->error = $this->db->lasterror();
-				$error++;
-			}
-
-			if (!$error && !$notrigger) {
-				// Call trigger
-				$result = $this->call_trigger('WORKSTATION_VALIDATE', $user);
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
-			}
-		}
-
-		if (!$error) {
-			$this->oldref = $this->ref;
-
-			// Rename directory if dir was a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
-				// Now we rename also files into index
-				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'workstation/".$this->db->escape($this->newref)."'";
-				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'workstation/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
-				$resql = $this->db->query($sql);
-				if (!$resql) {
-					$error++; $this->error = $this->db->lasterror();
-				}
-
-				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
-				$oldref = dol_sanitizeFileName($this->ref);
-				$newref = dol_sanitizeFileName($num);
-				$dirsource = $conf->workstation->dir_output.'/workstation/'.$oldref;
-				$dirdest = $conf->workstation->dir_output.'/workstation/'.$newref;
-				if (!$error && file_exists($dirsource)) {
-					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
-
-					if (@rename($dirsource, $dirdest)) {
-						dol_syslog("Rename ok");
-						// Rename docs starting with $oldref with $newref
-						$listoffiles = dol_dir_list($conf->workstation->dir_output.'/workstation/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-						foreach ($listoffiles as $fileentry) {
-							$dirsource = $fileentry['name'];
-							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-							$dirsource = $fileentry['path'].'/'.$dirsource;
-							$dirdest = $fileentry['path'].'/'.$dirdest;
-							@rename($dirsource, $dirdest);
-						}
-					}
-				}
-			}
-		}
-
-		// Set new ref and current status
-		if (!$error) {
-			$this->ref = $num;
-			$this->status = self::STATUS_VALIDATED;
-		}
-
-		if (!$error) {
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-
 	/**
 	 *	Set draft status
 	 *
@@ -877,7 +753,7 @@ class Workstation extends CommonObject
 
 				$this->user_creation_id = $obj->fk_user_creat;
 				$this->user_modification_id = $obj->fk_user_modif;
-				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
@@ -898,31 +774,6 @@ class Workstation extends CommonObject
 		$this->initAsSpecimenCommon();
 	}
 
-	/**
-	 * 	Create an array of lines
-	 *
-	 * 	@return array|int		array of lines if OK, <0 if KO
-	 */
-	public function getLinesArray()
-	{
-		$this->lines = array();
-
-		/*
-		$objectline = new WorkstationLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_workstation = '.((int) $this->id)));
-
-		if (is_numeric($result)) {
-			$this->error = $objectline->error;
-			$this->errors = $objectline->errors;
-			return $result;
-		}
-
-		$this->lines = $result;
-		*/
-
-		return $this->lines;
-	}
-
 	/**
 	 *  Returns the reference to the following non used object depending on the active numbering module.
 	 *
@@ -1016,34 +867,4 @@ class Workstation extends CommonObject
 
 		return $result;
 	}
-
-	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
-	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
-	 *
-	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	public function doScheduledJob()
-	{
-		global $conf, $langs;
-
-		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
-
-		$error = 0;
-		$this->output = '';
-		$this->error = '';
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// ...
-
-		$this->db->commit();
-
-		return $error;
-	}
 }

From 31adaf3e29abb71836230bc354edbf7927ee0447 Mon Sep 17 00:00:00 2001
From: Anthony Berton <anthony.berton@bb2a.fr>
Date: Tue, 28 Feb 2023 21:58:55 +0100
Subject: [PATCH 186/300] FIX getpost onlignsignname

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

diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index c3fd2e75cf8..0577ee63bea 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -59,7 +59,7 @@ $signature = GETPOST('signaturebase64');
 $ref = GETPOST('ref', 'aZ09');
 $mode = GETPOST('mode', 'aZ09');	// 'proposal', ...
 $SECUREKEY = GETPOST("securekey"); // Secure key
-$online_sign_name = GETPOST("onlinesignname");
+$online_sign_name = GETPOST("onlinesignname") ? GETPOST("onlinesignname") : '';
 
 $error = 0;
 $response = "";

From 1ff1d5fd686624c9165d0614934ccc4ef91b21bd Mon Sep 17 00:00:00 2001
From: Anthony Berton <anthony.berton@bb2a.fr>
Date: Tue, 28 Feb 2023 22:07:49 +0100
Subject: [PATCH 187/300] size font

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

diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index 0577ee63bea..939c5fdce32 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -173,7 +173,7 @@ if ($action == "importSignature") {
 						$wforimg = $s['w'] - 20 - $xforimgstart;
 
 						$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4) - 4);
-						$pdf->SetFont($default_font, '', $default_font_size);
+						$pdf->SetFont($default_font, '', $default_font_size - 1);
 						$pdf->MultiCell($wforimg, 4, $langs->trans("DateSigning").': '.dol_print_date(dol_now(), "daytext", false, $langs, true), 0, 'L');
 						$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4));
 						$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname").': '.$online_sign_name, 0, 'L');

From 77ff8498923bdbec933ac9d4619ae39c36f320ec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 28 Feb 2023 22:44:22 +0100
Subject: [PATCH 188/300] css

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

diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 5f27cbf3477..d411354d440 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -908,7 +908,7 @@ class FormCompany extends Form
 	 *  @param  string  $morecss        More css
 	 *  @return	string					HTML string with prof id
 	 */
-	public function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth100onsmartphone quatrevingtpercent')
+	public function get_input_id_prof($idprof, $htmlname, $preselected, $country_code, $morecss = 'maxwidth200')
 	{
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;

From 71fc59169ff8182f84d6cfce5814f027296c10f8 Mon Sep 17 00:00:00 2001
From: Maximilien Rozniecki <mrozniecki@easya.solutions>
Date: Wed, 1 Mar 2023 10:44:20 +0100
Subject: [PATCH 189/300] add a new function inside ticket.class to remove the
 closed contact from the receiver list of contact

---
 htdocs/langs/en_US/ticket.lang       |  1 +
 htdocs/ticket/class/ticket.class.php | 37 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index c0ca780ee06..d48b2c9beb2 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -223,6 +223,7 @@ TicketUpdated=Ticket updated
 SendMessageByEmail=Send message by email
 TicketNewMessage=New message
 ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
+WarningMailNotSendContactIsClosed=E-mail to %s refused for shipment as this contact is closed
 TicketGoIntoContactTab=Please go into "Contacts" tab to select them
 TicketMessageMailIntro=Message header
 TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 6f309b7656f..f1f84fb8a9b 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2812,6 +2812,7 @@ class Ticket extends CommonObject
 
 		$from = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM;
 		$is_sent = false;
+		$array_receiver = $this->removeClosedContact($array_receiver);
 		if (is_array($array_receiver) && count($array_receiver) > 0) {
 			foreach ($array_receiver as $key => $receiver) {
 				$deliveryreceipt = 0;
@@ -3028,6 +3029,42 @@ class Ticket extends CommonObject
 		$return .= '</div>';
 		return $return;
 	}
+
+	/**
+	 * Remove the closed contact
+	 *
+	 * @param   array      $to        Array of receiver. exemple array('john@doe.com' => 'John Doe <john@doe.com>', etc...)
+	 * @return  array                 array of email => name
+	 */
+	public function removeClosedContact($to)
+	{
+		global $db, $langs;
+		$langs->load("ticket");
+
+		if (isset($this->id)) {
+			$sql = "SELECT IF(tc.source = 'external', sc.email, u.email)";
+			$sql .= " FROM ".MAIN_DB_PREFIX."element_contact ec";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_type_contact tc on (ec.element_id = ". $this->id ." AND ec.fk_c_type_contact = tc.rowid)";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sc on (ec.fk_socpeople = sc.rowid AND tc.source = 'external')";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u on (ec.fk_socpeople = u.rowid AND tc.source = 'internal')";
+			$sql .= " WHERE IF(tc.source = 'external', sc.statut = 1, u.statut = 1)";
+			$resql = $db->query($sql);
+			if ($resql) {
+				for ($i = 0; $db->num_rows($resql) > $i; $i++) {
+					$non_closed_contacts[] = $db->fetch_row($resql);
+				}
+			}
+			$to = array_filter($to, function($v, $k) use($non_closed_contacts, $langs) {
+				foreach($non_closed_contacts as $non_closed_contact) {
+					if ($k == $non_closed_contact[0])
+						return true;
+				}
+				setEventMessages($langs->trans('WarningMailNotSendContactIsClosed', str_replace(array('>', '<'), '', $v)), null, 'warnings');
+				return false;
+			}, ARRAY_FILTER_USE_BOTH);
+		}
+		return $to;
+	}
 }
 
 

From e9ad7984319c5e7f210f9f1d1745d2cc24c918bd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 10:55:22 +0100
Subject: [PATCH 190/300] Fix missing url

---
 htdocs/public/partnership/new.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index dea912e0653..30cf17ab718 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -264,6 +264,7 @@ if (empty($reshook) && $action == 'add') {
 				$company->zip         = GETPOST('zipcode');
 				$company->town        = GETPOST('town');
 				$company->email       = GETPOST('email');
+				$company->url         = GETPOST('url');
 				$company->country_id  = GETPOST('country_id', 'int');
 				$company->state_id    = GETPOST('state_id', 'int');
 				$company->name_alias  = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
@@ -297,12 +298,16 @@ if (empty($reshook) && $action == 'add') {
 			if (empty($company->email)) {
 				$company->email = GETPOST('email');
 			}
+			if (empty($company->url)) {
+				$company->url = GETPOST('url');
+			}
 			if (empty($company->state_id)) {
 				$company->state_id = GETPOST('state_id', 'int');
 			}
 			if (empty($company->name_alias)) {
 				$company->name_alias = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
 			}
+
 			$company->update(0);
 		}
 
@@ -610,6 +615,9 @@ print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span><
 print '<tr><td>'.$langs->trans("Email").' <span style="color:red;">*</span></td><td>';
 //print img_picto('', 'email', 'class="pictofixedwidth"');
 print '<input type="text" name="email" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+// Url
+print '<tr><td>'.$langs->trans("Url").' <span style="color:red;">*</span></td><td>';
+print '<input type="text" name="url" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('url')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";

From 233d737a89270f48ee82b961feb9fff23787010d Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 1 Mar 2023 09:57:09 +0000
Subject: [PATCH 191/300] Fixing style errors.

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index f1f84fb8a9b..45e3cf361b3 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -3054,8 +3054,8 @@ class Ticket extends CommonObject
 					$non_closed_contacts[] = $db->fetch_row($resql);
 				}
 			}
-			$to = array_filter($to, function($v, $k) use($non_closed_contacts, $langs) {
-				foreach($non_closed_contacts as $non_closed_contact) {
+			$to = array_filter($to, function ($v, $k) use ($non_closed_contacts, $langs) {
+				foreach ($non_closed_contacts as $non_closed_contact) {
 					if ($k == $non_closed_contact[0])
 						return true;
 				}

From d1b5fc6bc1b0fda806db5a94eaf3729f1404d18b Mon Sep 17 00:00:00 2001
From: Maximilien Rozniecki <mrozniecki@easya.solutions>
Date: Wed, 1 Mar 2023 11:04:00 +0100
Subject: [PATCH 192/300] removed function from FOR loop test part

---
 htdocs/ticket/class/ticket.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 45e3cf361b3..ce0997c7a02 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -3050,11 +3050,12 @@ class Ticket extends CommonObject
 			$sql .= " WHERE IF(tc.source = 'external', sc.statut = 1, u.statut = 1)";
 			$resql = $db->query($sql);
 			if ($resql) {
-				for ($i = 0; $db->num_rows($resql) > $i; $i++) {
+				$num = $db->num_rows($resql);
+				for ($i = 0; $num > $i; $i++) {
 					$non_closed_contacts[] = $db->fetch_row($resql);
 				}
 			}
-			$to = array_filter($to, function ($v, $k) use ($non_closed_contacts, $langs) {
+			$to = array_filter($to, function($v, $k) use($non_closed_contacts, $langs) {
 				foreach ($non_closed_contacts as $non_closed_contact) {
 					if ($k == $non_closed_contact[0])
 						return true;

From 1bd49ca07a23f7e45b07e4dc4a79eeaedf10762c Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 1 Mar 2023 10:04:30 +0000
Subject: [PATCH 193/300] Fixing style errors.

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

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index ce0997c7a02..9f9a2b702aa 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -3055,7 +3055,7 @@ class Ticket extends CommonObject
 					$non_closed_contacts[] = $db->fetch_row($resql);
 				}
 			}
-			$to = array_filter($to, function($v, $k) use($non_closed_contacts, $langs) {
+			$to = array_filter($to, function ($v, $k) use ($non_closed_contacts, $langs) {
 				foreach ($non_closed_contacts as $non_closed_contact) {
 					if ($k == $non_closed_contact[0])
 						return true;

From 93953cd24ca86096b80b570d8a298ccdb573adf0 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 11:08:38 +0100
Subject: [PATCH 194/300] Fix option PARTNERSHIP_BACKLINKS_TO_CHECK

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

diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index f4ea73a1a8f..105456dc719 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -93,4 +93,5 @@ ReasonDeclineOrCancel=Reason for declining or canceling
 
 NewPartnershipRequest=New partnership request
 NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
+ThisUrlMustContainsAtLeastOneLinkToWebsite=This page must contains at least one link to one of the following domain: %s 
 
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index 30cf17ab718..0e43174b893 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -617,7 +617,18 @@ print '<tr><td>'.$langs->trans("Email").' <span style="color:red;">*</span></td>
 print '<input type="text" name="email" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Url
 print '<tr><td>'.$langs->trans("Url").' <span style="color:red;">*</span></td><td>';
-print '<input type="text" name="url" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('url')).'"></td></tr>'."\n";
+print '<input type="text" name="url" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('url')).'">';
+if (getDolGlobalString('PARTNERSHIP_BACKLINKS_TO_CHECK')) {
+	$listofkeytocheck = explode('|', getDolGlobalString('PARTNERSHIP_BACKLINKS_TO_CHECK'));
+	$i = 0;
+	$s = '';
+	foreach ($listofkeytocheck as $val) {
+		$i++;
+		$s .= ($s ? ($i == count($listofkeytocheck) ? ' '.$langs->trans("or").' ' : ', ') : '').$val;
+	}
+	print '<br><span class="opacitymedium small">'.$langs->trans("ThisUrlMustContainsAtLeastOneLinkToWebsite", $s).'</small>';
+}
+print '</td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";

From 3694179f71e0d5b03e197b1b9a5a0ef29a2386ea Mon Sep 17 00:00:00 2001
From: atm-greg <gregory.blemand@atm-consulting.fr>
Date: Wed, 1 Mar 2023 11:15:26 +0100
Subject: [PATCH 195/300] fix if to enable behaviour on cards

---
 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 56c04cfe736..1f8e0cd70dd 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -8617,7 +8617,7 @@ function printCommonFooter($zone = 'private')
 			}
 
 			// Management of focus and mandatory for fields
-			if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"])))) {
+			if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"]))) || ((empty($action) || $action == 'addline') && (preg_match('/card\.php/', $_SERVER["PHP_SELF"])))) {
 				print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */'."\n";
 				$relativepathstring = $_SERVER["PHP_SELF"];
 				// Clean $relativepathstring

From f740a039f77bd41922a1b4089346093ffd84ec51 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 12:34:01 +0100
Subject: [PATCH 196/300] Debug v17

---
 htdocs/install/mysql/migration/16.0.0-17.0.0.sql | 1 +
 htdocs/partnership/class/partnership.class.php   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index 9d0a5a776d6..4ec2e7228b2 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -64,6 +64,7 @@ ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_percent (percent);
 
 UPDATE llx_c_paiement SET code = 'BANCON' WHERE code = 'BAN' AND libelle = 'Bancontact';
 
+ALTER TABLE llx_partnership DROP FOREIGN KEY llx_partnership_fk_user_creat;
 -- VMYSQL4.3 ALTER TABLE llx_partnership MODIFY COLUMN fk_user_creat integer NULL;
 -- VPGSQL8.2 ALTER TABLE llx_partnership ALTER COLUMN fk_user_creat DROP NOT NULL;
 
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 013323f3193..130d24eb032 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -550,10 +550,15 @@ class Partnership extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false)
 	{
+		global $user;
+
 		if ($this->fk_soc <= 0 && $this->fk_member <= 0) {
 			$this->error[] = "ErrorThirpdartyOrMemberidIsMandatory";
 			return -1;
 		}
+		if (empty($this->fk_user_creat)) {	// Fot the case the object was created with empty user.
+			$this->fk_user_creat = $user->id;
+		}
 
 		return $this->updateCommon($user, $notrigger);
 	}

From e26e8ac85b42192a9124bb0ce282b90459f74e6e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 12:35:33 +0100
Subject: [PATCH 197/300] Debug v17

---
 htdocs/partnership/class/partnership.class.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 130d24eb032..d61b43c2513 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -550,13 +550,11 @@ class Partnership extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false)
 	{
-		global $user;
-
 		if ($this->fk_soc <= 0 && $this->fk_member <= 0) {
 			$this->error[] = "ErrorThirpdartyOrMemberidIsMandatory";
 			return -1;
 		}
-		if (empty($this->fk_user_creat)) {	// Fot the case the object was created with empty user.
+		if (empty($this->fk_user_creat)) {	// For the case the object was created with empty user (from public page).
 			$this->fk_user_creat = $user->id;
 		}
 

From 0a67bff3d52086510a510b2cdcc317629deb6c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Wed, 1 Mar 2023 13:39:31 +0100
Subject: [PATCH 198/300] clean code

---
 htdocs/bookcal/availabilities_agenda.php      |  6 +++---
 htdocs/bookcal/availabilities_card.php        | 12 ++++++------
 htdocs/bookcal/availabilities_contact.php     |  6 +++---
 htdocs/bookcal/availabilities_document.php    | 10 +++++-----
 htdocs/bookcal/availabilities_list.php        |  8 ++++----
 htdocs/bookcal/availabilities_note.php        |  8 ++++----
 htdocs/bookcal/bookcalindex.php               |  5 ++---
 htdocs/bookcal/booking_agenda.php             |  2 +-
 htdocs/bookcal/booking_card.php               |  2 +-
 htdocs/bookcal/booking_contact.php            |  2 +-
 htdocs/bookcal/booking_document.php           |  2 +-
 htdocs/bookcal/booking_list.php               |  2 +-
 htdocs/bookcal/booking_note.php               |  2 +-
 htdocs/bookcal/class/availabilities.class.php |  4 ++--
 14 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/htdocs/bookcal/availabilities_agenda.php b/htdocs/bookcal/availabilities_agenda.php
index b4b848f17ed..16673d6b8a3 100644
--- a/htdocs/bookcal/availabilities_agenda.php
+++ b/htdocs/bookcal/availabilities_agenda.php
@@ -88,8 +88,8 @@ if ($id > 0 || !empty($ref)) {
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;
 if ($enablepermissioncheck) {
-	$permissiontoread = $user->rights->bookcal->availabilities->read;
-	$permissiontoadd = $user->rights->bookcal->availabilities->write;
+	$permissiontoread = $user->hasRight('bookcal', 'availabilities', 'read');
+	$permissiontoadd = $user->hasRight('bookcal', 'availabilities', 'write');
 } else {
 	$permissiontoread = 1;
 	$permissiontoadd = 1;
@@ -100,7 +100,7 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden();
+if (!isModEnabled('bookcal')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/availabilities_card.php b/htdocs/bookcal/availabilities_card.php
index 7736229319d..ca9fd3bf8db 100644
--- a/htdocs/bookcal/availabilities_card.php
+++ b/htdocs/bookcal/availabilities_card.php
@@ -77,11 +77,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;
 if ($enablepermissioncheck) {
-	$permissiontoread = $user->rights->bookcal->availabilities->read;
-	$permissiontoadd = $user->rights->bookcal->availabilities->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-	$permissiontodelete = $user->rights->bookcal->availabilities->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-	$permissionnote = $user->rights->bookcal->availabilities->write; // Used by the include of actions_setnotes.inc.php
-	$permissiondellink = $user->rights->bookcal->availabilities->write; // Used by the include of actions_dellink.inc.php
+	$permissiontoread = $user->hasRight('bookcal', 'availabilities', 'read');
+	$permissiontoadd = $user->hasRight('bookcal', 'availabilities', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+	$permissiontodelete = $user->hasRight('bookcal', 'availabilities', 'delete') || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+	$permissionnote = $user->hasRight('bookcal', 'availabilities', 'write'); // Used by the include of actions_setnotes.inc.php
+	$permissiondellink = $user->hasRight('bookcal', 'availabilities', 'write'); // Used by the include of actions_dellink.inc.php
 } else {
 	$permissiontoread = 1;
 	$permissiontoadd = 1; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
@@ -97,7 +97,7 @@ $upload_dir = $conf->bookcal->multidir_output[isset($object->entity) ? $object->
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden();
+if (!isModEnabled('bookcal')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/availabilities_contact.php b/htdocs/bookcal/availabilities_contact.php
index 58bbc4826a4..8dfa04288f7 100644
--- a/htdocs/bookcal/availabilities_contact.php
+++ b/htdocs/bookcal/availabilities_contact.php
@@ -53,8 +53,8 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;
 if ($enablepermissioncheck) {
-	$permissiontoread = $user->rights->bookcal->availabilities->read;
-	$permission = $user->rights->bookcal->availabilities->write;
+	$permissiontoread = $user->hasRight('bookcal', 'availabilities', 'read');
+	$permission = $user->hasRight('bookcal', 'availabilities', 'write');
 } else {
 	$permissiontoread = 1;
 	$permission = 1;
@@ -65,7 +65,7 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden();
+if (!isModEnabled('bookcal')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/availabilities_document.php b/htdocs/bookcal/availabilities_document.php
index 721f304d9d8..96700096ee6 100644
--- a/htdocs/bookcal/availabilities_document.php
+++ b/htdocs/bookcal/availabilities_document.php
@@ -78,8 +78,8 @@ if ($id > 0 || !empty($ref)) {
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;
 if ($enablepermissioncheck) {
-	$permissiontoread = $user->rights->bookcal->availabilities->read;
-	$permissiontoadd = $user->rights->bookcal->availabilities->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+	$permissiontoread = $user->hasRight('bookcal', 'availabilities', 'read');
+	$permissiontoadd = $user->hasRight('bookcal', 'availabilities', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
 } else {
 	$permissiontoread = 1;
 	$permissiontoadd = 1;
@@ -90,7 +90,7 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden();
+if (!isModEnabled('bookcal')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 
@@ -192,9 +192,9 @@ if ($object->id) {
 	print dol_get_fiche_end();
 
 	$modulepart = 'bookcal';
-	//$permissiontoadd = $user->rights->bookcal->availabilities->write;
+	//$permissiontoadd = $user->hasRight('bookcal', 'availabilities', 'write');
 	$permissiontoadd = 1;
-	//$permtoedit = $user->rights->bookcal->availabilities->write;
+	//$permtoedit = $user->hasRight('bookcal', 'availabilities', 'write');
 	$permtoedit = 1;
 	$param = '&id='.$object->id;
 
diff --git a/htdocs/bookcal/availabilities_list.php b/htdocs/bookcal/availabilities_list.php
index 69594d45133..7c0ef05a02d 100644
--- a/htdocs/bookcal/availabilities_list.php
+++ b/htdocs/bookcal/availabilities_list.php
@@ -132,9 +132,9 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;
 if ($enablepermissioncheck) {
-	$permissiontoread = $user->rights->bookcal->availabilities->read;
-	$permissiontoadd = $user->rights->bookcal->availabilities->write;
-	$permissiontodelete = $user->rights->bookcal->availabilities->delete;
+	$permissiontoread = $user->hasRight('bookcal', 'availabilities', 'read');
+	$permissiontoadd = $user->hasRight('bookcal', 'availabilities', 'write');
+	$permissiontodelete = $user->hasRight('bookcal', 'availabilities', 'delete');
 } else {
 	$permissiontoread = 1;
 	$permissiontoadd = 1;
@@ -147,7 +147,7 @@ if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, 0, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden('Module not enabled');
+if (!isModEnabled('bookcal')) accessforbidden('Module not enabled');
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/availabilities_note.php b/htdocs/bookcal/availabilities_note.php
index 0717e618864..27cdbbce880 100644
--- a/htdocs/bookcal/availabilities_note.php
+++ b/htdocs/bookcal/availabilities_note.php
@@ -56,9 +56,9 @@ if ($id > 0 || !empty($ref)) {
 // Set $enablepermissioncheck to 1 to enable a minimum low level of checks
 $enablepermissioncheck = 0;
 if ($enablepermissioncheck) {
-	$permissiontoread = $user->rights->bookcal->availabilities->read;
-	$permissiontoadd = $user->rights->bookcal->availabilities->write;
-	$permissionnote = $user->rights->bookcal->availabilities->write; // Used by the include of actions_setnotes.inc.php
+	$permissiontoread = $user->hasRight('bookcal', 'availabilities', 'read');
+	$permissiontoadd = $user->hasRight('bookcal', 'availabilities', 'write');
+	$permissionnote = $user->hasRight('bookcal', 'availabilities', 'write'); // Used by the include of actions_setnotes.inc.php
 } else {
 	$permissiontoread = 1;
 	$permissiontoadd = 1;
@@ -70,7 +70,7 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden();
+if (!isModEnabled('bookcal')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/bookcalindex.php b/htdocs/bookcal/bookcalindex.php
index b268c3b811e..b76c8e9972d 100644
--- a/htdocs/bookcal/bookcalindex.php
+++ b/htdocs/bookcal/bookcalindex.php
@@ -71,7 +71,7 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 // BEGIN MODULEBUILDER DRAFT MYOBJECT
 // Draft MyObject
-if ($user->rights->bookcal->availabilities->read && !empty($conf->bookcal->enabled)) {
+if ($user->hasRight('bookcal', 'availabilities', 'read') && isModEnabled('bookcal')) {
 	$langs->load("orders");
 
 	$sql = "SELECT rowid, `ref`, fk_soc, fk_project, description, note_public, note_private, date_creation, tms, fk_user_creat, fk_user_modif, last_main_doc, import_key, model_pdf, status, firstname, lastname, email, `start`, duration";
@@ -143,8 +143,7 @@ $max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 /* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
 // Last modified myobject
-if (! empty($conf->bookcal->enabled))
-{
+if (isModEnabled('bookcal')) {
 	$sql = "SELECT rowid, `ref`, fk_soc, fk_project, description, note_public, note_private, date_creation, tms, fk_user_creat, fk_user_modif, last_main_doc, import_key, model_pdf, status, firstname, lastname, email, `start`, duration";
 	$sql .= " FROM ". MAIN_DB_PREFIX . 'bookcal_booking';
 	print "here2";
diff --git a/htdocs/bookcal/booking_agenda.php b/htdocs/bookcal/booking_agenda.php
index 10452e6640f..b171b953b42 100644
--- a/htdocs/bookcal/booking_agenda.php
+++ b/htdocs/bookcal/booking_agenda.php
@@ -100,7 +100,7 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden();
+if (!isModEnabled('bookcal')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/booking_card.php b/htdocs/bookcal/booking_card.php
index 8ce99806e2a..623bf142e60 100644
--- a/htdocs/bookcal/booking_card.php
+++ b/htdocs/bookcal/booking_card.php
@@ -97,7 +97,7 @@ $upload_dir = $conf->bookcal->multidir_output[isset($object->entity) ? $object->
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden();
+if (!isModEnabled('bookcal')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/booking_contact.php b/htdocs/bookcal/booking_contact.php
index e315b320cad..ceec965f5b2 100644
--- a/htdocs/bookcal/booking_contact.php
+++ b/htdocs/bookcal/booking_contact.php
@@ -65,7 +65,7 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden();
+if (!isModEnabled('bookcal')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/booking_document.php b/htdocs/bookcal/booking_document.php
index d4147051716..aadcb0f14c9 100644
--- a/htdocs/bookcal/booking_document.php
+++ b/htdocs/bookcal/booking_document.php
@@ -90,7 +90,7 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden();
+if (!isModEnabled('bookcal')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/booking_list.php b/htdocs/bookcal/booking_list.php
index ad72f61de65..618e8e9bb0e 100644
--- a/htdocs/bookcal/booking_list.php
+++ b/htdocs/bookcal/booking_list.php
@@ -147,7 +147,7 @@ if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, 0, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden('Module not enabled');
+if (!isModEnabled('bookcal')) accessforbidden('Module not enabled');
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/booking_note.php b/htdocs/bookcal/booking_note.php
index c1f2146ec57..5b00686fc27 100644
--- a/htdocs/bookcal/booking_note.php
+++ b/htdocs/bookcal/booking_note.php
@@ -70,7 +70,7 @@ if ($enablepermissioncheck) {
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->bookcal->enabled)) accessforbidden();
+if (!isModEnabled('bookcal')) accessforbidden();
 if (!$permissiontoread) accessforbidden();
 
 
diff --git a/htdocs/bookcal/class/availabilities.class.php b/htdocs/bookcal/class/availabilities.class.php
index 6b4502e3364..c7e86a9f589 100644
--- a/htdocs/bookcal/class/availabilities.class.php
+++ b/htdocs/bookcal/class/availabilities.class.php
@@ -201,7 +201,7 @@ class Availabilities extends CommonObject
 		}
 
 		// Example to show how to set values of fields definition dynamically
-		/*if ($user->rights->bookcal->availabilities->read) {
+		/*if ($user->hasRight('bookcal', 'availabilities', 'read')) {
 			$this->fields['myfield']['visible'] = 1;
 			$this->fields['myfield']['noteditable'] = 0;
 		}*/
@@ -516,7 +516,7 @@ class Availabilities extends CommonObject
 			return 0;
 		}
 
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bookcal->availabilities->write))
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->hasRight('bookcal', 'availabilities', 'write'))
 		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->bookcal->availabilities->availabilities_advance->validate))))
 		 {
 		 $this->error='NotEnoughPermissions';

From 72cb43f65b10a42747dc34d4587b0f5da937ce07 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 1 Mar 2023 16:40:01 +0100
Subject: [PATCH 199/300] New functionality for api_object

---
 htdocs/langs/en_US/modulebuilder.lang |   3 +-
 htdocs/langs/fr_FR/modulebuilder.lang |   1 +
 htdocs/modulebuilder/index.php        | 266 +++++++++++++++++++++-----
 3 files changed, 223 insertions(+), 47 deletions(-)

diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 3c442fcc84a..dbb4e53f94b 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -172,4 +172,5 @@ PermissionUpdatedSuccesfuly=Permission has been successfully updated
 PermissionAddedSuccesfuly=Permission has been successfully added
 MenuDeletedSuccessfuly=Menu has been successfully deleted
 MenuAddedSuccessfuly=Menu has been successfully added
-MenuUpdatedSuccessfuly=Menu has been successfully updated
\ No newline at end of file
+MenuUpdatedSuccessfuly=Menu has been successfully updated
+ApiObjectDeleted=API for object %s has been successfully deleted
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index b7f0cff3602..9000f85fee2 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -173,3 +173,4 @@ PermissionAddedSuccesfuly=Les permissions ont été ajoutées avec succès
 MenuDeletedSuccessfuly=Le menu a été supprimé avec succès
 MenuAddedSuccessfuly=Le menu a été ajouté avec succès
 MenuUpdatedSuccessfuly=Le menu a été mis à jour avec succès
+ApiObjectDeleted=API pour l'objet %s a été supprimé avec succès
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index d386fda721c..87311ce1259 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -403,6 +403,28 @@ if ($dirins && in_array($action, array('initapi', 'initphpunit', 'initpagecontac
 	$varnametoupdate = '';
 
 	if ($action == 'initapi') {
+		$dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
+		$destdir = $dirins.'/'.strtolower($module);
+		$listofobject = dol_dir_list($destdir.'/class', 'files', 0, '\.class\.php$');
+		$objects = array();
+		foreach ($listofobject as $fileobj) {
+			if (preg_match('/^api_/', $fileobj['name'])) {
+				continue;
+			}
+			if (preg_match('/^actions_/', $fileobj['name'])) {
+				continue;
+			}
+
+			$tmpcontent = file_get_contents($fileobj['fullname']);
+			$reg = array();
+			if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims', $tmpcontent, $reg)) {
+				$objectnameloop = $reg[1];
+				$objects[] = $objectnameloop;
+			}
+		}
+		if (file_exists($dirins.'/'.strtolower($module).'/class/api_'.strtolower($module).'.class.php')) {
+			$result = dol_copy(DOL_DOCUMENT_ROOT.'/modulebuilder/template/class/api_mymodule.class.php', $dirins.'/'.strtolower($module).'/class/api_'.strtolower($module).'.class.php', 0, 1);
+		}
 		dol_mkdir($dirins.'/'.strtolower($module).'/class');
 		$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 		$srcfile = $srcdir.'/class/api_mymodule.class.php';
@@ -440,7 +462,9 @@ if ($dirins && in_array($action, array('initapi', 'initphpunit', 'initpagecontac
 
 	//var_dump($srcfile);
 	//var_dump($destfile);
-	$result = dol_copy($srcfile, $destfile, 0, 0);
+	if (!file_exists($destfile)) {
+		$result = dol_copy($srcfile, $destfile, 0, 0);
+	}
 
 	if ($result > 0) {
 		//var_dump($phpfileval['fullname']);
@@ -458,8 +482,74 @@ if ($dirins && in_array($action, array('initapi', 'initphpunit', 'initpagecontac
 			'MYOBJECT'=>strtoupper($objectname),
 			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
 		);
+		if (count($objects) > 1) {
+			$file = $destfile;
+			$content = file($file);
+			$props = "public \$myobject;";
+			$varcomented = "@var MyObject \$myobject {@type MyObject}";
+			$constructObj = "\$this->myobject = new MyObject(\$this->db);";
+			// add properties and declare them in consturctor
+			foreach ($content as $lineNumber => &$lineContent) {
+				if (strpos($lineContent, $varcomented) !== false) {
+					$lineContent = '';
+					foreach ($objects as $object) {
+						$lineContent .= "\t * @var ".$object." \$".strtolower($object)." {@type ".$object."}". PHP_EOL;
+					}
+					//var_dump($lineContent);exit;
+				}
+				if (strpos($lineContent, $props) !== false) {
+					$lineContent = '';
+					foreach ($objects as $object) {
+						$lineContent .= "\tpublic \$".strtolower($object).";". PHP_EOL;
+					}
+				}
+				if (strpos($lineContent, $constructObj) !== false) {
+					$lineContent = '';
+					foreach ($objects as $object) {
+						$lineContent .= "\t\t\$this->".strtolower($object)."= new ".$object."(\$this->db);". PHP_EOL;
+					}
+				}
+			}
+			$allContent = implode("", $content);
+			file_put_contents($destfile, $allContent);
+		}
+		if (count($objects) > 1) {
+			$search = "/*begin methods CRUD*/";
+			// Open the file and read line by line
+			$handle = fopen($destfile, "r");
+				$i = 1;
+				$lines = array();
+				$props = " public \$myobject; ";
+			while (($line = fgets($handle)) !== false) {
+				//search line begin
+				if (strpos($line, $search) !== false) {
+					$start_line = $i;
 
-		dolReplaceInFile($destfile, $arrayreplacement);
+					// Copy lines until the end on array
+					while (($line = fgets($handle)) !== false) {
+						if (strpos($line, "/*end methods CRUD*/") !== false) {
+							$end_line = $i;
+							break;
+						}
+						$lines[] = $line;
+						$i++;
+					}
+					break;
+				}
+
+				$i++;
+			}
+			$allContent = implode("", $lines);
+
+			foreach ($objects as $object) {
+				$contentReplaced = str_replace(["myobject","MyObject"], [strtolower($object),$object], $allContent);
+				dolReplaceInFile($destfile, array('/*end methods CRUD*/' => '/*CRUD FOR '.strtoupper($object).'*/'."\n".$contentReplaced."\n\t".'/*END CRUD FOR '.strtoupper($object).'*/'."\n\t".'/*end methods CRUD*/'));
+			}
+				dolReplaceInFile($destfile, array($allContent => ''));
+			fclose($handle);
+		} else {
+			dolReplaceInFile($destfile, $arrayreplacement);
+		}
 
 		if ($varnametoupdate) {
 			// Now we update the object file to set $$varnametoupdate to 1
@@ -839,56 +929,138 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
 	$objectname = $tabobj;
 
 	$relativefilename = dol_sanitizePathName(GETPOST('file', 'restricthtml'));
-	if ($relativefilename) {
-		$dirnametodelete = dirname($relativefilename);
-		$filetodelete = $dirins.'/'.$relativefilename;
-		$dirtodelete  = $dirins.'/'.$dirnametodelete;
+	$file_api = $dirins."/".$relativefilename;
 
-		$result = dol_delete_file($filetodelete);
-		if (!$result) {
-			setEventMessages($langs->trans("ErrorFailToDeleteFile", basename($filetodelete)), null, 'errors');
-		} else {
-			// If we delete a .sql file, we delete also the other .sql file
-			if (preg_match('/\.sql$/', $relativefilename)) {
-				if (preg_match('/\.key\.sql$/', $relativefilename)) {
-					$relativefilename = preg_replace('/\.key\.sql$/', '.sql', $relativefilename);
-					$filetodelete = $dirins.'/'.$relativefilename;
-					$result = dol_delete_file($filetodelete);
-				} elseif (preg_match('/\.sql$/', $relativefilename)) {
-					$relativefilename = preg_replace('/\.sql$/', '.key.sql', $relativefilename);
-					$filetodelete = $dirins.'/'.$relativefilename;
-					$result = dol_delete_file($filetodelete);
+	//check if have more than one object
+	$dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
+	$destdir = $dirins.'/'.strtolower($module);
+	$listofobject = dol_dir_list($destdir.'/class', 'files', 0, '\.class\.php$');
+	$objects = array();
+
+	foreach ($listofobject as $fileobj) {
+		if (preg_match('/^api_/', $fileobj['name'])) {
+			continue;
+		}
+		if (preg_match('/^actions_/', $fileobj['name'])) {
+			continue;
+		}
+		$tmpcontent = file_get_contents($fileobj['fullname']);
+		$reg = array();
+		if (preg_match('/class\s+([^\s]*)\s+extends\s+CommonObject/ims', $tmpcontent, $reg)) {
+			$objectnameloop = $reg[1];
+			$objects[] = $objectnameloop;
+		}
+	}
+
+	$existObj = 0;
+	$file = file_get_contents($file_api);
+	$objs = array();
+	if (str_contains($file, $objectname)) {
+		$existObj++;
+	}
+	if ($existObj && count($objects) > 1) {
+		$begin = '/*CRUD FOR '.strtoupper($objectname).'*/';
+		$end = '/*END CRUD FOR '.strtoupper($objectname).'*/';
+		$varcomentedDel = "\t * @var ".$objectname." \$".strtolower($objectname)." {@type ".$objectname."}";
+		$propsDel .= "\tpublic \$".strtolower($objectname).";";
+		$constructObjDel .= "\t\t\$this->".strtolower($objectname)."= new ".$objectname."(\$this->db);";
+		$content = file($file_api);
+		// for delete property and the initialization from the construct
+		foreach ($content as $lineNumber => &$lineContent) {
+			if (strpos($lineContent, $varcomentedDel) !== false) {
+				$lineContent = '';
+			}
+			if (strpos($lineContent, $propsDel) !== false) {
+				$lineContent = '';
+			}
+			if (strpos($lineContent, $constructObjDel) !== false) {
+				$lineContent = '';
+			}
+		}
+		$allContent = implode("", $content);
+		file_put_contents($file_api, $allContent);
+		// for delete methods of object
+		$handle = fopen($file_api, "r");
+		$i = 1;
+		$lines = array();
+		while (($line = fgets($handle)) !== false) {
+			//search line begin
+			if (strpos($line, $begin) !== false) {
+				$start_line = $i;
+				// Copy lines until the end on array
+				while (($line = fgets($handle)) !== false) {
+					if (strpos($line, $end) !== false) {
+						$end_line = $i;
+						break;
+					}
+					$lines[] = $line;
+					$i++;
 				}
+				break;
 			}
+			$i++;
+		}
+		$allContent = implode("", $lines);
+		//var_dump($allContent);exit;
+		$check = dolReplaceInFile($file_api, array($allContent => ''));
+		if ($check) {
+			dolReplaceInFile($file_api, array($begin => '', $end => ''));
+			setEventMessages($langs->trans("ApiObjectDeleted"), null);
+		}
+		fclose($handle);
+	}
+	if (count($objects) == 1 && $existObj) {
+		if ($relativefilename) {
+			$dirnametodelete = dirname($relativefilename);
+			$filetodelete = $dirins.'/'.$relativefilename;
+			$dirtodelete  = $dirins.'/'.$dirnametodelete;
 
-			if (dol_is_dir_empty($dirtodelete)) {
-				dol_delete_dir($dirtodelete);
-			}
+			$result = dol_delete_file($filetodelete);
+			if (!$result) {
+				setEventMessages($langs->trans("ErrorFailToDeleteFile", basename($filetodelete)), null, 'errors');
+			} else {
+				// If we delete a .sql file, we delete also the other .sql file
+				if (preg_match('/\.sql$/', $relativefilename)) {
+					if (preg_match('/\.key\.sql$/', $relativefilename)) {
+						$relativefilename = preg_replace('/\.key\.sql$/', '.sql', $relativefilename);
+						$filetodelete = $dirins.'/'.$relativefilename;
+						$result = dol_delete_file($filetodelete);
+					} elseif (preg_match('/\.sql$/', $relativefilename)) {
+						$relativefilename = preg_replace('/\.sql$/', '.key.sql', $relativefilename);
+						$filetodelete = $dirins.'/'.$relativefilename;
+						$result = dol_delete_file($filetodelete);
+					}
+				}
 
-			// Update descriptor file to comment file
-			if (in_array($tab, array('css', 'js'))) {
-				$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
-				$arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>'                // \'/'.$relativefilename.'\',');
-				dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-			}
+				if (dol_is_dir_empty($dirtodelete)) {
+					dol_delete_dir($dirtodelete);
+				}
 
-			if (preg_match('/_extrafields/', $relativefilename)) {
-				// Now we update the object file to set $isextrafieldmanaged to 0
-				$srcfile = $dirins.'/'.strtolower($module).'/class/'.strtolower($objectname).'.class.php';
-				$arrayreplacement = array('/\$isextrafieldmanaged = 1;/' => '$isextrafieldmanaged = 0;');
-				dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
-			}
+				// Update descriptor file to comment file
+				if (in_array($tab, array('css', 'js'))) {
+					$srcfile = $dirins.'/'.strtolower($module).'/core/modules/mod'.$module.'.class.php';
+					$arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>'                // \'/'.$relativefilename.'\',');
+					dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
+				}
 
-			// Now we update the lib file to set $showtabofpagexxx to 0
-			$varnametoupdate = '';
-			$reg = array();
-			if (preg_match('/_([a-z]+)\.php$/', $relativefilename, $reg)) {
-				$varnametoupdate = 'showtabofpage'.$reg[1];
-			}
-			if ($varnametoupdate) {
-				$srcfile = $dirins.'/'.strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php';
-				$arrayreplacement = array('/\$'.$varnametoupdate.' = 1;/' => '$'.$varnametoupdate.' = 0;');
-				dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
+				if (preg_match('/_extrafields/', $relativefilename)) {
+					// Now we update the object file to set $isextrafieldmanaged to 0
+					$srcfile = $dirins.'/'.strtolower($module).'/class/'.strtolower($objectname).'.class.php';
+					$arrayreplacement = array('/\$isextrafieldmanaged = 1;/' => '$isextrafieldmanaged = 0;');
+					dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
+				}
+
+				// Now we update the lib file to set $showtabofpagexxx to 0
+				$varnametoupdate = '';
+				$reg = array();
+				if (preg_match('/_([a-z]+)\.php$/', $relativefilename, $reg)) {
+					$varnametoupdate = 'showtabofpage'.$reg[1];
+				}
+				if ($varnametoupdate) {
+					$srcfile = $dirins.'/'.strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php';
+					$arrayreplacement = array('/\$'.$varnametoupdate.' = 1;/' => '$'.$varnametoupdate.' = 0;');
+					dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
+				}
 			}
 		}
 	}
@@ -3666,6 +3838,8 @@ if ($module == 'initmodule') {
 						$urloflist = dol_buildpath('/'.$pathtolist, 1);
 						$urlofcard = dol_buildpath('/'.$pathtocard, 1);
 
+						$file = file_get_contents($realpathtoapi);
+						$objs = array();
 
 						print '<!-- section for object -->';
 						print '<div class="fichehalfleft smallxxx">';
@@ -3686,7 +3860,7 @@ if ($module == 'initmodule') {
 						// API file
 						print '<br>';
 						print '<span class="fa fa-file-o"></span> '.$langs->trans("ApiClassFile").' : <strong class="wordbreak">'.(dol_is_file($realpathtoapi) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtoapi).(dol_is_file($realpathtoapi)?'':'</span></strike>').'</strong>';
-						if (dol_is_file($realpathtoapi)) {
+						if (dol_is_file($realpathtoapi) && preg_match('/var '.$tabobj.'\s+([^\s]*)\s/ims', $file, $objs)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.urlencode($tab).'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';

From aa3556e676fdcf95a0243cf7a5c9d719e541b0b3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 16:48:35 +0100
Subject: [PATCH 200/300] Look and feel v18

---
 htdocs/core/lib/functions.lib.php           | 12 ++++----
 htdocs/public/members/new.php               | 31 +++++++++++++--------
 htdocs/public/partnership/new.php           | 23 ++++++++++-----
 htdocs/public/payment/paymentok.php         |  2 +-
 htdocs/public/project/new.php               |  8 +++---
 htdocs/public/project/suggestbooth.php      | 12 ++++----
 htdocs/public/project/suggestconference.php | 14 +++++-----
 htdocs/theme/eldy/global.inc.php            | 15 ++++++++--
 htdocs/theme/md/style.css.php               |  3 +-
 9 files changed, 75 insertions(+), 45 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 23d593cba8f..7859bf9f456 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -4006,8 +4006,9 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
  *	Show picto whatever it's its name (generic function)
  *
  *	@param      string		$titlealt         		Text on title tag for tooltip. Not used if param notitle is set to 1.
- *	@param      string		$picto       			Name of image file to show ('filenew', ...)
- *													If no extension provided, we use '.png'. Image must be stored into theme/xxx/img directory.
+ *	@param      string		$picto       			Name of image file to show ('filenew', ...).
+ *													For font awesome icon (example 'user'), you can use picto_nocolor to not have the color of picto forced.
+ *													If no extension provided and it is not a font awesome icon, we use '.png'. Image must be stored into theme/xxx/img directory.
  *                                  				Example: picto.png                  if picto.png is stored into htdocs/theme/mytheme/img
  *                                  				Example: picto.png@mymodule         if picto.png is stored into htdocs/mymodule/img
  *                                  				Example: /mydir/mysubdir/picto.png  if picto.png is stored into htdocs/mydir/mysubdir (pictoisfullpath must be set to 1)
@@ -4045,6 +4046,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 	} else {
 		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
 		$pictowithouttext = str_replace('object_', '', $pictowithouttext);
+		$pictowithouttext = str_replace('_nocolor', '', $pictowithouttext);
 
 		if (strpos($pictowithouttext, 'fontawesome_') !== false || preg_match('/^fa-/', $pictowithouttext)) {
 			// This is a font awesome image 'fonwtawesome_xxx' or 'fa-xxx'
@@ -4102,7 +4104,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'edit', 'ellipsis-h', 'email', 'entity', 'envelope', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt', 'eye',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
 				'gears', 'generate', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
-				'help', 'holiday',
+				'hands-helping', 'help', 'holiday',
 				'id-card', 'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'jobprofile',
 				'knowledgemanagement',
 				'label', 'language', 'line', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lock', 'lot', 'long-arrow-alt-right',
@@ -4254,7 +4256,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				//'title_setup'=>'infobox-action', 'tools'=>'infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
 			);
-			if (!empty($arrayconvpictotomorcess[$pictowithouttext])) {
+			if (!empty($arrayconvpictotomorcess[$pictowithouttext]) && strpos($picto, '_nocolor') === false) {
 				$morecss .= ($morecss ? ' ' : '').$arrayconvpictotomorcess[$pictowithouttext];
 			}
 
@@ -4274,7 +4276,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'uncheck'=>'#800', 'uparrow'=>'#555', 'user-cog'=>'#999', 'country'=>'#aaa', 'globe-americas'=>'#aaa', 'region'=>'#aaa', 'state'=>'#aaa',
 				'website'=>'#304', 'workstation'=>'#a69944'
 			);
-			if (isset($arrayconvpictotocolor[$pictowithouttext])) {
+			if (isset($arrayconvpictotocolor[$pictowithouttext]) && strpos($picto, '_nocolor') === false) {
 				$facolor = $arrayconvpictotocolor[$pictowithouttext];
 			}
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 953040d73af..ed3f256f71f 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -161,10 +161,17 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
  */
 function llxFooterVierge()
 {
+	global $conf;
+
 	print '</div>';
 
 	printCommonFooter('public');
 
+	if (!empty($conf->use_javascript_ajax)) {
+		print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+		print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
+	}
+
 	print "</body>\n";
 	print "</html>\n";
 }
@@ -507,7 +514,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); // fetch optio
 llxHeaderVierge($langs->trans("NewSubscription"));
 
 print '<br>';
-print load_fiche_titre($langs->trans("NewSubscription"), '', '', 0, 0, 'center');
+print load_fiche_titre(img_picto('', 'member_nocolor', 'class="pictofixedwidth"').' &nbsp; '.$langs->trans("NewSubscription"), '', '', 0, 0, 'center');
 
 
 print '<div align="center">';
@@ -532,7 +539,9 @@ print '<input type="hidden" name="entity" value="'.$entity.'" />';
 if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEWFORM_FORCETYPE) || $action == 'create') {
 	print '<input type="hidden" name="action" value="add" />';
 	print '<br>';
-	print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
+
+	$messagemandatory = '<span class="">'.$langs->trans("FieldsWithAreMandatory", '*').'</span>';
+	//print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
 	//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
 
 	print dol_get_fiche_head('');
@@ -579,7 +588,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 			$defaulttype = $tmp[0];
 			$isempty = 0;
 		}
-		print '<tr><td class="titlefield">'.$langs->trans("Type").' <span style="color: red">*</span></td><td>';
+		print '<tr><td class="titlefield classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Type").' <span class="star">*</span></td><td>';
 		print $form->selectarray("typeid", $adht->liste_array(1), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
 		print '</td></tr>'."\n";
 	} else {
@@ -591,7 +600,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	$morphys["phy"] = $langs->trans("Physical");
 	$morphys["mor"] = $langs->trans("Moral");
 	if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
-		print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <span style="color: red">*</span></td><td>'."\n";
+		print '<tr class="morphy"><td class="titlefield classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans('MemberNature').' <span class="star">*</span></td><td>'."\n";
 		print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
 		print '</td></tr>'."\n";
 	} else {
@@ -609,21 +618,21 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	print $formcompany->select_civility(GETPOST('civility_id'), 'civility_id').'</td></tr>'."\n";
 
 	// Lastname
-	print '<tr><td>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+	print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Lastname").' <span class="star">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
 
 	// Firstname
-	print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
+	print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Firstname").' <span class="star">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
 
 	// EMail
-	print '<tr><td>'.$langs->trans("Email").(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? ' <span style="color:red;">*</span>' : '').'</td><td>';
+	print '<tr><td class="'.(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? 'classfortooltip' : '').'" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Email").(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? ' <span class="star">*</span>' : '').'</td><td>';
 	//print img_picto('', 'email', 'class="pictofixedwidth"');
 	print '<input type="text" name="email" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-		print '<tr><td>'.$langs->trans("Login").' <span style="color: red">*</span></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
-		print '<tr><td>'.$langs->trans("Password").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass1", "none", 2)).'"></td></tr>'."\n";
-		print '<tr><td>'.$langs->trans("PasswordRetype").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
+		print '<tr><td>'.$langs->trans("Login").' <span class="star">*</span></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
+		print '<tr><td>'.$langs->trans("Password").' <span class="star">*</span></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass1", "none", 2)).'"></td></tr>'."\n";
+		print '<tr><td>'.$langs->trans("PasswordRetype").' <span class="star">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
 	}
 
 	// Gender
@@ -699,7 +708,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW
 	// TODO Move this into generic feature.
 	if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
 		$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
-		print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <span style="color: red">*</span></td><td>';
+		print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <span class="star">*</span></td><td>';
 		print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
 		print ' € or $';
 
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index 4fa4d25e543..9891a9f3c9d 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -150,10 +150,17 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
  */
 function llxFooterVierge()
 {
+	global $conf;
+
 	print '</div>';
 
 	printCommonFooter('public');
 
+	if (!empty($conf->use_javascript_ajax)) {
+		print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
+		print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
+	}
+
 	print "</body>\n";
 	print "</html>\n";
 }
@@ -163,6 +170,7 @@ function llxFooterVierge()
 /*
  * Actions
  */
+
 $parameters = array();
 // Note that $action and $object may have been modified by some hooks
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
@@ -536,7 +544,7 @@ $extrafields->fetch_name_optionals_label($object->table_element); // fetch optio
 llxHeaderVierge($langs->trans("NewPartnershipRequest"));
 
 print '<br>';
-print load_fiche_titre($langs->trans("NewPartnershipRequest"), '', '', 0, 0, 'center');
+print load_fiche_titre(img_picto('', 'hands-helping', 'class="pictofixedwidth"').' &nbsp; '.$langs->trans("NewPartnershipRequest"), '', '', 0, 0, 'center');
 
 
 print '<div align="center">';
@@ -560,7 +568,8 @@ print '<input type="hidden" name="action" value="add" />';
 
 print '<br>';
 
-print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
+$messagemandatory = '<span class="">'.$langs->trans("FieldsWithAreMandatory", '*').'</span>';
+//print '<br><span class="opacitymedium small">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
 //print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
 
 print dol_get_fiche_head('');
@@ -592,20 +601,20 @@ if (getDolGlobalString('PARTNERSHIP_NEWFORM_FORCETYPE')) {
 
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 if (!getDolGlobalString('PARTNERSHIP_NEWFORM_FORCETYPE')) {
-	print '<tr class="morphy"><td>'.$langs->trans('PartnershipType').' <span style="color: red">*</span></td><td>'."\n";
+	print '<tr class="morphy"><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans('PartnershipType').' <span class="star">*</span></td><td>'."\n";
 	print $form->selectarray("partnershiptype", $listofpartnership, GETPOSTISSET('partnershiptype') ? GETPOST('partnershiptype', 'int') : 'ifone', 1);
 	print '</td></tr>'."\n";
 }
 // Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").' <span style="color:red;">*</span></td><td>';
+print '<tr id="trcompany" class="trcompany"><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Company").' <span class="star">*</span></td><td>';
 print img_picto('', 'company', 'class="pictofixedwidth"');
 print '<input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Lastname
-print '<tr><td>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Lastname").' <span class="star">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
 // Firstname
-print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
+print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Firstname").' <span class="star">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
 // EMail
-print '<tr><td>'.$langs->trans("Email").' <span style="color:red;">*</span></td><td>';
+print '<tr><td class="classfortooltip" title="'.dol_escape_htmltag($messagemandatory).'">'.$langs->trans("Email").' <span class="star">*</span></td><td>';
 //print img_picto('', 'email', 'class="pictofixedwidth"');
 print '<input type="text" name="email" maxlength="255" class="minwidth200" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
 // Address
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index cf7293109c7..2777e48c7f5 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -1663,7 +1663,7 @@ if ($ispaymentok) {
 			$content .= $companylangs->transnoentitiesnoconv("None");
 		} else {
 			$topic .= ($ispostactionok ? '' : ' ('.$companylangs->trans("WarningPostActionErrorAfterPayment").')');
-			$content .= '<span style="color: red">'.$companylangs->transnoentitiesnoconv("Error").'</span>';
+			$content .= '<span class="star">'.$companylangs->transnoentitiesnoconv("Error").'</span>';
 		}
 		$content .= '<br>'."\n";
 		foreach ($postactionmessages as $postactionmessage) {
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 5644123392b..bd8ccd07901 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -486,11 +486,11 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Lastname
-print '<tr><td>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'" required></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Lastname").' <span class="star">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'" required></td></tr>'."\n";
 // Firstname
-print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'" required></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Firstname").' <span class="star">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'" required></td></tr>'."\n";
 // EMail
-print '<tr><td>'.$langs->trans("Email").' <span style="color: red">*</span></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'" required></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Email").' <span class="star">*</span></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'" required></td></tr>'."\n";
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
@@ -538,7 +538,7 @@ $parameters['tpl_context']='public';	// define template context to public
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 // Comments
 print '<tr>';
-print '<td class="tdtop">'.$langs->trans("Message").' <span style="color: red">*</span></td>';
+print '<td class="tdtop">'.$langs->trans("Message").' <span class="star">*</span></td>';
 print '<td class="tdtop"><textarea name="description" id="description" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_5.'" required>'.dol_escape_htmltag(GETPOST('description', 'restricthtml'), 0, 1).'</textarea></td>';
 print '</tr>'."\n";
 
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index dd9c8c7cdb0..cc7b6bb8e01 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -595,13 +595,13 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Name
-print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<span style="color: red">*</span></label></td>';
+print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<span class="star">*</span></label></td>';
 print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
 print '</tr>';
 // Email
-print '<tr><td>'.$langs->trans("Email").'<span style="color: red">*</span></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").'<span class="star">*</span></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").'<span style="color: red">*</span>';
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<span class="star">*</span>';
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
@@ -646,13 +646,13 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '</td></tr>';
 }
 // Type of event
-print '<tr><td>'.$langs->trans("Format").'<span style="color: red">*</span></td>'."\n";
+print '<tr><td>'.$langs->trans("Format").'<span class="star">*</span></td>'."\n";
 print '<td>'.Form::selectarray('eventtype', $arrayofconfboothtype, $eventtype, 1).'</td>';
 // Label
-print '<tr><td>'.$langs->trans("LabelOfBooth").'<span style="color: red">*</span></td>'."\n";
+print '<tr><td>'.$langs->trans("LabelOfBooth").'<span class="star">*</span></td>'."\n";
 print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
 // Note
-print '<tr><td>'.$langs->trans("Description").'<span style="color: red">*</span></td>'."\n";
+print '<tr><td>'.$langs->trans("Description").'<span class="star">*</span></td>'."\n";
 print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
 
 print "</table>\n";
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index 417466a1f44..5078164f6ce 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -528,17 +528,17 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Last Name
-print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<span style="color: red">*</span></label></td>';
+print '<tr><td><label for="lastname">'.$langs->trans("Lastname").'<span class="star">*</span></label></td>';
 print '<td colspan="3"><input name="lastname" id="lastname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("lastname", 'alpha') ?GETPOST("lastname", 'alpha') : $object->lastname).'" autofocus="autofocus"></td>';
 print '</tr>';
 // First Name
-print '<tr><td><label for="firstname">'.$langs->trans("Firstname").'<span style="color: red">*</span></label></td>';
+print '<tr><td><label for="firstname">'.$langs->trans("Firstname").'<span class="star">*</span></label></td>';
 print '<td colspan="3"><input name="firstname" id="firstname" type="text" class="maxwidth100onsmartphone" maxlength="80" value="'.dol_escape_htmltag(GETPOST("firstname", 'alpha') ?GETPOST("firstname", 'alpha') : $object->firstname).'" autofocus="autofocus"></td>';
 print '</tr>';
 // Email
-print '<tr><td>'.$langs->trans("Email").'<span style="color: red">*</span></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").'<span class="star">*</span></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").'<span style="color: red">*</span>';
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'<span class="star">*</span>';
 print ' </td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
@@ -580,13 +580,13 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '</td></tr>';
 }
 // Type of event
-print '<tr><td>'.$langs->trans("Format").'<span style="color: red">*</span></td>'."\n";
+print '<tr><td>'.$langs->trans("Format").'<span class="star">*</span></td>'."\n";
 print '<td>'.Form::selectarray('eventtype', $arrayofconfboothtype, $eventtype, 1).'</td>';
 // Label
-print '<tr><td>'.$langs->trans("LabelOfconference").'<span style="color: red">*</span></td>'."\n";
+print '<tr><td>'.$langs->trans("LabelOfconference").'<span class="star">*</span></td>'."\n";
 print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
 // Note
-print '<tr><td>'.$langs->trans("Description").'<span style="color: red">*</span></td>'."\n";
+print '<tr><td>'.$langs->trans("Description").'<span class="star">*</span></td>'."\n";
 print '<td><textarea name="note" id="note" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
 
 print "</table>\n";
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fc0af24a3a1..307d2b25b69 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -411,8 +411,8 @@ input.buttonpaymentstripe {
 	background-position: 8px 11px;
 }
 .logopublicpayment #dolpaymentlogo {
-	max-height: 100px;
-	max-width: 320px;
+	max-height: 80px;
+	max-width: 300px;
 	image-rendering: -webkit-optimize-contrast;		/* better rendering on public page header */
 }
 
@@ -7114,8 +7114,17 @@ div.tabsElem a.tab {
 .public_border {
 	border: 1px solid #888;
 }
+.publicnewmemberform div.tabBarWithBottom {
+	border: 1px solid #f0f0f0;
+	padding: 30px;
+	border-radius: 8px;
+	background-color: #f8f8f8;
+	/*box-shadow: 2px 2px 10px #ddd;*/
+}
 
-
+.publicnewmemberform #tablesubscribe {
+	color: #888;
+}
 
 /* ============================================================================== */
 /* Ticket module                                                                  */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 9d7737bc0ca..5f3f965c021 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -669,7 +669,8 @@ input.buttonpaymentstripe {
 	background-position: 8px 7px;
 }
 .logopublicpayment #dolpaymentlogo {
-	max-height: 100px;
+	max-height: 80px;
+	max-width: 300px;
 	image-rendering: -webkit-optimize-contrast;		/* better rendering on public page header */
 }
 a.butStatus {

From f362c66b28967a1da925edfa4204285c9eeb2aa1 Mon Sep 17 00:00:00 2001
From: Maximilien Rozniecki <mrozniecki@easya.solutions>
Date: Wed, 1 Mar 2023 16:54:49 +0100
Subject: [PATCH 201/300] changed  by ->db inside ticket.class.php

---
 htdocs/ticket/class/ticket.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index ce0997c7a02..09c9c07977f 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -3038,7 +3038,7 @@ class Ticket extends CommonObject
 	 */
 	public function removeClosedContact($to)
 	{
-		global $db, $langs;
+		global $langs;
 		$langs->load("ticket");
 
 		if (isset($this->id)) {
@@ -3048,11 +3048,11 @@ class Ticket extends CommonObject
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sc on (ec.fk_socpeople = sc.rowid AND tc.source = 'external')";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u on (ec.fk_socpeople = u.rowid AND tc.source = 'internal')";
 			$sql .= " WHERE IF(tc.source = 'external', sc.statut = 1, u.statut = 1)";
-			$resql = $db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql) {
-				$num = $db->num_rows($resql);
+				$num = $this->db->num_rows($resql);
 				for ($i = 0; $num > $i; $i++) {
-					$non_closed_contacts[] = $db->fetch_row($resql);
+					$non_closed_contacts[] = $this->db->fetch_row($resql);
 				}
 			}
 			$to = array_filter($to, function($v, $k) use($non_closed_contacts, $langs) {

From 921cd13f266b42a234940b4b3b3fa55ecb7f7920 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Wed, 1 Mar 2023 17:38:38 +0100
Subject: [PATCH 202/300] FIX avoid php8 warnings

---
 htdocs/core/class/html.formticket.class.php | 8 ++++----
 htdocs/ticket/agenda.php                    | 3 +++
 htdocs/ticket/contact.php                   | 2 +-
 htdocs/ticket/document.php                  | 3 +++
 htdocs/ticket/messaging.php                 | 3 +++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 4f3ae4bc5e6..0baa4dd5f8a 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1423,7 +1423,7 @@ class FormTicket
 			$res = $ticketstat->fetch('', '', $this->track_id);
 
 			print '<tr><td></td><td>';
-			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : ($conf->global->TICKETS_MESSAGE_FORCE_MAIL?'checked':''));
+			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : (getDolGlobalInt('TICKETS_MESSAGE_FORCE_MAIL')?'checked':''));
 			print '<input type="checkbox" name="send_email" value="1" id="send_msg_email" '.$checkbox_selected.'/> ';
 			print '<label for="send_msg_email">'.$langs->trans('SendMessageByEmail').'</label>';
 			$texttooltip = $langs->trans("TicketMessageSendEmailHelp", '{s1}');
@@ -1455,7 +1455,7 @@ class FormTicket
 
 			// Subject
 			print '<tr class="email_line"><td>'.$langs->trans('Subject').'</td>';
-			print '<td><input type="text" class="text minwidth500" name="subject" value="['.$conf->global->MAIN_INFO_SOCIETE_NOM.' - '.$langs->trans("Ticket").' '.$ticketstat->ref.'] '.$langs->trans('TicketNewMessage').'" />';
+			print '<td><input type="text" class="text minwidth500" name="subject" value="['.getDolGlobalString('MAIN_INFO_SOCIETE_NOM').' - '.$langs->trans("Ticket").' '.$ticketstat->ref.'] '.$langs->trans('TicketNewMessage').'" />';
 			print '</td></tr>';
 
 			// Recipients / adressed-to
@@ -1489,8 +1489,8 @@ class FormTicket
 					}
 				}
 
-				if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) {
-					$sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO.' <small class="opacitymedium">(generic email)</small>';
+				if (getDolGlobalInt('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS')) {
+					$sendto[] = getDolGlobalString('TICKET_NOTIFICATION_EMAIL_TO').' <small class="opacitymedium">(generic email)</small>';
 				}
 
 				// Print recipient list
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index a78a610ed1c..ce872c7ac38 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -46,6 +46,9 @@ $track_id = GETPOST('track_id', 'alpha', 3);
 $socid    = GETPOST('socid', 'int');
 $action   = GETPOST('action', 'aZ09');
 
+// Store current page url
+$url_page_current = DOL_URL_ROOT.'/ticket/agenda.php';
+
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index b5453ed638b..38d00de71fa 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -252,7 +252,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 
 		$linkback = '<a href="'.dol_buildpath('/ticket/list.php', 1).'"><strong>'.$langs->trans("BackToList").'</strong></a> ';
 
-		dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, $param, 0, '', '', 1, '');
+		dol_banner_tab($object, 'ref', $linkback, (!empty($user->socid) ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1, '');
 
 		print dol_get_fiche_end();
 
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index 1c7a25323e2..9c2208e9864 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -49,6 +49,9 @@ $track_id = GETPOST('track_id', 'alpha');
 $action   = GETPOST('action', 'alpha');
 $confirm  = GETPOST('confirm', 'alpha');
 
+// Store current page url
+$url_page_current = DOL_URL_ROOT.'/ticket/document.php';
+
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 1ad01a7ae67..b42cff070f2 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -46,6 +46,9 @@ $track_id = GETPOST('track_id', 'alpha', 3);
 $socid    = GETPOST('socid', 'int');
 $action   = GETPOST('action', 'aZ09');
 
+// Store current page url
+$url_page_current = DOL_URL_ROOT.'/ticket/messaging.php';
+
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');

From a5703a9618a6c50d230d5c24a090f6483f1f7f48 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 1 Mar 2023 18:15:15 +0100
Subject: [PATCH 203/300] fix message for delete api

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

diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 87311ce1259..16464caa03a 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1005,7 +1005,7 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
 		$check = dolReplaceInFile($file_api, array($allContent => ''));
 		if ($check) {
 			dolReplaceInFile($file_api, array($begin => '', $end => ''));
-			setEventMessages($langs->trans("ApiObjectDeleted"), null);
+			setEventMessages($langs->trans("ApiObjectDeleted", $langs->transnoentities($objectname)), null);
 		}
 		fclose($handle);
 	}

From 64440da194c2274f0ae5e9118f21246f06246b07 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 18:43:52 +0100
Subject: [PATCH 204/300] css

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 htdocs/theme/md/style.css.php    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 307d2b25b69..6a31211db45 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -7123,7 +7123,7 @@ div.tabsElem a.tab {
 }
 
 .publicnewmemberform #tablesubscribe {
-	color: #888;
+	color: #666;
 }
 
 /* ============================================================================== */
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 5f3f965c021..3702f5bfdbb 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -7043,6 +7043,10 @@ border-top-right-radius: 6px;
 	border: 1px solid #888;
 }
 
+.publicnewmemberform #tablesubscribe {
+	color: #666;
+}
+
 
 /* ============================================================================== */
 /* Ticket module                                                                  */

From f6271d83dbebb2bb2ea90791c32a62e722cf16bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 19:28:32 +0100
Subject: [PATCH 205/300] Debug v17

---
 htdocs/admin/agenda.php                       |   4 +
 htdocs/core/modules/modPartnership.class.php  |  30 +++---
 ...terface_50_modAgenda_ActionsAuto.class.php |   4 +-
 .../mysql/data/llx_c_action_trigger.sql       |   9 ++
 .../modulebuilder/template/myobject_card.php  |   2 +-
 htdocs/partnership/admin/about.php            |  74 -------------
 htdocs/partnership/partnership_card.php       | 100 ++++++++++--------
 7 files changed, 85 insertions(+), 138 deletions(-)
 delete mode 100644 htdocs/partnership/admin/about.php

diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index 0969dc9c66b..7a29c881f77 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -194,6 +194,10 @@ if (!empty($triggers)) {
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_UNBILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
 				continue;
 			}
+			if ($trigger['code'] == 'ACTION_CREATE') {
+				// This is the trigger to add an event, enabling it will create infinite loop
+				continue;
+			}
 
 			if ($search_event === '' || preg_match('/'.preg_quote($search_event, '/').'/i', $trigger['code'])) {
 				print '<!-- '.$trigger['position'].' -->';
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index 8e8421540c7..44ef6b527db 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -212,7 +212,7 @@ class modPartnership extends DolibarrModules
 
 		// Dictionaries
 		$this->dictionaries=array(
-			'langs'=>'partnership@partnership',
+			'langs'=>'partnership',
 			// List of tables we want to see into dictonnary editor
 			'tabname'=>array("c_partnership_type"),
 			// Label of tables
@@ -291,7 +291,7 @@ class modPartnership extends DolibarrModules
 		//     'leftmenu'=>'partnership',
 		//     'url'=>'/partnership/partnership_list.php',
 		//     // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-		//     'langs'=>'partnership@partnership',
+		//     'langs'=>'partnership',
 		//     'position'=>1100+$r,
 		//     // Define condition to show or hide menu entry. Use '$conf->partnership->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
 		//     'enabled'=>'$conf->partnership->enabled',
@@ -349,18 +349,18 @@ class modPartnership extends DolibarrModules
 		$r = 1;
 		/* BEGIN MODULEBUILDER EXPORT PARTNERSHIP */
 		/*
-		$langs->load("partnership@partnership");
+		$langs->load("partnership");
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='PartnershipLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_icon[$r]='partnership@partnership';
+		$this->export_icon[$r]='partnership';
 		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
-		$keyforclass = 'Partnership'; $keyforclassfile='/partnership/class/partnership.class.php'; $keyforelement='partnership@partnership';
+		$keyforclass = 'Partnership'; $keyforclassfile='/partnership/class/partnership.class.php'; $keyforelement='partnership';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
 		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
 		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
 		//$keyforclass = 'PartnershipLine'; $keyforclassfile='/partnership/class/partnership.class.php'; $keyforelement='partnershipline@partnership'; $keyforalias='tl';
 		//include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-		$keyforselect='partnership'; $keyforaliasextra='extra'; $keyforelement='partnership@partnership';
+		$keyforselect='partnership'; $keyforaliasextra='extra'; $keyforelement='partnership';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		//$keyforselect='partnershipline'; $keyforaliasextra='extraline'; $keyforelement='partnershipline@partnership';
 		//include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -380,13 +380,13 @@ class modPartnership extends DolibarrModules
 		$r = 1;
 		/* BEGIN MODULEBUILDER IMPORT PARTNERSHIP */
 		/*
-		 $langs->load("partnership@partnership");
+		 $langs->load("partnership");
 		 $this->export_code[$r]=$this->rights_class.'_'.$r;
 		 $this->export_label[$r]='PartnershipLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		 $this->export_icon[$r]='partnership@partnership';
-		 $keyforclass = 'Partnership'; $keyforclassfile='/partnership/class/partnership.class.php'; $keyforelement='partnership@partnership';
+		 $this->export_icon[$r]='partnership';
+		 $keyforclass = 'Partnership'; $keyforclassfile='/partnership/class/partnership.class.php'; $keyforelement='partnership';
 		 include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-		 $keyforselect='partnership'; $keyforaliasextra='extra'; $keyforelement='partnership@partnership';
+		 $keyforselect='partnership'; $keyforaliasextra='extra'; $keyforelement='partnership';
 		 include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		 //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
 		 $this->export_sql_start[$r]='SELECT DISTINCT ';
@@ -417,11 +417,11 @@ class modPartnership extends DolibarrModules
 		// Create extrafields during init
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		//$extrafields = new ExtraFields($this->db);
-		//$result1=$extrafields->addExtraField('partnership_myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'partnership@partnership', '$conf->partnership->enabled');
-		//$result2=$extrafields->addExtraField('partnership_myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'partnership@partnership', '$conf->partnership->enabled');
-		//$result3=$extrafields->addExtraField('partnership_myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'partnership@partnership', '$conf->partnership->enabled');
-		//$result4=$extrafields->addExtraField('partnership_myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'partnership@partnership', '$conf->partnership->enabled');
-		//$result5=$extrafields->addExtraField('partnership_myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'partnership@partnership', '$conf->partnership->enabled');
+		//$result1=$extrafields->addExtraField('partnership_myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'partnership', '$conf->partnership->enabled');
+		//$result2=$extrafields->addExtraField('partnership_myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'partnership', '$conf->partnership->enabled');
+		//$result3=$extrafields->addExtraField('partnership_myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'partnership', '$conf->partnership->enabled');
+		//$result4=$extrafields->addExtraField('partnership_myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'partnership', '$conf->partnership->enabled');
+		//$result5=$extrafields->addExtraField('partnership_myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'partnership', '$conf->partnership->enabled');
 
 		// Permissions
 		$this->remove($options);
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index d8b57918d83..f4c515c1f24 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -981,6 +981,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 				$object->trackid = 'sub'.$object->id;
 			} elseif (preg_match('/^MEMBER_/', $action)) {
 				$object->trackid = 'mem'.$object->id;
+			} elseif (preg_match('/^PARTNERSHIP_/', $action)) {
+				$object->trackid = 'pship'.$object->id;
 			} elseif (preg_match('/^PROJECT_/', $action)) {
 				$object->trackid = 'proj'.$object->id;
 			} elseif (preg_match('/^TASK_/', $action)) {
@@ -1079,7 +1081,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$actioncomm->errors_to     = empty($object->errors_to) ? null : $object->errors_to;
 		}
 
-		// Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
+		// Object linked (if link is for thirdparty, contact or project, it is a recording error. We should not have links in link table
 		// for such objects because there is already a dedicated field into table llx_actioncomm or llx_actioncomm_resources.
 		if (!in_array($elementtype, array('societe', 'contact', 'project'))) {
 			$actioncomm->fk_element  = $elementid;
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index 9aa28c116c8..ad33a4e4f6a 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -150,6 +150,8 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 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);
+
+-- recruitment module
 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);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504);
@@ -178,3 +180,10 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_MODIFY','Template invoices update','Executed when a Template invoices is updated','facturerec',901);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_DELETE','Template invoices deleted','Executed when a Template invoices is deleted','facturerec',902);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_AUTOCREATEBILL','Template invoices use to create invoices with auto batch','Executed when a Template invoices is use to create invoice with auto batch','facturerec',903);
+
+-- partnership module
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_CREATE','Partnership created','Executed when a partnership is created','partnership',58000);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_MODIFY','Partnership modified','Executed when a partnership is modified','partnership',58002);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_SENTBYMAIL','Mails sent from partnership file','Executed when you send email from partnership file','partnership',58004);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PARTNERSHIP_DELETE','Partnership deleted','Executed when a partnership is deleted','partnership',58006);
+
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 6bb89d1aaf7..dc8dafd433e 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -511,7 +511,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
-				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
+				print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle');
 			}
 
 			// Back to draft
diff --git a/htdocs/partnership/admin/about.php b/htdocs/partnership/admin/about.php
deleted file mode 100644
index 47423bf4709..00000000000
--- a/htdocs/partnership/admin/about.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2021 Dorian Laurent <i.merraha@sofimedmaroc.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    partnership/admin/about.php
- * \ingroup partnership
- * \brief   About page of module Partnership.
- */
-
-// Load Dolibarr environment
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once '../lib/partnership.lib.php';
-
-// Translations
-$langs->loadLangs(array("errors", "admin", "partnership@partnership"));
-
-// Access control
-if (!$user->admin) {
-	accessforbidden();
-}
-
-// Parameters
-$action = GETPOST('action', 'aZ09');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-
-/*
- * Actions
- */
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-$page_name = "PartnershipAbout";
-llxHeader('', $langs->trans($page_name));
-
-// Subheader
-$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
-
-print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
-
-// Configuration header
-$head = partnershipAdminPrepareHead();
-print dol_get_fiche_head($head, 'about', '', 0, 'partnership@partnership');
-
-require_once DOL_DOCUMENT_ROOT.'/core/modules/modPartnership.class.php';
-$tmpmodule = new modPartnership($db);
-print $tmpmodule->getDescLong();
-
-// Page end
-print dol_get_fiche_end();
-llxFooter();
-$db->close();
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index b544ad94fc7..7679b63da09 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -39,10 +39,11 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'partnershipcard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 $lineid   = GETPOST('lineid', 'int');
+$dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
 
 // Initialize technical objects
 $object = new Partnership($db);
@@ -73,20 +74,25 @@ if (empty($action) && empty($id) && empty($ref)) {
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 
-$permissiontoread 		= $user->rights->partnership->read;
-$permissiontoadd 		= $user->rights->partnership->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete 	= $user->rights->partnership->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$permissionnote 		= $user->rights->partnership->write; // Used by the include of actions_setnotes.inc.php
-$permissiondellink 		= $user->rights->partnership->write; // Used by the include of actions_dellink.inc.php
+$permissiontoread 		= $user->hasRight('partnership', 'read');
+$permissiontoadd 		= $user->hasRight('partnership', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete 	= $user->hasRight('partnership', 'delete') || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote 		= $user->hasRight('partnership', 'write'); // Used by the include of actions_setnotes.inc.php
+$permissiondellink 		= $user->hasRight('partnership', 'write'); // Used by the include of actions_dellink.inc.php
 $upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
 $managedfor 			= getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 
-// Security check - Protection if external user
+// Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'partnership', $object->id);
-if (empty($conf->partnership->enabled)) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
+//$isdraft = (isset($object->status) && ($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+//restrictedArea($user, $object->module, $object->id, $object->table_element, $object->element, 'fk_soc', 'rowid', $isdraft);
+if (!isModEnabled('partnership')) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
 if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
 
@@ -119,11 +125,11 @@ if (empty($reshook)) {
 	$fk_partner 	= ($managedfor == 'member') ? GETPOST('fk_member', 'int') : GETPOST('fk_soc', 'int');
 	$obj_partner 	= ($managedfor == 'member') ? $object->fk_member : $object->fk_soc;
 
+	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
+
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-	$triggermodname = 'PARTNERSHIP_MODIFY'; // Name of trigger action code to execute when we modify record
-
 	// Action accept object
 	if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd) {
 		$result = $object->validate($user);
@@ -264,6 +270,10 @@ llxHeader('', $title, $help_url);
 
 // Part to create
 if ($action == 'create') {
+	if (empty($permissiontoadd)) {
+		accessforbidden('NotEnoughPermissions', 0, 1);
+	}
+
 	print load_fiche_titre($langs->trans("NewPartnership"), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -333,9 +343,8 @@ if (($id || $ref) && $action == 'edit') {
 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-	$res = $object->fetch_optionals();
-
 	$head = partnershipPrepareHead($object);
+
 	print dol_get_fiche_head($head, 'card', $langs->trans("Partnership"), -1, $object->picto);
 
 	$formconfirm = '';
@@ -405,38 +414,35 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$morehtmlref = '<div class="refidno">';
 	/*
 	 // Ref customer
-	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 $morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
 	 // Thirdparty
-	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+		$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1, 'customer');
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
+		}
 	 // Project
-	 if (!empty($conf->project->enabled)) {
-	 $langs->load("projects");
-	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
-	 if ($permissiontoadd) {
-	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
-	 $morehtmlref .= ' : ';
-	 if ($action == 'classify') {
-	 //$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 0, 1, '', 'maxwidth300');
-	 $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-	 $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-	 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	 $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	 $morehtmlref .= '</form>';
-	 } else {
-	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1, '', 'maxwidth300');
-	 }
-	 } else {
-	 if (!empty($object->fk_project)) {
-	 $proj = new Project($db);
-	 $proj->fetch($object->fk_project);
-	 $morehtmlref .= ': '.$proj->getNomUrl();
-	 } else {
-	 $morehtmlref .= '';
-	 }
-	 }
-	 }*/
+		if (isModEnabled('project')) {
+			$langs->load("projects");
+			$morehtmlref .= '<br>';
+			if ($permissiontoadd) {
+				$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
+				}
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= $proj->getNomUrl(1);
+					if ($proj->title) {
+						$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
+					}
+				}
+			}
+		}
+	*/
 	$morehtmlref .= '</div>';
 	if (!isset($npfilter)) {
 		$npfilter = "";
@@ -632,8 +638,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			$relativepath = $objref.'/'.$objref.'.pdf';
 			$filedir = $conf->partnership->dir_output.'/'.$object->element.'/'.$objref;
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-			$genallowed = $user->rights->partnership->read; // If you can read, you can build the PDF to read content
-			$delallowed = $user->rights->partnership->write; // If you can create/edit, you can remove a file on card
+			$genallowed = $permissiontoread; // If you can read, you can build the PDF to read content
+			$delallowed = $permissiontoadd; // If you can create/edit, you can remove a file on card
 			print $formfile->showdocuments('partnership:Partnership', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
 		}
 
@@ -651,7 +657,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, $object->element, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
+		$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
 
 		print '</div></div>';
 	}

From 12bd795afc7d34014e4400565651c9ea96bbcc87 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 20:10:37 +0100
Subject: [PATCH 206/300] Work on Kanban view

---
 htdocs/adherents/class/adherent.class.php                 | 2 +-
 htdocs/adherents/class/adherent_type.class.php            | 2 +-
 htdocs/bom/class/bom.class.php                            | 2 +-
 htdocs/comm/propal/class/propal.class.php                 | 2 +-
 htdocs/compta/bank/class/account.class.php                | 4 ++--
 htdocs/compta/bank/list.php                               | 2 +-
 htdocs/compta/cashcontrol/class/cashcontrol.class.php     | 2 +-
 htdocs/compta/facture/class/facture.class.php             | 2 +-
 .../compta/paiement/cheque/class/remisecheque.class.php   | 2 +-
 htdocs/compta/prelevement/class/bonprelevement.class.php  | 3 +--
 htdocs/compta/sociales/class/chargesociales.class.php     | 2 +-
 htdocs/compta/tva/class/tva.class.php                     | 2 +-
 htdocs/contact/class/contact.class.php                    | 2 +-
 htdocs/contrat/class/contrat.class.php                    | 2 +-
 htdocs/core/class/html.formcategory.class.php             | 2 +-
 htdocs/don/class/don.class.php                            | 2 +-
 htdocs/expensereport/class/expensereport.class.php        | 2 +-
 htdocs/expensereport/class/paymentexpensereport.class.php | 2 +-
 htdocs/fichinter/class/fichinter.class.php                | 2 +-
 htdocs/fourn/class/fournisseur.commande.class.php         | 2 +-
 htdocs/fourn/class/fournisseur.facture.class.php          | 2 +-
 htdocs/holiday/class/holiday.class.php                    | 2 +-
 htdocs/hrm/class/evaluation.class.php                     | 2 +-
 .../knowledgemanagement/class/knowledgerecord.class.php   | 2 +-
 htdocs/loan/class/loan.class.php                          | 2 +-
 htdocs/modulebuilder/template/class/myobject.class.php    | 2 +-
 htdocs/mrp/class/mo.class.php                             | 2 +-
 htdocs/partnership/class/partnership.class.php            | 2 +-
 htdocs/product/class/product.class.php                    | 2 +-
 htdocs/product/stock/class/entrepot.class.php             | 2 +-
 htdocs/projet/class/project.class.php                     | 2 +-
 htdocs/projet/list.php                                    | 2 +-
 htdocs/recruitment/class/recruitmentcandidature.class.php | 2 +-
 htdocs/recruitment/class/recruitmentjobposition.class.php | 2 +-
 htdocs/salaries/class/salary.class.php                    | 2 +-
 htdocs/societe/class/societe.class.php                    | 2 +-
 .../supplier_proposal/class/supplier_proposal.class.php   | 2 +-
 htdocs/theme/eldy/global.inc.php                          | 8 ++++----
 htdocs/ticket/class/ticket.class.php                      | 2 +-
 htdocs/user/class/user.class.php                          | 2 +-
 40 files changed, 44 insertions(+), 45 deletions(-)

diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index f2e84e5127a..89a1ed2904d 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -3323,7 +3323,7 @@ class Adherent extends CommonObject
 			$return .= '<br><span class="info-box-label">'.$this->getmorphylib('', 2).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index eda018e6dca..396dea45b0e 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -1016,7 +1016,7 @@ class AdherentType extends CommonObject
 			}
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index d5e3532dbd6..361ac64928e 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -1589,7 +1589,7 @@ class BOM extends CommonObject
 			$return .= '<br><span class="info-box-label">'.$prod->getNomUrl(1).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 
 		$return .= '</div>';
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 46f06614941..5fc0de4c43f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -3976,7 +3976,7 @@ class Propal extends CommonObject
 			$return .='<br><span class="" >'.$langs->trans("AmountHT").' : </span><span class="info-box-label amount">'.price($this->total_ht).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 89b2a5f31d9..3ee2ad037b5 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -1844,10 +1844,10 @@ class Account extends CommonObject
 		}
 		if (method_exists($this, 'solde')) {
 			$return .= '<br><a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$this->id.'">';
-			$return .= '<span class="opacitymedium">'.$langs->trans("Balance").'</span> : <span class="amount">'.price($this->solde(1), 0, $langs, 1, -1, -1, $this->currency_code).'</span>';
+			$return .= '<span class="opacitymedium">'.$langs->trans("Balance").'</span> : <span class="amount">'.price(price2num($this->solde(1), 'MT'), 0, $langs, 1, -1, -1, $this->currency_code).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 668ada03fdb..bc2c2528d07 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -787,7 +787,7 @@ foreach ($accounts as $key => $type) {
 		if (!empty($arrayfields['balance']['checked'])) {
 			print '<td class="nowraponall right">';
 			print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$objecttmp->id.'">';
-			print '<span class="amount">'.price($solde, 0, $langs, 1, -1, -1, $objecttmp->currency_code).'</span>';
+			print '<span class="amount">'.price(price2num($solde, 'MT'), 0, $langs, 1, -1, -1, $objecttmp->currency_code).'</span>';
 			print '</a>';
 			print '</td>';
 			if (!$i) {
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 8cc3c93b59c..deb86fba456 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -495,7 +495,7 @@ class CashControl extends CommonObject
 			$return .= '<br><span class="info-box-label opacitymedium" >'.$langs->trans("Year").'</span> : <span>'.$this->year_close.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index ed4d8bfd498..265b5732f24 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5819,7 +5819,7 @@ class Facture extends CommonInvoice
 			$return .= '<br><span class="info-box-label">'.$this->fk_user_author.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 53751cce194..5c885267559 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -1050,7 +1050,7 @@ class RemiseCheque extends CommonObject
 			$return .= ' | <span class="info-box-label">'.$this->account_id.'</span>';
 		}
 		if (method_exists($this, 'LibStatut')) {
-			$return .= '<br><div style="display:inline-block" class="info-box-status margintoponly">'.$this->LibStatut($this->statut, 5).'</div>';
+			$return .= '<br><div style="display:inline-block" class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		if (property_exists($this, 'amount')) {
 			$return .= ' |   <div style="display:inline-block"><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="amount">'.price($this->amount).'</div>';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 7d7127fc6ba..cbe2eda9533 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -2524,7 +2524,6 @@ class BonPrelevement extends CommonObject
 	{
 		global $langs;
 
-
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<span class="info-box-icon bg-infobox-action">';
@@ -2540,7 +2539,7 @@ class BonPrelevement extends CommonObject
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="amount">'.price($this->total).'</span>';
 		}
 		if (method_exists($this, 'LibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->statut, 5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 3619ebfad7a..140f1cffec6 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -779,7 +779,7 @@ class ChargeSociales extends CommonObject
 			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		}
 		if (method_exists($this, 'LibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->paye, 5, $this->alreadypaid).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3, $this->alreadypaid).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 2ec1199dd29..220863a0cb2 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -935,7 +935,7 @@ class Tva extends CommonObject
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateEnd").'</span> : <span class="info-box-label" >'.dol_print_date($this->datev).'</span>';
 		}
 		if (method_exists($this, 'LibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->paiementtype, 5, $this->alreadypaid).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3, $this->alreadypaid).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index b44d22da312..407eed06921 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -2202,7 +2202,7 @@ class Contact extends CommonObject
 			$return .= '<span> : '.$this->LibPubPriv($this->priv).'</span>';
 		}*/
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index f494bf22ef5..14f5cb62bfa 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2844,7 +2844,7 @@ class Contrat extends CommonObject
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("DateContract").' : </span><span class="info-box-label">'.dol_print_date($this->date_contrat, 'day').'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 695b1ab657b..ef252765ea0 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -41,7 +41,7 @@ class FormCategory extends Form
 	 * @param	string		$showempty							1 or 'string' to add an empty entry
 	 * @return 	string											A HTML filter box (Note: selected results can get with GETPOST("search_category_".$type."_list"))
 	 */
-	public function getFilterBox($type, array $preSelected, $morecss = "minwidth300 widthcentpercentminusx", $searchCategoryProductOperator = -1, $multiselect = 1, $nocateg = 1, $showempty = '')
+	public function getFilterBox($type, array $preSelected, $morecss = "minwidth300imp widthcentpercentminusx", $searchCategoryProductOperator = -1, $multiselect = 1, $nocateg = 1, $showempty = '')
 	{
 		global $langs, $db;
 
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 08491e9b4a3..01b1e1bf6cc 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -1171,7 +1171,7 @@ class Don extends CommonObject
 			$return .= '<br><span class="opacitymedium" >'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
 		}
 		if (method_exists($this, 'LibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->labelStatus, 5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 76a0614da18..4bac14b34f1 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2793,7 +2793,7 @@ class ExpenseReport extends CommonObject
 			$return .= '<span class="info-box-label">'.dol_print_date($this->date_fin, 'day').'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 053f46d20cf..955181cf632 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -744,7 +744,7 @@ class PaymentExpenseReport extends CommonObject
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index bd76ca7bbc3..e739ee0806e 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1503,7 +1503,7 @@ class Fichinter extends CommonObject
 			$return .= '<br><span class="info-box-label ">'.$langs->trans("Duration").' : '.convertSecondToTime($this->duration, 'allhourmin').'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 170f60912aa..17033086e69 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -3648,7 +3648,7 @@ class CommandeFournisseur extends CommonOrder
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Billed").' : </span><span class="info-box-label">'.yn($this->billed).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 34af6f4cbda..7e4dad3f219 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3307,7 +3307,7 @@ class FactureFournisseur extends CommonInvoice
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("AmountHT").'</span> : <span class="info-box-label amount">'.price($this->total_ht).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 4717db8bea0..619d8a3fc85 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -2493,7 +2493,7 @@ class Holiday extends CommonObject
 			$return .= '<span class="info-box-label">'.dol_print_date($this->date_fin, 'day').'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index a62b16b54f1..ab87aaeeef5 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -1084,7 +1084,7 @@ class Evaluation extends CommonObject
 		}
 
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</span>';
 		$return .= '</div>';
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index 275b0a2a2e3..15682d00fc9 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -1145,7 +1145,7 @@ class KnowledgeRecord extends CommonObject
 			$return .= '<span class="info-box-label">'.dolGetFirstLineOfText($this->question).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index 951d430e96f..ef44b2fb196 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -751,7 +751,7 @@ class Loan extends CommonObject
 		}
 
 		if (method_exists($this, 'LibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->totalpaid, 5, $this->alreadypaid).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3, $this->alreadypaid).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 2dcb87ea523..19d99557569 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -921,7 +921,7 @@ class MyObject extends CommonObject
 			$return .= '<span class="info-box-label amount">'.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 2e9072ac0f2..e5af1f2bddf 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1661,7 +1661,7 @@ class Mo extends CommonObject
 			$return .= '<br><span class="info-box-label">'.$langs->trans('Quantity').' : '.$this->qty.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 26650f81d2a..6a5f4623618 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -1343,7 +1343,7 @@ class Partnership extends CommonObject
 			$return .= ' <div class="inline-block opacitymedium valignmiddle tdoverflowmax100">'.$this->label.'</div>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8939132cff9..d4a30517068 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -6404,7 +6404,7 @@ class Product extends CommonObject
 			$return .= '<br><span class="info-box-status opacitymedium">'.$langs->trans('PhysicalStock').' : <span class="bold">'.$this->stock_reel.'</span></span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .='<br><span class="info-box-status margintoponly">'.$this->getLibStatut(5, 1).' '.$this->getLibStatut(5, 0).'</span>';
+			$return .='<br><span class="info-box-status margintoponly">'.$this->getLibStatut(3, 1).' '.$this->getLibStatut(3, 0).'</span>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 6b0d558c689..416d96ad55b 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -977,7 +977,7 @@ class Entrepot extends CommonObject
 			$return .= '<br><span class="info-box-label amount">'.price($this->sellvalue).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index c9a811ad245..fc4f6acb426 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -2419,7 +2419,7 @@ class Project extends CommonObject
 			$return .= '<br><span class="amount">'.price($this->opp_amount).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index abb07d36480..1f203113b3a 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -1002,7 +1002,7 @@ if ($user->rights->user->user->lire) {
 // Filter on categories
 if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	$formcategory = new FormCategory($db);
-	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array);
+	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array, 'minwidth300imp widthcentpercentminusx');
 }
 // Filter on customer categories
 if (!empty($conf->global->MAIN_SEARCH_CATEGORY_CUSTOMER_ON_PROJECT_LIST) && !empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index e3dfd4bd135..809b8d0cd54 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -1053,7 +1053,7 @@ class RecruitmentCandidature extends CommonObject
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("phone").'</span> : <span class="info-box-label">'.$this->phone.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 69ec74deb9d..b0ca58d6b8f 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -1138,7 +1138,7 @@ class RecruitmentJobPosition extends CommonObject
 			$return .= ' | <span class="opacitymedium">'.$langs->trans("Remuneration").'</span> : <span class="info-box-label">'.$this->remuneration_suggested.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).' | <span class="opacitymedium" title="'.$langs->trans("RecruitmentCandidatures").'">'.$langs->trans("RecruitmentCandidatures", '', '', '', '', 5).'</span> : <span>'.$obj->nbapplications.'</span></div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).' | <span class="opacitymedium" title="'.$langs->trans("RecruitmentCandidatures").'">'.$langs->trans("RecruitmentCandidatures", '', '', '', '', 5).'</span> : <span>'.$obj->nbapplications.'</span></div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 90666a6853d..7192a14e9d3 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -770,7 +770,7 @@ class Salary extends CommonObject
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("Amount").'</span> : <span class="info-box-label amount">'.price($this->amount).'</span>';
 		}
 		if (method_exists($this, 'LibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->LibStatut($this->paye, 5, $this->alreadypaid).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3, $this->alreadypaid).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 01f35b9ea17..6ae3cad817a 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -5225,7 +5225,7 @@ class Societe extends CommonObject
 		}
 
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 892c3f77687..fbcf04aacd2 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2789,7 +2789,7 @@ class SupplierProposal extends CommonObject
 			$return .='<br><span class="opacitymedium" >'.$langs->trans("AmountHT").' : </span><span class="info-box-label amount">'.price($this->total_ttc).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 6a31211db45..4ce4a7ed19e 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -4253,15 +4253,15 @@ div.liste_titre_bydiv {
 	border-top-style: solid;
 	<?php if ($userborderontable) { ?>
 	border-left: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1);
-	/* border-right: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1); */
+	border-right: <?php echo $borderwidth ?>px solid var(--colortopbordertitle1);
 	<?php } ?>
 
 	border-collapse: collapse;
-	display: table;
 	padding: 2px 0px 2px 0;
 	box-shadow: none;
-	/*width: calc(100% - 1px);	1px more, i don't know why so i remove */
-	width: calc(100%);
+	/*width: calc(100% - 1px);	1px less because display is table and with100%, it generated a right border 1px left compared to the div-table-responsive under */
+	width: unset;
+	/* display: table; */
 }
 tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr, tagtr.liste_titre
 {
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 6f309b7656f..207ba4d6a50 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -3021,7 +3021,7 @@ class Ticket extends CommonObject
 			$return .= '<div class="tdoverflowmax125 inline-block">'.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$this->type_code, 'c_ticket_type', 'code', 'label', $this->type_code).'</div>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 648fd61fa6c..3fc11f9eadd 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3089,7 +3089,7 @@ class User extends CommonObject
 			$return .= '<br><span class="info-box-label opacitymedium small">'.img_picto('', 'email').' '.$this->email.'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';

From 03bf66a6b10af27d253677ae21f31439ad47a467 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 21:20:16 +0100
Subject: [PATCH 207/300] css

---
 htdocs/theme/eldy/global.inc.php | 2 +-
 htdocs/theme/md/style.css.php    | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 4ce4a7ed19e..aafabf45d63 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -7115,7 +7115,7 @@ div.tabsElem a.tab {
 	border: 1px solid #888;
 }
 .publicnewmemberform div.tabBarWithBottom {
-	border: 1px solid #f0f0f0;
+	border: 1px solid #e8e8e8;
 	padding: 30px;
 	border-radius: 8px;
 	background-color: #f8f8f8;
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3702f5bfdbb..2a46cf83911 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -7042,6 +7042,13 @@ border-top-right-radius: 6px;
 .public_border {
 	border: 1px solid #888;
 }
+.publicnewmemberform div.tabBarWithBottom {
+	border: 1px solid #e8e8e8;
+	padding: 30px;
+	border-radius: 8px;
+	background-color: #f8f8f8;
+	/*box-shadow: 2px 2px 10px #ddd;*/
+}
 
 .publicnewmemberform #tablesubscribe {
 	color: #666;

From a62d029d7d7ee744d40e57704f7c99f193f0718d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 21:37:18 +0100
Subject: [PATCH 208/300] Disable non secured feature

---
 htdocs/core/ajax/fileupload.php        |  6 +++-
 htdocs/core/class/fileupload.class.php | 38 ++++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
index 67f95700976..379a2e689a3 100644
--- a/htdocs/core/ajax/fileupload.php
+++ b/htdocs/core/ajax/fileupload.php
@@ -45,9 +45,13 @@ error_reporting(E_ALL | E_STRICT);
 $fk_element = GETPOST('fk_element', 'int');
 $element = GETPOST('element', 'alpha');
 
-
 $upload_handler = new FileUpload(null, $fk_element, $element);
 
+// Feature not enabled. Warning feature not used and not secured so disabled.
+if (!getDolGlobalInt('MAIN_USE_JQUERY_FILEUPLOAD')) {
+	return;
+}
+
 
 /*
  * View
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index ccea7de2d84..5a8e75b1e69 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -46,6 +46,12 @@ class FileUpload
 		global $db, $conf;
 		global $object;
 		global $hookmanager;
+
+		// Feature not enabled. Warning feature not used and not secured so disabled.
+		if (!getDolGlobalInt('MAIN_USE_JQUERY_FILEUPLOAD')) {
+			return;
+		}
+
 		$hookmanager->initHooks(array('fileupload'));
 
 		$this->fk_element = $fk_element;
@@ -238,6 +244,10 @@ class FileUpload
 	 */
 	protected function getFileObject($file_name)
 	{
+		if (!getDolGlobalInt('MAIN_USE_JQUERY_FILEUPLOAD')) {
+			return;
+		}
+
 		$file_path = $this->options['upload_dir'].$file_name;
 		if (is_file($file_path) && $file_name[0] !== '.') {
 			$file = new stdClass();
@@ -278,6 +288,10 @@ class FileUpload
 	{
 		global $maxwidthmini, $maxheightmini;
 
+		if (!getDolGlobalInt('MAIN_USE_JQUERY_FILEUPLOAD')) {
+			return;
+		}
+
 		$file_path = $this->options['upload_dir'].$file_name;
 		$new_file_path = $options['upload_dir'].$file_name;
 
@@ -309,6 +323,10 @@ class FileUpload
 	 */
 	protected function validate($uploaded_file, $file, $error, $index)
 	{
+		if (!getDolGlobalInt('MAIN_USE_JQUERY_FILEUPLOAD')) {
+			return;
+		}
+
 		if ($error) {
 			$file->error = $error;
 			return false;
@@ -399,8 +417,8 @@ class FileUpload
 		// Also remove control characters and spaces (\x00..\x20) around the filename:
 		$file_name = trim(basename(stripslashes($name)), ".\x00..\x20");
 		// Add missing file extension for known image types:
-		if (strpos($file_name, '.') === false &&
-				preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {
+		$matches = array();
+		if (strpos($file_name, '.') === false && preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {
 			$file_name .= '.'.$matches[1];
 		}
 		if ($this->options['discard_aborted_uploads']) {
@@ -424,6 +442,10 @@ class FileUpload
 	 */
 	protected function handleFileUpload($uploaded_file, $name, $size, $type, $error, $index)
 	{
+		if (!getDolGlobalInt('MAIN_USE_JQUERY_FILEUPLOAD')) {
+			return;
+		}
+
 		$file = new stdClass();
 		$file->name = $this->trimFileName($name, $type, $index);
 		$file->mime = dol_mimetype($file->name, '', 2);
@@ -470,6 +492,10 @@ class FileUpload
 	 */
 	public function get()
 	{
+		if (!getDolGlobalInt('MAIN_USE_JQUERY_FILEUPLOAD')) {
+			return;
+		}
+
 		$file_name = isset($_REQUEST['file']) ?
 		basename(stripslashes($_REQUEST['file'])) : null;
 		if ($file_name) {
@@ -488,6 +514,10 @@ class FileUpload
 	 */
 	public function post()
 	{
+		if (!getDolGlobalInt('MAIN_USE_JQUERY_FILEUPLOAD')) {
+			return;
+		}
+
 		if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
 			return $this->delete();
 		}
@@ -543,6 +573,10 @@ class FileUpload
 	 */
 	public function delete()
 	{
+		if (!getDolGlobalInt('MAIN_USE_JQUERY_FILEUPLOAD')) {
+			return;
+		}
+
 		$file_name = isset($_REQUEST['file']) ?
 		basename(stripslashes($_REQUEST['file'])) : null;
 		$file_path = $this->options['upload_dir'].$file_name;

From 0d3a4d68b2281332611edf0314b9faca6c2e0ca6 Mon Sep 17 00:00:00 2001
From: Lamrani Abdel <lamrani002@gmail.com>
Date: Wed, 1 Mar 2023 23:20:42 +0100
Subject: [PATCH 209/300] add comment in api_mymodule for seperate methods

---
 .../template/class/api_mymodule.class.php     | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index fdb56ff3c67..a48b2f5010b 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -54,6 +54,8 @@ class MyModuleApi extends DolibarrApi
 		$this->myobject = new MyObject($this->db);
 	}
 
+	/*begin methods CRUD*/
+
 	/**
 	 * Get properties of a myobject object
 	 *
@@ -307,6 +309,31 @@ class MyModuleApi extends DolibarrApi
 	}
 
 
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param	array		$data   Array of data to validate
+	 * @return	array
+	 *
+	 * @throws	RestException
+	 */
+	private function _validate($data)
+	{
+		$myobject = array();
+		foreach ($this->myobject->fields as $field => $propfield) {
+			if (in_array($field, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) {
+				continue; // Not a mandatory field
+			}
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$myobject[$field] = $data[$field];
+		}
+		return $myobject;
+	}
+
+	/*end methods CRUD*/
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Clean sensible object datas
@@ -369,27 +396,4 @@ class MyModuleApi extends DolibarrApi
 
 		return $object;
 	}
-
-	/**
-	 * Validate fields before create or update object
-	 *
-	 * @param	array		$data   Array of data to validate
-	 * @return	array
-	 *
-	 * @throws	RestException
-	 */
-	private function _validate($data)
-	{
-		$myobject = array();
-		foreach ($this->myobject->fields as $field => $propfield) {
-			if (in_array($field, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) {
-				continue; // Not a mandatory field
-			}
-			if (!isset($data[$field])) {
-				throw new RestException(400, "$field field missing");
-			}
-			$myobject[$field] = $data[$field];
-		}
-		return $myobject;
-	}
 }

From 14a59483f58e99cc95af9c6fdc43274432ff25b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 1 Mar 2023 23:50:02 +0100
Subject: [PATCH 210/300] Debug v17

---
 htdocs/admin/pdf.php                          | 10 ++++++++
 htdocs/admin/system/security.php              |  4 ++--
 htdocs/core/ajax/onlineSign.php               | 23 +++++++++++++------
 ...e_20_modWorkflow_WorkflowManager.class.php |  5 +++-
 htdocs/core/website.inc.php                   |  8 +++----
 htdocs/includes/tcpdi/tcpdi.php               |  2 +-
 htdocs/main.inc.php                           |  8 +++----
 7 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index d8cc8d554a2..a015e2319b0 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -271,9 +271,19 @@ print '<input type="hidden" name="action" value="update">';
 clearstatcache();
 
 
+if (getDolGlobalString('PDF_SECURITY_ENCRYPTION')) {
+	print '<div class="warning">';
+	print 'The not supported and hidden option PDF_SECURITY_ENCRYPTION has been enabled. This means a lof of feature related to PDF will be broken, like mass PDF generation or online signature of PDF.'."\n";
+	print 'You should disable this option.';
+	print '</div>';
+}
+
+
+
 // Misc options
 print load_fiche_titre($langs->trans("DictionaryPaperFormat"), '', '');
 
+
 print '<div class="div-table-responsive-no-min">';
 print '<table summary="more" class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index c185878e658..03aa1b19d76 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -574,11 +574,11 @@ print '<br>';
 print '<strong>MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL</strong> = '.(empty($conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 0)</span>' : $conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL)."<br>";
 print '<br>';
 
-$examplecsprule = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
+$examplecsprule = "frame-ancestors 'self'; img-src * data:; font-src *; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com;";
 print '<strong>MAIN_SECURITY_FORCECSPRO</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCECSPRO) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCECSPRO).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").': "'.$examplecsprule.'")</span><br>';
 print '<br>';
 
-$examplecsprule = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
+$examplecsprule = "frame-ancestors 'self'; img-src * data:; font-src *; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com;";
 print '<strong>MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").': "'.$examplecsprule.'")</span><br>';
 print '<br>';
 
diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index c2823407ac6..89aa597661c 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -90,7 +90,8 @@ if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed.$type.$ref.(!isModEnable
 top_httphead();
 
 if ($action == "importSignature") {
-	if (!empty($signature) && $signature[0] == "image/png;base64") {
+	$issignatureok = (!empty($signature) && $signature[0] == "image/png;base64");
+	if ($issignatureok) {
 		$signature = $signature[1];
 		$data = base64_decode($signature);
 
@@ -143,7 +144,6 @@ if ($action == "importSignature") {
 							$pdf->SetCompression(false);
 						}
 
-
 						//$pdf->Open();
 						$pagecount = $pdf->setSourceFile($sourcefile);		// original PDF
 
@@ -155,7 +155,7 @@ if ($action == "importSignature") {
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tppl);
 							} catch (Exception $e) {
-								dol_syslog("Error when manipulating some PDF by onlineSign: ".$e->getMessage(), LOG_ERR);
+								dol_syslog("Error when manipulating the PDF ".$sourcefile." by onlineSign: ".$e->getMessage(), LOG_ERR);
 								$response = $e->getMessage();
 								$error++;
 							}
@@ -207,9 +207,6 @@ if ($action == "importSignature") {
 				}
 
 				if (!$error) {
-					$db->commit();
-					$response = "success";
-					setEventMessages("PropalSigned", null, 'warnings');
 					if (method_exists($object, 'call_trigger')) {
 						//customer is not a user !?! so could we use same user as validation ?
 						$user = new User($db);
@@ -218,13 +215,25 @@ if ($action == "importSignature") {
 						$result = $object->call_trigger('PROPAL_CLOSE_SIGNED', $user);
 						if ($result < 0) {
 							$error++;
+							$response = "error in trigger ".$object->error;
+						} else {
+							$response = "success";
 						}
+					} else {
+						$response = "success";
 					}
 				} else {
-					$db->rollback();
 					$error++;
 					$response = "error sql";
 				}
+
+				if (!$error) {
+					$db->commit();
+					$response = "success";
+					setEventMessages("PropalSigned", null, 'warnings');
+				} else {
+					$db->rollback();
+				}
 			}
 		} elseif ($mode == 'contract') {
 			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index b6bd9bb73a8..f85a26697b7 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -75,7 +75,10 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 			if (isModEnabled('commande') && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) {
 				$object->fetchObjectLinked();
 				if (!empty($object->linkedObjectsIds['commande'])) {
-					setEventMessages($langs->trans("OrderExists"), null, 'warnings');
+					if (empty($object->context['closedfromonlinesignature'])) {
+						$langs->load("orders");
+						setEventMessages($langs->trans("OrderExists"), null, 'warnings');
+					}
 					return $ret;
 				} else {
 					include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index b934f333b1a..d9fe10c8868 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -117,8 +117,8 @@ if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 		// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
 		// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
 		//
-		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
-		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; font-src *; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com;";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; font-src *; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
 		$contentsecuritypolicy = getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCECSPRO');
 
 		if (!is_object($hookmanager)) {
@@ -149,8 +149,8 @@ if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 		// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
 		// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
 		//
-		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
-		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; font-src *; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com;";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; font-src *; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
 		$contentsecuritypolicy = getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCECSP');
 
 		if (!is_object($hookmanager)) {
diff --git a/htdocs/includes/tcpdi/tcpdi.php b/htdocs/includes/tcpdi/tcpdi.php
index aaa1d70c095..9e87ac2f221 100644
--- a/htdocs/includes/tcpdi/tcpdi.php
+++ b/htdocs/includes/tcpdi/tcpdi.php
@@ -333,7 +333,7 @@ class TCPDI extends FPDF_TPL {
                             break;
                     }
                 }
-            } elseif ($tpl['x'] != 0 || $tpl['y'] != 0) {
+            } elseif (!empty($tpl['x']) || !empty($tpl['y'])) {
                 $tx = -$tpl['x'] * 2;
                 $ty = $tpl['y'] * 2;
             }
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 20b73126656..b9469cf55ea 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1474,8 +1474,8 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 		// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
 		// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
 		//
-		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
-		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; font-src *; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com;";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; font-src *; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
 		$contentsecuritypolicy = getDolGlobalString('MAIN_SECURITY_FORCECSPRO');
 
 		if (!is_object($hookmanager)) {
@@ -1511,8 +1511,8 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 		// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
 		// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
 		//
-		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com;";
-		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googlapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; font-src *; default-src 'self' 'unsafe-inline' 'unsafe-eval' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com;";
+		// $contentsecuritypolicy = "frame-ancestors 'self'; img-src * data:; font-src *; default-src *; script-src 'self' 'unsafe-inline' *.paypal.com *.stripe.com *.google.com *.googleapis.com *.google-analytics.com *.googletagmanager.com; style-src 'self' 'unsafe-inline'; connect-src 'self';";
 		$contentsecuritypolicy = getDolGlobalString('MAIN_SECURITY_FORCECSP');
 
 		if (!is_object($hookmanager)) {

From 6d21fd1c463f6dbf85e71bc69541e993a3fb89a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 03:20:26 +0100
Subject: [PATCH 211/300] Fix var_dump

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

diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index a7fd042969b..965a1c8a117 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -265,7 +265,7 @@ print load_fiche_titre($title, '', 'email');
 // Load array of available notifications
 $notificationtrigger = new InterfaceNotification($db);
 $listofnotifiedevents = $notificationtrigger->getListOfManagedEvents();
-var_dump($listofnotifiedevents);
+
 // Editing global variables not related to a specific theme
 $constantes = array();
 foreach ($listofnotifiedevents as $notifiedevent) {

From 2273201707bcdc9e0a3682e1bbdca3da15925cf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 2 Mar 2023 09:49:00 +0100
Subject: [PATCH 212/300] fix ADD_UNSPLASH_LOGIN_BACKGROUND

---
 htdocs/core/tpl/login.tpl.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 4900acc9ec2..e18b2930de0 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -134,10 +134,12 @@ $(document).ready(function () {
 <?php } ?>
 
 <div class="login_center center"<?php
-$backstyle = 'background: linear-gradient('.($conf->browser->layout == 'phone' ? '0deg' : '4deg').', rgb(240,240,240) 52%, rgb('.$colorbackhmenu1.') 52.1%);';
-// old style:  $backstyle = 'background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));';
-$backstyle = getDolGlobalString('MAIN_LOGIN_BACKGROUND_STYLE', $backstyle);
-print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
+if (empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) { 
+	$backstyle = 'background: linear-gradient('.($conf->browser->layout == 'phone' ? '0deg' : '4deg').', rgb(240,240,240) 52%, rgb('.$colorbackhmenu1.') 52.1%);';
+	// old style:  $backstyle = 'background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));';
+	$backstyle = getDolGlobalString('MAIN_LOGIN_BACKGROUND_STYLE', $backstyle);
+	print empty($conf->global->MAIN_LOGIN_BACKGROUND) ? ' style="background-size: cover; background-position: center center; background-attachment: fixed; background-repeat: no-repeat; '.$backstyle.'"' : '';
+}
 ?>>
 <div class="login_vertical_align">
 

From 13af84ff49e334db4eeb967cc2669f169d2db6a5 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 2 Mar 2023 08:49:36 +0000
Subject: [PATCH 213/300] Fixing style errors.

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

diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index e18b2930de0..be3dea9df9e 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -134,7 +134,7 @@ $(document).ready(function () {
 <?php } ?>
 
 <div class="login_center center"<?php
-if (empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) { 
+if (empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
 	$backstyle = 'background: linear-gradient('.($conf->browser->layout == 'phone' ? '0deg' : '4deg').', rgb(240,240,240) 52%, rgb('.$colorbackhmenu1.') 52.1%);';
 	// old style:  $backstyle = 'background-image: linear-gradient(rgb('.$colorbackhmenu1.',0.3), rgb(240,240,240));';
 	$backstyle = getDolGlobalString('MAIN_LOGIN_BACKGROUND_STYLE', $backstyle);

From 8612a88a2f86129efc129e853d84c856c650daa7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 10:38:45 +0100
Subject: [PATCH 214/300] Sync transifex Debug v17

---
 htdocs/api/class/api_documents.class.php      |   2 +-
 htdocs/comm/action/class/actioncomm.class.php |   2 +-
 htdocs/contrat/card.php                       |  11 +-
 htdocs/core/class/CMailFile.class.php         |  36 ++-
 htdocs/core/lib/files.lib.php                 |   6 +-
 .../containers/wrapper.php                    |   2 +-
 .../containers/wrapper.php                    |   2 +-
 .../containers/wrapper.php                    |   2 +-
 .../containers/wrapper.php                    |   2 +-
 .../containers/wrapper.php                    |   2 +-
 .../containers/wrapper.php                    |   2 +-
 htdocs/langs/ar_SA/accountancy.lang           |   7 +-
 htdocs/langs/ar_SA/admin.lang                 |  10 +-
 htdocs/langs/ar_SA/interventions.lang         |   2 +-
 htdocs/langs/ar_SA/mails.lang                 |   3 +-
 htdocs/langs/ar_SA/ticket.lang                |   2 +-
 htdocs/langs/bg_BG/admin.lang                 |  10 +-
 htdocs/langs/bg_BG/interventions.lang         |   6 +-
 htdocs/langs/bg_BG/mails.lang                 |   3 +-
 htdocs/langs/bs_BA/mails.lang                 |   3 +-
 htdocs/langs/ca_ES/accountancy.lang           |  67 ++---
 htdocs/langs/ca_ES/admin.lang                 | 122 ++++----
 htdocs/langs/ca_ES/agenda.lang                |   6 +-
 htdocs/langs/ca_ES/banks.lang                 |   4 +-
 htdocs/langs/ca_ES/bills.lang                 |  46 +--
 htdocs/langs/ca_ES/boxes.lang                 |  51 +++-
 htdocs/langs/ca_ES/companies.lang             |  10 +-
 htdocs/langs/ca_ES/compta.lang                |  18 +-
 htdocs/langs/ca_ES/contracts.lang             |  10 +-
 htdocs/langs/ca_ES/cron.lang                  |   2 +-
 htdocs/langs/ca_ES/ecm.lang                   |   8 +-
 htdocs/langs/ca_ES/errors.lang                |  49 +--
 htdocs/langs/ca_ES/help.lang                  |   6 +-
 htdocs/langs/ca_ES/holiday.lang               |  22 +-
 htdocs/langs/ca_ES/install.lang               |  20 +-
 htdocs/langs/ca_ES/interventions.lang         |   8 +-
 htdocs/langs/ca_ES/mails.lang                 |  23 +-
 htdocs/langs/ca_ES/main.lang                  |  66 +++--
 htdocs/langs/ca_ES/margins.lang               |  19 +-
 htdocs/langs/ca_ES/members.lang               |  25 +-
 htdocs/langs/ca_ES/modulebuilder.lang         |  30 +-
 htdocs/langs/ca_ES/mrp.lang                   |   9 +-
 htdocs/langs/ca_ES/orders.lang                |  10 +-
 htdocs/langs/ca_ES/other.lang                 |  22 +-
 htdocs/langs/ca_ES/partnership.lang           |   8 +-
 htdocs/langs/ca_ES/products.lang              |  30 +-
 htdocs/langs/ca_ES/projects.lang              |  16 +-
 htdocs/langs/ca_ES/receptions.lang            |   4 +-
 htdocs/langs/ca_ES/resource.lang              |   4 +-
 htdocs/langs/ca_ES/salaries.lang              |   4 +-
 htdocs/langs/ca_ES/stocks.lang                |  10 +-
 htdocs/langs/ca_ES/supplier_proposal.lang     |   5 +-
 htdocs/langs/ca_ES/suppliers.lang             |   9 +-
 htdocs/langs/ca_ES/ticket.lang                |  12 +-
 htdocs/langs/ca_ES/trips.lang                 | 278 +++++++++---------
 htdocs/langs/ca_ES/website.lang               |  16 +-
 htdocs/langs/ca_ES/withdrawals.lang           |  12 +-
 htdocs/langs/cs_CZ/admin.lang                 |  10 +-
 htdocs/langs/cs_CZ/interventions.lang         |   6 +-
 htdocs/langs/cs_CZ/mails.lang                 |   3 +-
 htdocs/langs/cy_GB/admin.lang                 |  10 +-
 htdocs/langs/cy_GB/interventions.lang         |   4 +-
 htdocs/langs/cy_GB/mails.lang                 |   3 +-
 htdocs/langs/cy_GB/ticket.lang                |   5 +-
 htdocs/langs/da_DK/accountancy.lang           |   7 +-
 htdocs/langs/da_DK/admin.lang                 |  10 +-
 htdocs/langs/da_DK/boxes.lang                 |  21 ++
 htdocs/langs/da_DK/ecm.lang                   |   2 +-
 htdocs/langs/da_DK/errors.lang                |   3 +-
 htdocs/langs/da_DK/interventions.lang         |   2 +-
 htdocs/langs/da_DK/mails.lang                 |   3 +-
 htdocs/langs/da_DK/main.lang                  |   4 +-
 htdocs/langs/da_DK/margins.lang               |   1 +
 htdocs/langs/da_DK/members.lang               |   3 +
 htdocs/langs/da_DK/mrp.lang                   |   3 +
 htdocs/langs/da_DK/partnership.lang           |   2 +-
 htdocs/langs/da_DK/ticket.lang                |   2 +-
 htdocs/langs/de_CH/main.lang                  |   4 -
 htdocs/langs/de_CH/ticket.lang                |   1 -
 htdocs/langs/de_DE/accountancy.lang           |   7 +-
 htdocs/langs/de_DE/admin.lang                 |  12 +-
 htdocs/langs/de_DE/boxes.lang                 |  21 ++
 htdocs/langs/de_DE/ecm.lang                   |   2 +-
 htdocs/langs/de_DE/errors.lang                |   3 +-
 htdocs/langs/de_DE/interventions.lang         |   2 +-
 htdocs/langs/de_DE/mails.lang                 |   3 +-
 htdocs/langs/de_DE/main.lang                  |  14 +-
 htdocs/langs/de_DE/margins.lang               |   1 +
 htdocs/langs/de_DE/members.lang               |   3 +
 htdocs/langs/de_DE/mrp.lang                   |   3 +
 htdocs/langs/de_DE/partnership.lang           |   2 +-
 htdocs/langs/de_DE/ticket.lang                |   2 +-
 htdocs/langs/el_GR/accountancy.lang           |   7 +-
 htdocs/langs/el_GR/admin.lang                 |  10 +-
 htdocs/langs/el_GR/boxes.lang                 |  21 ++
 htdocs/langs/el_GR/ecm.lang                   |   2 +-
 htdocs/langs/el_GR/errors.lang                |   3 +-
 htdocs/langs/el_GR/hrm.lang                   |   8 +-
 htdocs/langs/el_GR/interventions.lang         |   2 +-
 htdocs/langs/el_GR/mails.lang                 |  55 ++--
 htdocs/langs/el_GR/margins.lang               |   1 +
 htdocs/langs/el_GR/members.lang               |   3 +
 htdocs/langs/el_GR/partnership.lang           |   2 +
 htdocs/langs/el_GR/ticket.lang                |   2 +-
 htdocs/langs/en_US/admin.lang                 |   5 +-
 htdocs/langs/en_US/mails.lang                 |   4 +-
 htdocs/langs/es_CO/mails.lang                 |   1 -
 htdocs/langs/es_ES/accountancy.lang           |   7 +-
 htdocs/langs/es_ES/admin.lang                 |  10 +-
 htdocs/langs/es_ES/boxes.lang                 |  21 ++
 htdocs/langs/es_ES/ecm.lang                   |   2 +-
 htdocs/langs/es_ES/interventions.lang         |   2 +-
 htdocs/langs/es_ES/mails.lang                 |   7 +-
 htdocs/langs/es_ES/partnership.lang           |   2 +-
 htdocs/langs/es_ES/ticket.lang                |   2 +-
 htdocs/langs/et_EE/admin.lang                 |  10 +-
 htdocs/langs/et_EE/mails.lang                 |   3 +-
 htdocs/langs/fa_IR/admin.lang                 |  10 +-
 htdocs/langs/fa_IR/interventions.lang         |   6 +-
 htdocs/langs/fa_IR/mails.lang                 |   3 +-
 htdocs/langs/fi_FI/admin.lang                 |  10 +-
 htdocs/langs/fi_FI/mails.lang                 |   3 +-
 htdocs/langs/fr_FR/accountancy.lang           |  50 ++--
 htdocs/langs/fr_FR/admin.lang                 |   8 +-
 htdocs/langs/gl_ES/accountancy.lang           |   7 +-
 htdocs/langs/gl_ES/admin.lang                 |  10 +-
 htdocs/langs/gl_ES/boxes.lang                 |  21 ++
 htdocs/langs/gl_ES/ecm.lang                   |   2 +-
 htdocs/langs/gl_ES/errors.lang                |   3 +-
 htdocs/langs/gl_ES/interventions.lang         |   2 +-
 htdocs/langs/gl_ES/mails.lang                 |   3 +-
 htdocs/langs/gl_ES/main.lang                  |   4 +-
 htdocs/langs/gl_ES/margins.lang               |   1 +
 htdocs/langs/gl_ES/members.lang               |   3 +
 htdocs/langs/gl_ES/mrp.lang                   |   3 +
 htdocs/langs/gl_ES/partnership.lang           |   2 +-
 htdocs/langs/gl_ES/ticket.lang                |   2 +-
 htdocs/langs/he_IL/admin.lang                 |  10 +-
 htdocs/langs/he_IL/mails.lang                 |   8 +-
 htdocs/langs/hr_HR/admin.lang                 |  10 +-
 htdocs/langs/hr_HR/mails.lang                 |   3 +-
 htdocs/langs/hr_HR/ticket.lang                |   2 +-
 htdocs/langs/hu_HU/accountancy.lang           |   7 +-
 htdocs/langs/hu_HU/admin.lang                 |  10 +-
 htdocs/langs/hu_HU/interventions.lang         |   2 +-
 htdocs/langs/hu_HU/mails.lang                 |   3 +-
 htdocs/langs/hu_HU/partnership.lang           |   2 +-
 htdocs/langs/hu_HU/ticket.lang                |   2 +-
 htdocs/langs/id_ID/admin.lang                 |  10 +-
 htdocs/langs/id_ID/interventions.lang         |   6 +-
 htdocs/langs/id_ID/mails.lang                 |   3 +-
 htdocs/langs/id_ID/ticket.lang                |   5 +-
 htdocs/langs/is_IS/admin.lang                 |  10 +-
 htdocs/langs/is_IS/mails.lang                 |   3 +-
 htdocs/langs/it_IT/accountancy.lang           |   7 +-
 htdocs/langs/it_IT/admin.lang                 |  12 +-
 htdocs/langs/it_IT/interventions.lang         |   2 +-
 htdocs/langs/it_IT/mails.lang                 |  25 +-
 htdocs/langs/it_IT/ticket.lang                |   5 +-
 htdocs/langs/ja_JP/accountancy.lang           |   7 +-
 htdocs/langs/ja_JP/admin.lang                 |  10 +-
 htdocs/langs/ja_JP/boxes.lang                 |  21 ++
 htdocs/langs/ja_JP/ecm.lang                   |   2 +-
 htdocs/langs/ja_JP/errors.lang                |   3 +-
 htdocs/langs/ja_JP/interventions.lang         |   2 +-
 htdocs/langs/ja_JP/mails.lang                 |   7 +-
 htdocs/langs/ja_JP/main.lang                  |   4 +-
 htdocs/langs/ja_JP/margins.lang               |   1 +
 htdocs/langs/ja_JP/members.lang               |   3 +
 htdocs/langs/ja_JP/mrp.lang                   |   3 +
 htdocs/langs/ja_JP/partnership.lang           |   2 +-
 htdocs/langs/ja_JP/ticket.lang                |   2 +-
 htdocs/langs/kk_KZ/admin.lang                 |  10 +-
 htdocs/langs/kk_KZ/interventions.lang         |   6 +-
 htdocs/langs/kk_KZ/mails.lang                 |   3 +-
 htdocs/langs/kk_KZ/ticket.lang                |   5 +-
 htdocs/langs/km_KH/mails.lang                 |   8 +-
 htdocs/langs/kn_IN/mails.lang                 |   8 +-
 htdocs/langs/ko_KR/mails.lang                 |   3 +-
 htdocs/langs/lo_LA/admin.lang                 |  10 +-
 htdocs/langs/lo_LA/interventions.lang         |   6 +-
 htdocs/langs/lo_LA/mails.lang                 |   3 +-
 htdocs/langs/lo_LA/ticket.lang                |   5 +-
 htdocs/langs/lt_LT/admin.lang                 |  10 +-
 htdocs/langs/lt_LT/mails.lang                 |   3 +-
 htdocs/langs/lv_LV/accountancy.lang           |   7 +-
 htdocs/langs/lv_LV/admin.lang                 |  10 +-
 htdocs/langs/lv_LV/ecm.lang                   |   2 +-
 htdocs/langs/lv_LV/interventions.lang         |   2 +-
 htdocs/langs/lv_LV/mails.lang                 |   7 +-
 htdocs/langs/lv_LV/partnership.lang           |   2 +-
 htdocs/langs/lv_LV/ticket.lang                |   2 +-
 htdocs/langs/nb_NO/accountancy.lang           |   7 +-
 htdocs/langs/nb_NO/admin.lang                 |  10 +-
 htdocs/langs/nb_NO/boxes.lang                 |  21 ++
 htdocs/langs/nb_NO/ecm.lang                   |   2 +-
 htdocs/langs/nb_NO/errors.lang                |   3 +-
 htdocs/langs/nb_NO/interventions.lang         |   2 +-
 htdocs/langs/nb_NO/mails.lang                 |   3 +-
 htdocs/langs/nb_NO/main.lang                  |   4 +-
 htdocs/langs/nb_NO/margins.lang               |   1 +
 htdocs/langs/nb_NO/members.lang               |   3 +
 htdocs/langs/nb_NO/mrp.lang                   |   3 +
 htdocs/langs/nb_NO/partnership.lang           |   2 +-
 htdocs/langs/nb_NO/ticket.lang                |   2 +-
 htdocs/langs/nl_NL/accountancy.lang           |   7 +-
 htdocs/langs/nl_NL/admin.lang                 |  10 +-
 htdocs/langs/nl_NL/interventions.lang         |   2 +-
 htdocs/langs/nl_NL/mails.lang                 |   3 +-
 htdocs/langs/nl_NL/ticket.lang                |   2 +-
 htdocs/langs/pl_PL/admin.lang                 |  10 +-
 htdocs/langs/pl_PL/interventions.lang         |   6 +-
 htdocs/langs/pl_PL/mails.lang                 |   3 +-
 htdocs/langs/pl_PL/ticket.lang                |   2 +-
 htdocs/langs/pt_AO/companies.lang             |   3 -
 htdocs/langs/pt_BR/admin.lang                 |   1 -
 htdocs/langs/pt_BR/companies.lang             |   6 -
 htdocs/langs/pt_BR/main.lang                  |  17 --
 htdocs/langs/pt_MZ/admin.lang                 |   1 -
 htdocs/langs/pt_MZ/companies.lang             |   5 -
 htdocs/langs/pt_MZ/main.lang                  |   7 -
 htdocs/langs/pt_PT/admin.lang                 |  14 +-
 htdocs/langs/pt_PT/companies.lang             |  42 +--
 htdocs/langs/pt_PT/holiday.lang               |  14 +-
 htdocs/langs/pt_PT/interventions.lang         |   6 +-
 htdocs/langs/pt_PT/mails.lang                 |   3 +-
 htdocs/langs/pt_PT/main.lang                  | 239 +++++++--------
 htdocs/langs/pt_PT/sms.lang                   |   2 +-
 htdocs/langs/ro_RO/accountancy.lang           |   7 +-
 htdocs/langs/ro_RO/admin.lang                 |  10 +-
 htdocs/langs/ro_RO/ecm.lang                   |   2 +-
 htdocs/langs/ro_RO/errors.lang                |   3 +-
 htdocs/langs/ro_RO/interventions.lang         |   2 +-
 htdocs/langs/ro_RO/mails.lang                 |   7 +-
 htdocs/langs/ro_RO/members.lang               |   3 +
 htdocs/langs/ro_RO/mrp.lang                   |   3 +
 htdocs/langs/ro_RO/partnership.lang           |   2 +-
 htdocs/langs/ro_RO/ticket.lang                |   2 +-
 htdocs/langs/ru_RU/admin.lang                 |  10 +-
 htdocs/langs/ru_RU/interventions.lang         |   4 +-
 htdocs/langs/ru_RU/mails.lang                 |   3 +-
 htdocs/langs/ru_RU/ticket.lang                |   2 +-
 htdocs/langs/sk_SK/admin.lang                 |  10 +-
 htdocs/langs/sk_SK/mails.lang                 |   3 +-
 htdocs/langs/sl_SI/accountancy.lang           |   7 +-
 htdocs/langs/sl_SI/admin.lang                 |  10 +-
 htdocs/langs/sl_SI/interventions.lang         |   2 +-
 htdocs/langs/sl_SI/mails.lang                 |   3 +-
 htdocs/langs/sl_SI/partnership.lang           |   2 +-
 htdocs/langs/sl_SI/ticket.lang                |   2 +-
 htdocs/langs/sr_RS/admin.lang                 |  10 +-
 htdocs/langs/sr_RS/mails.lang                 |   3 +-
 htdocs/langs/sv_SE/accountancy.lang           |   7 +-
 htdocs/langs/sv_SE/admin.lang                 |  10 +-
 htdocs/langs/sv_SE/ecm.lang                   |   2 +-
 htdocs/langs/sv_SE/errors.lang                |   3 +-
 htdocs/langs/sv_SE/interventions.lang         |   2 +-
 htdocs/langs/sv_SE/mails.lang                 |   3 +-
 htdocs/langs/sv_SE/members.lang               |   3 +
 htdocs/langs/sv_SE/partnership.lang           |   2 +-
 htdocs/langs/sv_SE/ticket.lang                |   2 +-
 htdocs/langs/ta_IN/admin.lang                 |  10 +-
 htdocs/langs/ta_IN/interventions.lang         |   6 +-
 htdocs/langs/ta_IN/mails.lang                 |   3 +-
 htdocs/langs/ta_IN/ticket.lang                |   5 +-
 htdocs/langs/tg_TJ/admin.lang                 |  10 +-
 htdocs/langs/tg_TJ/interventions.lang         |   6 +-
 htdocs/langs/tg_TJ/mails.lang                 |   3 +-
 htdocs/langs/tg_TJ/ticket.lang                |   5 +-
 htdocs/langs/th_TH/admin.lang                 |  10 +-
 htdocs/langs/th_TH/mails.lang                 |   3 +-
 htdocs/langs/tr_TR/admin.lang                 |  10 +-
 htdocs/langs/tr_TR/mails.lang                 |   3 +-
 htdocs/langs/uk_UA/admin.lang                 |  10 +-
 htdocs/langs/uk_UA/interventions.lang         |   4 +-
 htdocs/langs/uk_UA/mails.lang                 |   3 +-
 htdocs/langs/uk_UA/ticket.lang                |   2 +-
 htdocs/langs/ur_PK/admin.lang                 |  10 +-
 htdocs/langs/ur_PK/interventions.lang         |   6 +-
 htdocs/langs/ur_PK/mails.lang                 |   3 +-
 htdocs/langs/ur_PK/ticket.lang                |   5 +-
 htdocs/langs/uz_UZ/admin.lang                 |  10 +-
 htdocs/langs/uz_UZ/interventions.lang         |   4 +-
 htdocs/langs/uz_UZ/mails.lang                 |   3 +-
 htdocs/langs/uz_UZ/ticket.lang                |  31 +-
 htdocs/langs/vi_VN/admin.lang                 |  12 +-
 htdocs/langs/vi_VN/interventions.lang         |   6 +-
 htdocs/langs/vi_VN/mails.lang                 |   3 +-
 htdocs/langs/zh_CN/admin.lang                 |  10 +-
 htdocs/langs/zh_CN/interventions.lang         |   6 +-
 htdocs/langs/zh_CN/mails.lang                 |   3 +-
 htdocs/langs/zh_TW/admin.lang                 |  10 +-
 htdocs/langs/zh_TW/interventions.lang         |   4 +-
 htdocs/langs/zh_TW/mails.lang                 |   3 +-
 htdocs/langs/zh_TW/partnership.lang           |   2 +-
 htdocs/langs/zh_TW/ticket.lang                |   2 +-
 htdocs/ticket/class/ticket.class.php          |   2 +-
 htdocs/website/samples/wrapper.php            |   2 +-
 298 files changed, 1728 insertions(+), 1147 deletions(-)
 delete mode 100644 htdocs/langs/pt_AO/companies.lang

diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index d4f252bfd43..6d89c8a01d0 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -751,7 +751,7 @@ class Documents extends DolibarrApi
 			throw new RestException(500, "Failed to open file '".$destfiletmp."' for write");
 		}
 
-		$result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1);
+		$result = dol_move($destfiletmp, $destfile, 0, $overwriteifexists, 1, 1);
 		if (!$result) {
 			throw new RestException(500, "Failed to move file into '".$destfile."'");
 		}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 39c4fd50be9..c8bfd09bcd5 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -2203,7 +2203,7 @@ class ActionComm extends CommonObject
 			}
 
 			if ($result >= 0) {
-				if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+				if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
 					$result = 1;
 				} else {
 					$this->error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index b41d913a92e..4e52941063d 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -941,15 +941,8 @@ if (empty($reshook)) {
 				$old_filedir = $conf->contrat->multidir_output[$object->entity].'/'.dol_sanitizeFileName($old_ref);
 				$new_filedir = $conf->contrat->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
 
-				$files = dol_dir_list($old_filedir);
-				if (!empty($files)) {
-					if (!is_dir($new_filedir)) {
-						dol_mkdir($new_filedir);
-					}
-					foreach ($files as $file) {
-						dol_move($file['fullname'], $new_filedir.'/'.$file['name']);
-					}
-				}
+				// Rename directory of contract with new name
+				dol_move_dir($old_filedir, $new_filedir);
 
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index d6b1a275d87..ab55a6baffa 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -838,6 +838,10 @@ class CMailFile
 						$this->error .= ".<br>";
 						$this->error .= $langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+
+						if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+							$this->save_dump_mail_in_err();
+						}
 					} else {
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 					}
@@ -902,6 +906,7 @@ class CMailFile
 
 				if (getDolGlobalString($keyforsmtpauthtype) === "XOAUTH2") {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array
+
 					$keyforsupportedoauth2array = $conf->global->$keyforsmtpoauthservice;
 					if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
 						$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);
@@ -993,6 +998,10 @@ class CMailFile
 						}
 						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".$conf->global->$keyforsmtpport." - ".$this->error, LOG_ERR);
 						$res = false;
+
+						if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+							$this->save_dump_mail_in_err();
+						}
 					}
 				}
 			} elseif ($this->sendmode == 'swiftmailer') {
@@ -1028,6 +1037,7 @@ class CMailFile
 				}
 				if (getDolGlobalString($keyforsmtpauthtype) === "XOAUTH2") {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array
+
 					$keyforsupportedoauth2array = getDolGlobalString($keyforsmtpoauthservice);
 					if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
 						$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);
@@ -1108,6 +1118,7 @@ class CMailFile
 					$this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
 				}
 				// send mail
+				$failedRecipients = array();
 				try {
 					$result = $this->mailer->send($this->message, $failedRecipients);
 				} catch (Exception $e) {
@@ -1124,6 +1135,10 @@ class CMailFile
 					}
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
+
+					if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
+						$this->save_dump_mail_in_err();
+					}
 				} else {
 					dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 				}
@@ -1211,7 +1226,7 @@ class CMailFile
 
 		if (@is_writeable($dolibarr_main_data_root)) {	// Avoid fatal error on fopen with open_basedir
 			$outputfile = $dolibarr_main_data_root."/dolibarr_mail.log";
-			$fp = fopen($outputfile, "w");
+			$fp = fopen($outputfile, "w");	// overwrite
 
 			if ($this->sendmode == 'mail') {
 				fputs($fp, $this->headers);
@@ -1230,6 +1245,25 @@ class CMailFile
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Save content if mail is in error
+	 *  Used for debugging.
+	 *
+	 *  @return	void
+	 */
+	public function save_dump_mail_in_err()
+	{
+		global $dolibarr_main_data_root;
+
+		if (@is_writeable($dolibarr_main_data_root)) {	// Avoid fatal error on fopen with open_basedir
+			$srcfile = $dolibarr_main_data_root."/dolibarr_mail.log";
+			$destfile = $dolibarr_main_data_root."/dolibarr_mail.err";
+
+			dol_move($srcfile, $destfile, 0, 1, 0, 0);
+		}
+	}
+
 
 	/**
 	 * Correct an uncomplete html string
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 919a0c403f6..dd759b37250 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -991,8 +991,8 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
  * @param	string	$srcdir 			Source directory
  * @param	string 	$destdir			Destination directory
  * @param	int		$overwriteifexists	Overwrite directory if exists (1 by default)
- * @param	int		$indexdatabase		Index new file into database.
- * @param	int		$renamedircontent	Rename contents inside srcdir.
+ * @param	int		$indexdatabase		Index new name of files into database.
+ * @param	int		$renamedircontent	Also rename contents inside srcdir after the move to match new destination name.
  *
  * @return boolean 	True if OK, false if KO
 */
@@ -1033,7 +1033,7 @@ function dol_move_dir($srcdir, $destdir, $overwriteifexists = 1, $indexdatabase
 							if ($file["type"] == "dir") {
 								$res = dol_move_dir($filepath.'/'.$oldname, $filepath.'/'.$newname, $overwriteifexists, $indexdatabase, $renamedircontent);
 							} else {
-								$res = dol_move($filepath.'/'.$oldname, $filepath.'/'.$newname);
+								$res = dol_move($filepath.'/'.$oldname, $filepath.'/'.$newname, 0, $overwriteifexists, 0, $indexdatabase);
 							}
 							if (!$res) {
 								return $result;
diff --git a/htdocs/install/doctemplates/websites/website_template-corporate/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-corporate/containers/wrapper.php
index 26adb3ef220..a55522f1c37 100644
--- a/htdocs/install/doctemplates/websites/website_template-corporate/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-corporate/containers/wrapper.php
@@ -162,7 +162,7 @@ if ($rss) {
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
 		if ($result >= 0) {
-			if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
 				$result = 1;
 			} else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
diff --git a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php
index 26adb3ef220..a55522f1c37 100644
--- a/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/wrapper.php
@@ -162,7 +162,7 @@ if ($rss) {
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
 		if ($result >= 0) {
-			if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
 				$result = 1;
 			} else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
diff --git a/htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php
index 26adb3ef220..a55522f1c37 100644
--- a/htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-noimg/containers/wrapper.php
@@ -162,7 +162,7 @@ if ($rss) {
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
 		if ($result >= 0) {
-			if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
 				$result = 1;
 			} else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
diff --git a/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php
index 26adb3ef220..a55522f1c37 100644
--- a/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/wrapper.php
@@ -162,7 +162,7 @@ if ($rss) {
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
 		if ($result >= 0) {
-			if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
 				$result = 1;
 			} else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php
index 26adb3ef220..a55522f1c37 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/wrapper.php
@@ -162,7 +162,7 @@ if ($rss) {
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
 		if ($result >= 0) {
-			if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
 				$result = 1;
 			} else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
diff --git a/htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php b/htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php
index 4f1c281ee93..7ea1d60f72c 100644
--- a/htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php
+++ b/htdocs/install/doctemplates/websites/website_template-stellar/containers/wrapper.php
@@ -143,7 +143,7 @@ if ($rss) {
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
 		if ($result >= 0) {
-			if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
+			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) $result = 1;
 			else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
 				dol_syslog("build_exportfile ".$error, LOG_ERR);
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index d4fb4d12a14..eece89bb6a9 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=تمكين قائمة التحرير والسرد لل
 ACCOUNTING_DATE_START_BINDING=تحديد موعد لبدء الربط والتحويل في المحاسبة. بعد هذا التاريخ ، لن يتم تحويل المعاملات إلى المحاسبة.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=في تحويل المحاسبة ، ما هي الفترة المحددة افتراضيا
 
-ACCOUNTING_SELL_JOURNAL=المبيعات في اليومية العامة (المبيعات و المرتجعات)
-ACCOUNTING_PURCHASE_JOURNAL=المشتريات في اليومية العامة (المشتريات و المرتجعات)
-ACCOUNTING_BANK_JOURNAL=النقدي اليومية ( المقبوضات و المدفوعات)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=دفتر تقرير المصروف اليومي
 ACCOUNTING_MISCELLANEOUS_JOURNAL=اليومية العامة
 ACCOUNTING_HAS_NEW_JOURNAL=له دفتر يوميات جديد
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=سيؤدي هذا إلى حذف جميع سطور المحاس
 ConfirmDeleteMvtPartial=سيؤدي هذا إلى حذف المعاملة من المحاسبة (سيتم حذف جميع الأسطر المتعلقة بنفس المعاملة)
 FinanceJournal=دفتر المالية اليومي
 ExpenseReportsJournal=دفتر تقارير المصاريف
+InventoryJournal=المخزون في اليومية
 DescFinanceJournal=دفتر المالية اليومي المتضمن لجميع الدفعات عن طريق الحساب المصرفي
 DescJournalOnlyBindedVisible=هذه طريقة عرض للسجل مرتبطة بالحساب ويمكن تسجيلها في دفتر اليوميات و الأستاذ.
 VATAccountNotDefined=حساب ضريبة القيمة المضافة غير محدد
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index d931786d3ed..89adb2792e9 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -145,6 +145,7 @@ Box=بريمج
 Boxes=بريمجات
 MaxNbOfLinesForBoxes=الحد الأعلى لعدد أسطر البريمجات
 AllWidgetsWereEnabled=جميع البريمجات المتاحة ممكنة
+WidgetAvailable=Widget available
 PositionByDefault=الطلبية الإفتراضية
 Position=الوضع
 MenusDesc=يقوم مديرو القائمة بتعيين محتوى شريطي القائمة (الأفقي والعمودي).
@@ -374,7 +375,7 @@ DoTestSendHTML=اختبار ارسال هتمل
 ErrorCantUseRazIfNoYearInMask=خطأ، لا يمكن استخدام الخيار @ لإعادة تعيين عداد سنويا إذا تسلسل {} أو {yyyy إنهاء س س س س} ليس في قناع.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خطأ ، لا يمكن للمستخدم الخيار في حال تسلسل @ (ذ ذ م م)) ((سنة أو ملم)) (لا تخفي.
 UMask=معلمة جديدة UMask صورة يونيكس / لينكس / بي إس دي نظام الملفات.
-UMaskExplanation=تسمح لك هذه المعلمة لتحديد الاذونات التي حددها تقصير من الملفات التي أنشأتها Dolibarr على الخادم (خلال تحميلها على سبيل المثال). <br> يجب أن يكون ثمانية القيمة (على سبيل المثال ، 0666 وسائل القراءة والكتابة للجميع). <br> م شمال شرق paramètre سرت sous الامم المتحدة لتقييم الأداء ويندوز serveur.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=قم بإلقاء نظرة على صفحة Wiki للحصول على قائمة بالمساهمين ومنظمتهم
 UseACacheDelay= التخزين المؤقت للتأخير في الرد على الصادرات ثانية (0 فارغة أو لا مخبأ)
 DisableLinkToHelpCenter=إخفاء الارتباط "<b> بحاجة إلى مساعدة أو دعم </b>" في صفحة تسجيل الدخول
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP التحويلات Maxmind القدرات
 Module3200Name=المحفوظات غير القابلة للتغيير
 Module3200Desc=تمكين سجل غير قابل للتغيير لأحداث العمل. يتم أرشفة الأحداث في الوقت الحقيقي. السجل هو جدول للقراءة فقط للأحداث المتسلسلة التي يمكن تصديرها. قد تكون هذه الوحدة إلزامية لبعض البلدان.
 Module3300Name=Module Builder
-Module3200Desc=تمكين سجل غير قابل للتغيير لأحداث العمل. يتم أرشفة الأحداث في الوقت الحقيقي. السجل هو جدول للقراءة فقط للأحداث المتسلسلة التي يمكن تصديرها. قد تكون هذه الوحدة إلزامية لبعض البلدان.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=الشبكات الاجتماعية
 Module3400Desc=قم بتمكين حقول الشبكات الاجتماعية في عناوين وعناوين الأطراف الثالثة (سكايب ، تويتر ، فيسبوك ، ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=استخدم وضع ذاكرة منخفضة
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = الويب هوك
-ModuleWebhookDesc = واجهة للقبض على مشغلات dolibarr وإرسالها إلى عنوان URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = إعداد Webhook
 Settings = الإعدادات
 WebhookSetupPage = صفحة إعداد Webhook
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang
index a48f49f1125..d41c5ad78b2 100644
--- a/htdocs/langs/ar_SA/interventions.lang
+++ b/htdocs/langs/ar_SA/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=يخفي الساعات والدقائق خارج
 InterventionStatistics=إحصائيات التدخلات
 NbOfinterventions=عدد بطاقات التدخل
 NumberOfInterventionsByMonth=عدد بطاقات التدخل بالشهر (تاريخ المصادقة)
-AmountOfInteventionNotIncludedByDefault=لا يتم تضمين مقدار التدخل بشكل افتراضي في الربح (في معظم الحالات ، يتم استخدام الجداول الزمنية لحساب الوقت المنقضي). أضف الخيار PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT إلى 1 في المنزل-الإعداد الآخر لتضمينها.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=تدخل معرف
 InterRef=تدخل المرجع.
 InterDateCreation=تدخل تاريخ الإنشاء
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index d6198e63b8d..bade48937a4 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=رسائل البريد الإلكتروني من الملف
 MailingModuleDescEmailsFromUser=إدخال رسائل البريد الإلكتروني من قبل المستخدم
 MailingModuleDescDolibarrUsers=المستخدمون الذين لديهم رسائل بريد إلكتروني
-MailingModuleDescThirdPartiesByCategories=الأطراف الثالثة (حسب الفئات)
+MailingModuleDescThirdPartiesByCategories=أطراف ثالثة
 SendingFromWebInterfaceIsNotAllowed=الإرسال من واجهة الويب غير مسموح به.
 EmailCollectorFilterDesc=يجب أن تتطابق جميع المرشحات حتى يتم جمع بريد إلكتروني
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=السجل الذي تم إنشاؤه بواسطة
 DefaultBlacklistMailingStatus=القيمة الافتراضية للحقل "%s" عند تكوين جهة اتصال جديدة
 DefaultStatusEmptyMandatory=فارغ ولكنه إلزامي
 WarningLimitSendByDay=تحذير: إعداد أو عقد المثيل الخاص بك يحد من عدد رسائل البريد الإلكتروني يوميًا إلى <b> %s </b>. قد تؤدي محاولة إرسال المزيد إلى إبطاء المثيل أو تعليقه. يرجى الاتصال بالدعم الخاص بك إذا كنت بحاجة إلى حصة أعلى.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/ar_SA/ticket.lang b/htdocs/langs/ar_SA/ticket.lang
index c9f94d6f391..5ca4f12d467 100644
--- a/htdocs/langs/ar_SA/ticket.lang
+++ b/htdocs/langs/ar_SA/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=تم الإنشاء بواسطة
 NewTicket=تذكرة جديدة
 SubjectAnswerToTicket=إجابة التذكرة
 TicketTypeRequest=نوع الطلب
-TicketCategory=تصنيف التذكرة
+TicketCategory=Ticket group
 SeeTicket=عرض التذكرة
 TicketMarkedAsRead=تم تحديد التذكرة كمقروءة
 TicketReadOn=تمت القراءة في
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 4673e1b266a..d1081193b3b 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -145,6 +145,7 @@ Box=Джаджа
 Boxes=Джаджи
 MaxNbOfLinesForBoxes=Максимален брой редове за джаджи
 AllWidgetsWereEnabled=Всички налични джаджи са активирани
+WidgetAvailable=Widget available
 PositionByDefault=Позиция по подразбиране
 Position=Позиция
 MenusDesc=Меню мениджърите определят съдържанието на двете ленти с менюта (хоризонтална и вертикална).
@@ -374,7 +375,7 @@ DoTestSendHTML=Тестово изпращане на HTML
 ErrorCantUseRazIfNoYearInMask=Грешка, не може да се използва опция @, за да нулирате брояча всяка година, ако последователността {yy} или {yyyy} не е в маската.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Грешка, не може да се използва опция @, ако последователността {yy}{mm} или {yyyy}{mm} не са в маската.
 UMask=UMask параметър за нови файлове на Unix / Linux / BSD / Mac файлова система.
-UMaskExplanation=Този параметър ви позволява да дефинирате права, зададени по подразбиране на файлове, които са създадени от Dolibarr на сървъра (например при качване). <br> Необходимо е да бъде в осмична стойност (например 0666 означава четене и запис за всички). <br> Този параметър е безполезен на Windows сървър.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Разгледайте страницата на Wiki за списък на сътрудниците и тяхната организация
 UseACacheDelay= Забавяне при кеширане на отговора за експорт в секунди (0 или празно, за да не се използва кеш)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind възможности за преобразува
 Module3200Name=Неизменими архиви
 Module3200Desc=Непроменлив дневник на бизнес събития. Събитията се архивират в реално време. Дневникът е таблица, достъпна единствено за четене, която съдържа последователни събития, които могат да бъдат експортирани. Този модул може да е задължителен за някои страни.
 Module3300Name=Module Builder
-Module3200Desc=Непроменлив дневник на бизнес събития. Събитията се архивират в реално време. Дневникът е таблица, достъпна единствено за четене, която съдържа последователни събития, които могат да бъдат експортирани. Този модул може да е задължителен за някои страни.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Социални мрежи
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=ЧР
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Настройки
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/bg_BG/interventions.lang b/htdocs/langs/bg_BG/interventions.lang
index f663bbaef23..7f0bc9700d4 100644
--- a/htdocs/langs/bg_BG/interventions.lang
+++ b/htdocs/langs/bg_BG/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Скриване на часовете и мину
 InterventionStatistics=Статистика на интервенции
 NbOfinterventions=Брой интервенции
 NumberOfInterventionsByMonth=Брой интервенции по месец (по дата на валидиране)
-AmountOfInteventionNotIncludedByDefault=Общата продължителност на интервенцията не е включена по подразбиране в печалбата (в повечето случаи за отчитане на времето се използват графиците за отделно време). Добавете опцията PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT със стойност 1 в Начало -> Настройки -> Други настройки, за да я включите.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Идентификатор на интервенция
 InterRef=Съгласно интервенция №
 InterDateCreation=Дата на създаване на интервенцията
@@ -66,3 +66,7 @@ RepeatableIntervention=Шаблон на интервенция
 ToCreateAPredefinedIntervention=За да създадете предварително определена или повтаряща се интервенция, създайте интервенция и я превърнете в шаблон за интервенция.
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
 GenerateInter=Generate intervention
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index ff74df6975f..dda00de8c84 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Контакти с длъжност
 MailingModuleDescEmailsFromFile=Имейли от файл
 MailingModuleDescEmailsFromUser=Имейли, въведени от потребител
 MailingModuleDescDolibarrUsers=Потребители с имейли
-MailingModuleDescThirdPartiesByCategories=Контрагенти (с категории)
+MailingModuleDescThirdPartiesByCategories=Контрагенти
 SendingFromWebInterfaceIsNotAllowed=Изпращането от уеб интерфейса не е позволено.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 4247f427a42..2703cd2de2d 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Subjekti
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 946fd976dde..fb08eca1b7f 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -95,13 +95,13 @@ ChangeAndLoad=Canviar i carregar
 Addanaccount=Afegir un compte comptable
 AccountAccounting=Compte comptable
 AccountAccountingShort=Compte
-SubledgerAccount=Subcompte comptable
-SubledgerAccountLabel=Nom del compte del llibre major
+SubledgerAccount=Compte de subllibre
+SubledgerAccountLabel=Nom del compte de subllibre
 ShowAccountingAccount=Mostrar diari de comptes
 ShowAccountingJournal=Mostrar diari comptable
 ShowAccountingAccountInLedger=Mostra el compte comptable al Llibre major
 ShowAccountingAccountInJournals=Mostra el compte comptable als diaris
-DataUsedToSuggestAccount=Data used to suggest account
+DataUsedToSuggestAccount=Dades utilitzades per a suggerir un compte
 AccountAccountingSuggest=Compte suggerit
 MenuDefaultAccounts=Comptes per defecte
 MenuBankAccounts=Comptes bancaris
@@ -125,7 +125,7 @@ UpdateMvts=Modificació d'una transacció
 ValidTransaction=Valida l'assentament
 WriteBookKeeping=Registrar transaccions en comptabilitat
 Bookkeeping=Llibre major
-BookkeepingSubAccount=Subcompte
+BookkeepingSubAccount=Subquadern
 AccountBalance=Compte saldo
 AccountBalanceSubAccount=Saldo de subcomptes
 ObjectsRef=Referència de l'objecte origen
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Activa la llista combinada per a un compte subsidiari
 ACCOUNTING_DATE_START_BINDING=Definiu una data per a començar la vinculació i transferència a la comptabilitat. Per sota d’aquesta data, les transaccions no es transferiran a la comptabilitat.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En la transferència comptable, quin és el període seleccionat per defecte
 
-ACCOUNTING_SELL_JOURNAL=Diari de vendes (vendes i devolucions)
-ACCOUNTING_PURCHASE_JOURNAL=Diari de compres (compres i devolucions)
-ACCOUNTING_BANK_JOURNAL=Diari d'efectiu (entrades i desemborsaments)
+ACCOUNTING_SELL_JOURNAL=Diari de vendes: vendes i devolucions
+ACCOUNTING_PURCHASE_JOURNAL=Diari de compres: compres i devolucions
+ACCOUNTING_BANK_JOURNAL=Diari d'efectiu: rebuts i desemborsaments
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diari de l'informe de despeses
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diari general
 ACCOUNTING_HAS_NEW_JOURNAL=Té un nou Diari
@@ -185,27 +185,27 @@ TransitionalAccount=Compte de transferència bancària transitòria
 
 ACCOUNTING_ACCOUNT_SUSPENSE=Compte (del pla comptable) que s'utilitzarà com a compte per als fons no assignats, ja siguin rebuts o pagats, és a dir, fons en "espera"
 DONATION_ACCOUNTINGACCOUNT=Compte (del pla comptable) que s'utilitzarà per a registrar donacions (mòdul de donacions)
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Account (from the Chart Of Account) to be used to register memberships subscriptions (Membership module - if membership recorded without invoice)
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte (del pla comptable) que s'utilitzarà per a registrar les subscripcions de socis (mòdul d'afiliació - si l'afiliació es registra sense factura)
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Account (from the Chart Of Account) to be used as the default account to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per registrar el dipòsit del client
 UseAuxiliaryAccountOnCustomerDeposit=Emmagatzema el compte del client com a compte individual al llibre major subsidiari per a les línies de pagament inicial (si està desactivat, el compte individual per a les línies de pagament inicial romandrà buit)
-ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Account (from the Chart Of Account) to be used as the default
+ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT=Compte (del pla comptable) que s'utilitzarà com a predeterminat
 UseAuxiliaryAccountOnSupplierDeposit=Emmagatzema el compte del proveïdor com a compte individual al llibre major subsidiari per a les línies de pagament inicial (si està desactivat, el compte individual de les línies de pagament inicial romandrà buit)
-ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Accounting account by default to register customer retained warranty
+ACCOUNTING_ACCOUNT_CUSTOMER_RETAINED_WARRANTY=Compte comptable per defecte per a registrar la garantia retinguda del client
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als productes comprats al mateix país (utilitzat si no està definit a la fitxa del producte)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products purchased and imported from any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als productes comprats des de la CEE a un altre país de la CEE (utilitzat si no està definit a la fitxa del producte)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als productes comprats i importats de qualsevol altre país estranger (utilitzat si no està definit a la fitxa del producte)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als productes venuts (utilitzat si no està definit a la fitxa del producte)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold from EEC to another EEC country (used if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the products sold and exported to any other foreign country (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als productes venuts des de la CEE a un altre país de la CEE (utilitzat si no està definit a la fitxa del producte)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als productes venuts i exportats a qualsevol altre país estranger (utilitzat si no està definit a la fitxa del producte)
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als serveis adquirits al mateix país (utilitzat si no està definit al full de servei)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services purchased and imported from other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als serveis adquirits de la CEE a un altre país de la CEE (utilitzat si no està definit al full de servei)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als serveis comprats i importats d'un altre país estranger (utilitzat si no està definit al full de servei)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als serveis venuts (utilitzat si no està definit al full de servei)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold from EEC to another EEC country (used if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Account (from the Chart Of Account) to be used as the default account for the services sold and exported to any other foreign country (used if not defined in the service sheet)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als serveis venuts des de la CEE a un altre país de la CEE (utilitzat si no està definit al full de servei)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a compte predeterminat per als serveis venuts i exportats a qualsevol altre país estranger (utilitzat si no està definit al full de servei)
 
 Doctype=Tipus de document
 Docdate=Data
@@ -223,7 +223,7 @@ TransactionNumShort=Número de transacció
 AccountingCategory=Grup de comptes personalitzat
 AccountingCategories=Grups de comptes personalitzats
 GroupByAccountAccounting=Agrupa per compte major
-GroupBySubAccountAccounting=Agrupa per subcompte comptable
+GroupBySubAccountAccounting=Agrupa per compte del subllibre
 AccountingAccountGroupsDesc=Podeu definir aquí alguns grups de comptes comptables. S'utilitzaran per a informes comptables personalitzats.
 ByAccounts=Per comptes
 ByPredefinedAccountGroups=Per grups predefinits
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Això suprimirà totes les línies de comptabilitat per a l'any
 ConfirmDeleteMvtPartial=Això suprimirà la transacció de la comptabilitat (se suprimiran totes les línies relacionades amb la mateixa transacció)
 FinanceJournal=Diari de finances
 ExpenseReportsJournal=Informe-diari de despeses
+InventoryJournal=Diari d'inventari
 DescFinanceJournal=Diari financer que inclou tots els tipus de pagaments per compte bancari
 DescJournalOnlyBindedVisible=Aquesta és una vista de registre que està vinculada a un compte comptable i que es pot registrar als diaris i llibres majors.
 VATAccountNotDefined=Comptes comptables d'IVA sense definir
@@ -257,9 +258,9 @@ DescThirdPartyReport=Consulteu aquí la llista dels clients i proveïdors de ter
 ListAccounts=Llistat dels comptes comptables
 UnknownAccountForThirdparty=Compte comptable de tercer desconeguda, utilitzarem %s
 UnknownAccountForThirdpartyBlocking=Compte comptable de tercer desconegut. Error de bloqueig
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Compte Subterrani no definit o desconegut per tercers o usuaris. Utilitzarem %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Compte de subllibre no definit o tercer o usuari desconegut. Utilitzarem %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Tercer desconegut i subcompte comptable no definit al pagament. Es manté buit el valor del subcompte comptable.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Compte Subterrani no definit o desconegut per tercers o usuaris. Error de bloqueig.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Compte de subllibre no definit o tercer o usuari desconegut. Error de bloqueig.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Compte de tercers desconegut i compte d'espera no definit. Error de bloqueig
 PaymentsNotLinkedToProduct=Pagament no vinculat a cap producte / servei
 OpeningBalance=Saldo d'obertura
@@ -269,7 +270,7 @@ ShowSubtotalByGroup=Mostra el subtotal per nivell
 
 Pcgtype=Grup de comptes
 PcgtypeDesc=S'utilitzen grups de comptes com a criteris predefinits de «filtre» i «agrupació» per a alguns informes de comptabilitat. Per exemple, «INGRESSOS» o «DESPESES» s'utilitzen com a grups per a comptes comptables de productes per a crear l'informe de despeses/ingressos.
-AccountingCategoriesDesc=Custom group of accounts can be used to group accounting accounts into one name to ease filter use or building of custom reports.
+AccountingCategoriesDesc=El grup de comptes personalitzat es pot utilitzar per a agrupar els comptes comptables en un sol nom per a facilitar l'ús del filtre o la creació d'informes personalitzats.
 
 Reconcilable=Reconciliable
 
@@ -299,7 +300,7 @@ DescValidateMovements=Queda prohibida qualsevol modificació o supressió de reg
 
 ValidateHistory=Comptabilitza automàticament
 AutomaticBindingDone=Enllaços automàtics fets (%s): l'enllaç automàtic no és possible per a alguns registres (%s)
-DoManualBindingForFailedRecord=You have to do a manual link for the %s row(s) not linked automatically.
+DoManualBindingForFailedRecord=Heu de fer un enllaç manual per a les %s files no enllaçades automàticament.
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no podeu eliminar ni desactivar aquest compte del pla comptable perquè està en ús
 MvtNotCorrectlyBalanced=Moviment no equilibrat correctament. Dèbit = %s i crèdit = %s
@@ -342,11 +343,11 @@ NumberOfAccountancyMovements=Nombre de moviments
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Desactiva la vinculació i transferència de comptabilitat en vendes (les factures dels clients no es tindran en compte a la comptabilitat)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactiva la vinculació i transferència a la comptabilitat de les compres (les factures de proveïdors no es tindran en compte a la comptabilitat)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactiva la vinculació i transferència de comptes en els informes de despeses (els informes de despeses no es tindran en compte a la comptabilitat)
-ACCOUNTING_ENABLE_LETTERING=Enable the lettering function in the accounting
+ACCOUNTING_ENABLE_LETTERING=Habiliteu la funció de lletres a la comptabilitat
 ACCOUNTING_ENABLE_AUTOLETTERING=Habiliteu la lletra automàtica en traspassar a la comptabilitat
 
 ## Export
-NotExportLettering=Do not export the lettering when generating the file
+NotExportLettering=No exporteu la lletra en generar el fitxer
 NotifiedExportDate=Marca les línies exportades com a Exportades <span class="warning">(per a modificar una línia, hauràs de suprimir tota la transacció i tornar-la a transferir a la comptabilitat)</span>
 NotifiedValidationDate=Validar i bloquejar les entrades exportades <span class="warning">(mateix efecte que la característica "%s", la modificació i la supressió de les línies DEFINITIVAMENT no seran possibles)</span>
 NotifiedExportFull=Exportar documents?
@@ -406,7 +407,7 @@ SaleLocal=Venda local
 SaleExport=Venda d’exportació
 SaleEEC=Venda en CEE
 SaleEECWithVAT=Venda a la CEE amb un IVA que no és nul, per la qual cosa suposem que NO es tracta d’una venda intracomunitària i el compte suggerit és el compte estàndard del producte.
-SaleEECWithoutVATNumber=Sale in EEC with no VAT but the VAT ID of thirdparty is not defined. We fall back on the account for standard sales. You can fix the VAT ID of the thirdparty, or change the product account suggested for binding if needed.
+SaleEECWithoutVATNumber=Venda a la CEE sense IVA, però l'identificador d'IVA del tercer no està definit. Tornem al compte de vendes estàndard. Podeu corregir l'identificador d'IVA del tercer o canviar el compte del producte suggerit per vincular-lo si cal.
 ForbiddenTransactionAlreadyExported=Prohibit: la transacció ha estat validada i/o exportada.
 ForbiddenTransactionAlreadyValidated=Prohibit: la transacció s'ha validat.
 ## Dictionary
@@ -430,7 +431,7 @@ AccountancyUnletteringModifiedSuccessfully=%s conciliació desfeta correctament
 ## Confirm box
 ConfirmMassUnletteringAuto=Confirmació de desconciliació automàtica massiva
 ConfirmMassUnletteringManual=Confirmació de desconciliació manual massiva
-ConfirmMassUnletteringQuestion=Are you sure you want to unreconcile the %s selected record(s)?
+ConfirmMassUnletteringQuestion=Esteu segur que voleu anul·lar la conciliació dels registres seleccionats %s?
 ConfirmMassDeleteBookkeepingWriting=Confirmació d'esborrament massiu
 ConfirmMassDeleteBookkeepingWritingQuestion=Això suprimirà la transacció de la comptabilitat (se suprimiran totes les línies relacionades amb la mateixa transacció) Esteu segur que voleu suprimir els registres seleccionats %s?
 
@@ -461,11 +462,11 @@ FECFormatEntryNum=Número de peça (EcritureNum)
 FECFormatEntryDate=Data de la peça (EcritureDate)
 FECFormatGeneralAccountNumber=Número de compte general (CompteNum)
 FECFormatGeneralAccountLabel=Nom de compte general (CompteLib)
-FECFormatSubledgerAccountNumber=Número de compte de Subledger (CompAuxNum)
-FECFormatSubledgerAccountLabel=Número de compte de Subledger (CompAuxLib)
+FECFormatSubledgerAccountNumber=Número de compte auxiliar (CompAuxNum)
+FECFormatSubledgerAccountLabel=Número de compte auxiliar (CompAuxLib)
 FECFormatPieceRef=Peça ref. (PieceRef)
 FECFormatPieceDate=Creació de la data de la peça (PieceDate)
-FECFormatLabelOperation=Funcionament de l'etiqueta (EcritureLib)
+FECFormatLabelOperation=Nom de l'operació (EcritureLib)
 FECFormatDebit=Dèbit (dèbit)
 FECFormatCredit=Crèdit (Crèdit)
 FECFormatReconcilableCode=Codi reconciliable (EcritureLet)
@@ -477,7 +478,7 @@ FECFormatMulticurrencyCode=Codi multidivisa (Idevise)
 DateExport=Data d'exportació
 WarningReportNotReliable=Avís, aquest informe no està basat en el Llibre Major, de manera que no conté assentaments modificats manualment en el Llibre Major. Si el registre diari està actualitzat, la vista de comptes és més precisa.
 ExpenseReportJournal=Diari d'informe de despeses
-DocsAlreadyExportedAreExcluded=Docs already exported are excluded
-ClickToHideAlreadyExportedLines=Click to hide already exported lines
+DocsAlreadyExportedAreExcluded=S'exclouen els documents ja exportats
+ClickToHideAlreadyExportedLines=Feu clic per a amagar les línies ja exportades
 
 NAccounts=comptes %s
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index ff208a7cf9d..1090b132747 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -87,7 +87,7 @@ NotAvailableWhenAjaxDisabled=No disponible quan Ajax estigui desactivat
 AllowToSelectProjectFromOtherCompany=En un document d'un tercer, pots triar un projecte enllaçat a un altre tercer
 TimesheetPreventAfterFollowingMonths=Eviteu el temps de gravació passat el següent nombre de mesos
 JavascriptDisabled=Javascript desactivat
-UsePreviewTabs=Veure fitxes "vista prèvia"
+UsePreviewTabs=Utilitzeu pestanyes de vista prèvia
 ShowPreview=Veure previsualització
 ShowHideDetails=Mostra-Amaga els detalls
 PreviewNotAvailable=Vista prèvia no disponible
@@ -111,7 +111,7 @@ UseCaptchaCode=Utilitzeu el codi gràfic (CAPTCHA) a la pàgina d'inici de sessi
 AntiVirusCommand=Camí complet a l'ordre antivirus
 AntiVirusCommandExample=Exemple per al dimoni ClamAv (requereix clamav-daemon): /usr/bin/clamdscan<br>Exemple per a ClamWin (molt molt lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Més paràmetres a la línia d'ordres
-AntiVirusParamExample=Exemple per al dimoni de ClamAv: --fdpass<br>Exemple per a ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Exemple del dimoni de ClamAv: --fdpass<br>Exemple de ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Configuració del mòdul Comptabilitat
 UserSetup=Configuració de gestió d'usuaris
 MultiCurrencySetup=Configuració multidivisa
@@ -145,6 +145,7 @@ Box=Panell
 Boxes=Panells
 MaxNbOfLinesForBoxes=Màx. nombre de línies pels panells
 AllWidgetsWereEnabled=Tots els widgets disponibles estan habilitats
+WidgetAvailable=Giny disponible
 PositionByDefault=Posició per defecte
 Position=Lloc
 MenusDesc=Els gestors de menú configuren el contingut de les dues barres de menú (horitzontal i vertical).
@@ -346,13 +347,13 @@ UnpackPackageInModulesRoot=Per a implementar/instal·lar un mòdul extern, heu d
 SetupIsReadyForUse=La instal·lació del mòdul ha finalitzat. No obstant això, ha d'habilitar i configurar el mòdul en la seva aplicació, aneu a la pàgina per a configurar els mòduls: <a href="%s">%s</a>.
 NotExistsDirect=No s'ha definit el directori arrel alternatiu a un directori existent.<br>
 InfDirAlt=Des de la versió 3, és possible definir un directori arrel alternatiu. Això li permet emmagatzemar, en un directori dedicat, plug-ins i plantilles personalitzades.<br>Només ha de crear un directori a l'arrel de Dolibarr (per exemple: custom).<br>
-InfDirExample=Llavors <br>declareu-ho a l'arxiu <strong>conf.php </strong><br> $dolibarr_main_url_root_alt='/custom'<br> $dolibarr_main_document_root_alt='/ruta/del/dolibarr/htdocs/custom'<br> Si aquestes línies estan comentades amb "#", per a activar-les simplement descomenteu-les traient el caràcter "#".
+InfDirExample=<br>Llavors declareu-ho al fitxer <strong>conf.php</strong><br>  $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/cami/del/dolibarr/htdocs/custom'<br>Si aquestes línies estan comentades amb «#», per a activar-les només cal treure el comentari eliminant el caràcter «#».
 YouCanSubmitFile=Podeu pujar el fitxer .zip del paquet del mòdul des d’aquí:
 CurrentVersion=Versió actual de Dolibarr
 CallUpdatePage=Aneu a la pàgina que actualitza l'estructura i les dades de la base de dades: %s.
 LastStableVersion=Última versió estable
-LastActivationDate=Data de l'última activació
-LastActivationAuthor=Últim autor d'activació
+LastActivationDate=Última data d'activació
+LastActivationAuthor=Autor de l'última activació
 LastActivationIP=Última IP d'activació
 LastActivationVersion=Última versió d'activació
 UpdateServerOffline=Actualitza el servidor fora de línia
@@ -374,11 +375,11 @@ DoTestSendHTML=Prova l'enviament HTML
 ErrorCantUseRazIfNoYearInMask=Error, no es pot utilitzar l'opció @ per a restablir el comptador cada any si la seqüència {yy} o {yyyy} no està emmascarada.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no es pot usar opció @ si la seqüència (yy) (mm) o (yyyy) (mm) no es troba a la màscara.
 UMask=Paràmetre UMask de nous fitxers en Unix/Linux/BSD.
-UMaskExplanation=Aquest paràmetre determina els drets dels arxius creats en el servidor Dolibarr (durant la pujada, per exemple).<br>Aquest ha de ser el valor octal (per exemple, 0666 significa lectura/escriptura per a tots).<br>Aquest paràmetre no té cap efecte sobre un servidor Windows.
+UMaskExplanation=Aquest paràmetre us permet definir els permisos establerts per defecte als fitxers creats per Dolibarr al servidor (durant la càrrega, per exemple).<br>Ha de ser el valor octal (per exemple, 0666 significa llegir i escriure per a tothom). El valor recomanat és 0600 o 0660<br>Aquest paràmetre no té ús en un servidor Windows.
 SeeWikiForAllTeam=Mireu la pàgina Wiki per a obtenir una llista dels col·laboradors i la seva organització
 UseACacheDelay= Demora en memòria cau de l'exportació en segons (0 o buit sense memòria)
-DisableLinkToHelpCenter=Amagueu l'enllaç "<b> Necessiteu ajuda o assistència </b>" a la pàgina d'inici de sessió
-DisableLinkToHelp=Amagueu l'enllaç a l'ajuda en línia "<b> %s </b>"
+DisableLinkToHelpCenter=Amaga l'enllaç «<b>Necessites ajuda o assistència</b>» a la pàgina d'inici de sessió
+DisableLinkToHelp=Amaga l'enllaç a l'ajuda en línia «<b>%s</b>»
 AddCRIfTooLong=No hi ha cap tall de text automàtic, el text massa llarg no es mostrarà als documents. Si cal, afegiu devolucions de carro a l'àrea de text.
 ConfirmPurge=Esteu segur que voleu executar aquesta purga? <br>Això suprimirà permanentment tots els fitxers de dades sense opció de restaurar-los (fitxers del GED, fitxers adjunts...).
 MinLength=Longitud mínima
@@ -393,14 +394,14 @@ FollowingSubstitutionKeysCanBeUsed= <br> Per a saber com crear les teves plantil
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
 FirstnameNamePosition=Posició del Nom/Cognoms
 DescWeather=Les imatges següents es mostraran al tauler de control quan el nombre d'accions posteriors arriba als valors següents:
-KeyForWebServicesAccess=Clau per a utilitzar els serveis web (paràmetre "dolibarrkey" als serveis web)
+KeyForWebServicesAccess=Clau per a utilitzar els serveis web (paràmetre «dolibarrkey» als serveis web)
 TestSubmitForm=Formulari de proves
 ThisForceAlsoTheme=L’ús d’aquest gestor de menús també farà servir el seu propi tema sigui quina sigui l’opció de l’usuari. A més, aquest gestor de menú especialitzat per a telèfons intel·ligents no funciona en tots els telèfons intel·ligents. Utilitzeu un altre gestor de menús si teniu problemes amb el vostre.
 ThemeDir=Directori dels temes
 ConnectionTimeout=Temps d'espera de connexió
 ResponseTimeout=Timeout de resposta
 SmsTestMessage=Missatge de prova de __PHONEFROM__ per __PHONETO__
-ModuleMustBeEnabledFirst=El mòdul "<b>%s</b>" ha d'habilitar-se primer si necessita aquesta funcionalitat.
+ModuleMustBeEnabledFirst=El mòdul <b>%s</b> s'ha d'activar primer si necessiteu aquesta funció.
 SecurityToken=Clau per a protegir els URL
 NoSmsEngine=No hi ha cap gestor de remitents d'SMS disponible. Un gestor de remitents d'SMS no està instal·lat amb la distribució predeterminada perquè depenen d'un proveïdor extern, però podeu trobar-ne alguns a %s
 PDF=PDF
@@ -451,7 +452,7 @@ ExtrafieldCheckBox=Caselles de selecció
 ExtrafieldCheckBoxFromList=Caselles de selecció des d'una taula
 ExtrafieldLink=Enllaç a un objecte
 ComputedFormula=Camp calculat
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $objectoffield</strong>.<br><strong>WARNING</strong>: If you need properties of an object not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Podeu introduir aquí una fórmula utilitzant altres propietats de l’objecte o qualsevol codi PHP per a obtenir un valor calculat dinàmicament. Podeu utilitzar qualsevol fórmula compatible amb PHP, inclòs l'operador condicional «?»  i els següents objectes globals:<strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATENCIÓ</strong>: Només poden estar disponibles algunes propietats de $object. Si necessiteu una propietat no carregada, només cal que incorporeu l'objecte a la vostra fórmula com en el segon exemple.<br>Utilitzar un camp calculat implica que no podreu introduir cap valor des de la interfície. A més, si hi ha un error de sintaxi, la fórmula pot no tornar res.<br><br>Exemple de fórmula:<br>$objectoffield->id < 10 ? round($objectoffield->id / 2, 2): ($objectoffield->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Exemple per a tornar a carregar l'objecte <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0 ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1')<br><br>Un altre exemple de fórmula per a forçar la càrrega de l'objecte i el seu objecte pare:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($objectoffield->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
 Computedpersistent=Emmagatzemar el camp computat
 ComputedpersistentDesc=Els camps addicionals calculats s’emmagatzemaran a la base de dades, però el valor només es recalcularà quan es canviï l’objecte d’aquest camp. Si el camp calculat depèn d'altres objectes o dades globals, aquest valor pot ser incorrecte!!
 ExtrafieldParamHelpPassword=Si deixeu aquest camp en blanc, vol dir que aquest valor s'emmagatzemarà sense xifratge (el camp només s'ha d'amagar amb una estrella a la pantalla). <br> Establiu 'auto' per a utilitzar la regla de xifratge predeterminada per a desar la contrasenya a la base de dades (aleshores, el valor llegit serà només el hash, no hi ha manera de recuperar el valor original)
@@ -512,8 +513,8 @@ DependsOn=Aquest mòdul necessita els mòduls
 RequiredBy=Aquest mòdul és requerit pel/s mòdul/s
 TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Es necessiten coneixements tècnics per a llegir el contingut de la pàgina HTML per a obtenir el nom clau d’un camp.
 PageUrlForDefaultValues=Has d'introduir aquí l'URL relatiu de la pàgina. Si inclous paràmetres a l'URL, els valors predeterminats seran efectius si tots els paràmetres s'estableixen en el mateix valor.
-PageUrlForDefaultValuesCreate=<br>Exemple:<br>Per al formulari per a crear un tercer nou, és <strong>%s</strong>.<br>Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu el "custom/", així que utilitzeu una ruta com <strong>mymodule/mypage.php</strong> i no custom/mymodule/mypage.php.<br>Si només voleu un valor per defecte si l'URL té algun paràmetre, podeu utilitzar <strong>%s</strong>
-PageUrlForDefaultValuesList= <br>Exemple:<br> Per a la pàgina que llista els tercers, és <strong>%s</strong>. <br> Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no incloeu el "custom/", de manera que utilitzeu una ruta com <strong>mymodule/mypagelist.php </strong> i no custom/mymodule/mypagelist.php. <br> Si només voleu un valor per defecte si l'URL té algun paràmetre, podeu utilitzar <strong>%s</strong>
+PageUrlForDefaultValuesCreate=<br>Exemple:<br>Per al formulari per a crear un tercer nou, és <strong>%s</strong>.<br>Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no inclogueu el «custom/», de manera que utilitzeu un camí com <strong>elmeumodul/lamevapagina.php</strong> i no custom/elmeumodul/lamevapagina.php.<br>Si només voleu un valor predeterminat si l'URL té algun paràmetre, podeu utilitzar <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Exemple:<br>Per a la pàgina que llista els tercers, és <strong>%s</strong>.<br>Per a l'URL dels mòduls externs instal·lats al directori personalitzat, no inclogueu «custom/», així que utilitzeu un camí com <strong>elmeumodul/lamevapaginallistat.php</strong> i no custom/elmeumodul/lamevapaginallistat.php.<br>Si només voleu un valor predeterminat si l'URL té algun paràmetre, podeu utilitzar <strong>%s</strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=També tingueu en compte que sobreescriure valors predeterminats per a la creació de formularis funciona només per a pàgines dissenyades correctament (de manera que amb el paràmetre action = create o presend ...)
 EnableDefaultValues=Activa la personalització dels valors predeterminats
 EnableOverwriteTranslation=Permet la personalització de les traduccions
@@ -646,7 +647,7 @@ Module2300Desc=Gestió de tasques programades (àlies cron o taula de crons)
 Module2400Name=Esdeveniments/Agenda
 Module2400Desc=Seguiment d'esdeveniments. Registre d'esdeveniments automàtics per a fer el seguiment o registrar esdeveniments manuals o reunions. Aquest és el mòdul principal per a una bona gestió de la relació amb clients o proveïdors.
 Module2430Name=Sistema de calendari de reserves
-Module2430Desc=Provide an online calendar to allow anyone to book rendez-vous, according to predefined ranges or availabilities.
+Module2430Desc=Proporcioneu un calendari en línia per a permetre que qualsevol persona pugui reservar una cita, segons els rangs o les disponibilitats predefinits.
 Module2500Name=SGD / GCE
 Module2500Desc=Sistema de gestió de documents / Gestió de continguts electrònics. Organització automàtica dels vostres documents generats o emmagatzemats. Compartiu-los quan ho necessiteu.
 Module2600Name=Serveis API / Web (servidor SOAP)
@@ -663,7 +664,7 @@ Module2900Desc=Capacitats de conversió GeoIP Maxmind
 Module3200Name=Arxius inalterables
 Module3200Desc=Activa el registre d'alguns esdeveniments de negoci en un registre inalterable. Els esdeveniments s'arxiven en temps real. El registre és una taula d'esdeveniments encadenats que només es poden llegir i exportar. Aquest mòdul pot ser obligatori per a alguns països.
 Module3300Name=Creador de mòduls
-Module3200Desc=Activa el registre d'alguns esdeveniments de negoci en un registre inalterable. Els esdeveniments s'arxiven en temps real. El registre és una taula d'esdeveniments encadenats que només es poden llegir i exportar. Aquest mòdul pot ser obligatori per a alguns països.
+Module3300Desc=Una eina RAD (Desenvolupament ràpid d'aplicacions: codi baix i sense codi) per a ajudar els desenvolupadors o usuaris avançats a crear el seu propi mòdul/aplicació.
 Module3400Name=Xarxes socials
 Module3400Desc=Activa els camps de les xarxes socials a tercers i adreces (skype, twitter, facebook...).
 Module4000Name=RH
@@ -704,8 +705,8 @@ Module62000Name=Incoterms
 Module62000Desc=Afegeix funcions per a gestionar Incoterms
 Module63000Name=Recursos
 Module63000Desc=Gestiona els recursos (impressores, cotxes, habitacions...) que pots compartir en esdeveniments
-Module66000Name=Enable OAuth2 authentication
-Module66000Desc=Provide a tool to generate and manage OAuth2 tokens. The token can then be used by some other modules.
+Module66000Name=Activa l'autenticació OAuth2
+Module66000Desc=Proporcioneu una eina per a generar i gestionar fitxes OAuth2. El testimoni pot ser utilitzat per alguns altres mòduls.
 Module94160Name=Recepcions
 Permission11=Consulta les factures dels clients (i els cobraments)
 Permission12=Crear/Modificar factures
@@ -860,7 +861,7 @@ Permission331=Consultar bookmarks
 Permission332=Crear/modificar bookmarks
 Permission333=Eliminar bookmarks
 Permission341=Consultar els seus propis permisos
-Permission342=Crear/modificar la seva pròpia info d'usuari
+Permission342=Crea/modifica la seva pròpia informació d'usuari
 Permission343=Modificar la seva pròpia contrasenya
 Permission344=Modificar els seus propis permisos
 Permission351=Consultar els grups
@@ -980,9 +981,9 @@ Permission3301=Genera mòduls nous
 Permission4001=Llegir habilitat/ocupació/posició
 Permission4002=Crear/modificar habilitat/ocupació/posició
 Permission4003=Esborra habilitat/ocupació/posició
-Permission4021=Read evaluations (yours and your subordinates)
-Permission4022=Create/modify evaluations
-Permission4023=Validate evaluation
+Permission4021=Consulta les avaluacions (teves i dels teus subordinats)
+Permission4022=Crear/modificar avaluacions
+Permission4023=Valida l'avaluació
 Permission4025=Elimina l'avaluació
 Permission4028=Veure menú comparatiu
 Permission4031=Llegeix informació personal
@@ -1102,7 +1103,7 @@ VATManagement=Gestió IVA
 VATIsUsedDesc=De manera predeterminada, quan es creen clients potencials, factures, comandes, etc., la tarifa de l'impost de vendes segueix la norma estàndard activa: <br> Si el venedor no està subjecte a l'impost de vendes, l'impost de vendes s'estableix per defecte a 0. Final de la regla. <br> Si el (país del venedor = país del comprador), l'impost de vendes per defecte és igual a l'impost de vendes del producte al país del venedor. Fi de la regla. <br> Si el venedor i el comprador es troben a la Comunitat Europea i els productes són productes relacionats amb el transport (transport, enviament, línia aèria), l'IVA per defecte és 0. Aquesta norma depèn del país del venedor, consulteu amb el vostre comptador. L'IVA s'ha de pagar pel comprador a l'oficina de duanes del seu país i no al venedor. Fi de la regla. <br> Si el venedor i el comprador es troben a la Comunitat Europea i el comprador no és una empresa (amb un número d'IVA intracomunitari registrat), l'IVA es fa per defecte al tipus d'IVA del país del venedor. Fi de la regla. <br> Si el venedor i el comprador es troben a la Comunitat Europea i el comprador és una empresa (amb un número d'IVA intracomunitari registrat), l'IVA és 0 per defecte. Fi de la regla. <br> En qualsevol altre cas, el valor predeterminat proposat és l'impost de vendes = 0. Fi de la regla.
 VATIsNotUsedDesc=El tipus d'IVA proposat per defecte és 0. Aquest és el cas d'associacions, particulars o algunes petites societats.
 VATIsUsedExampleFR=A França, es tracta de les societats o organismes que trien un règim fiscal general (General simplificat o General normal), règim en el qual es declara l'IVA.
-VATIsNotUsedExampleFR=A França, es tracta d'associacions que no siguin declarades per vendes o empreses, organitzacions o professions liberals que hagin triat el sistema fiscal de la microempresa (Impost sobre vendes en franquícia) i paguen una franquícia. Impost sobre vendes sense declaració d'impost sobre vendes. Aquesta elecció mostrarà la referència "Impost sobre vendes no aplicable - art-293B de CGI" a les factures.
+VATIsNotUsedExampleFR=A França, s'entén per associacions que no declaren l'impost de vendes o d'empreses, organitzacions o professions liberals que han escollit el sistema fiscal de microempresa (Impost sobre vendes en franquícia) i han pagat un impost sobre vendes de franquícia sense cap declaració d'impost sobre vendes. Aquesta opció mostrarà la referència «Impost sobre vendes no aplicable - art-293B de CGI» a les factures.
 ##### Local Taxes #####
 TypeOfSaleTaxes=Tipus d’impost sobre vendes
 LTRate=Tarifa
@@ -1208,7 +1209,7 @@ DoNotSuggestPaymentMode=No ho suggereixis
 NoActiveBankAccountDefined=Cap compte bancari actiu definit
 OwnerOfBankAccount=Titular del compte %s
 BankModuleNotActive=Mòdul comptes bancaris no activat
-ShowBugTrackLink=Mostra l'enllaç "<strong> %s </strong>"
+ShowBugTrackLink=Mostra l'enllaç «<strong>%s</strong>»
 ShowBugTrackLinkDesc=Manteniu-lo buit per no mostrar aquest enllaç, utilitzeu el valor 'github' per a l'enllaç al projecte Dolibarr o definiu directament un URL 'https://...'
 Alerts=Alertes
 DelaysOfToleranceBeforeWarning=S'està mostrant una alerta d'advertència per...
@@ -1236,7 +1237,7 @@ SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Aquest programari és
 SetupDescription5=Altres entrades del menú d'instal·lació gestionen paràmetres opcionals.
 SetupDescriptionLink= <a href="%s"> %s - %s </a>
 SetupDescription3b=Paràmetres bàsics utilitzats per a personalitzar el comportament predeterminat de la vostra aplicació (p. ex., per a funcions relacionades amb el país).
-SetupDescription4b=This software is a suite of many modules/applications. The modules related to your needs must be activated. Menu entries will appears with the activation of these modules.
+SetupDescription4b=Aquest programari és un conjunt de molts mòduls/aplicacions. Cal activar els mòduls relacionats amb les vostres necessitats. Les entrades del menú apareixeran amb l'activació d'aquests mòduls.
 AuditedSecurityEvents=Esdeveniments de seguretat que s’auditen
 NoSecurityEventsAreAduited=No s’audita cap esdeveniment de seguretat. Podeu activar-les des del menú %s
 Audit=Esdeveniments de seguretat
@@ -1257,7 +1258,7 @@ LogEventDesc=Habiliteu el registre per a esdeveniments de seguretat específics.
 AreaForAdminOnly=Els paràmetres de configuració només poden ser establerts per <b>usuaris administradors</b>.
 SystemInfoDesc=La informació del sistema és informació tècnica diversa que obteniu en mode de només lectura i visible només per als administradors.
 SystemAreaForAdminOnly=Aquesta àrea només està disponible per als usuaris administradors. Els permisos d'usuari de Dolibarr no poden canviar aquesta restricció.
-CompanyFundationDesc=Editeu la informació de la vostra empresa / organització. Feu clic al botó "%s" al final de la pàgina quan hagi acabat.
+CompanyFundationDesc=Editeu la informació de la vostra empresa/organització. Fes clic al botó «%s» a la part inferior de la pàgina quan hagis acabat.
 MoreNetworksAvailableWithModule=És possible que hi hagi més xarxes socials disponibles activant el mòdul "Xarxes socials".
 AccountantDesc=Si teniu un comptable extern, podeu editar aquí la seva informació.
 AccountantFileNumber=Número de fila
@@ -1265,7 +1266,7 @@ DisplayDesc=Els paràmetres que afecten l'aspecte i la presentació de l'aplicac
 AvailableModules=Mòduls/complements disponibles
 ToActivateModule=Per a activar mòduls, aneu a l'àrea de configuració (Inici->Configuració->Mòduls).
 SessionTimeOut=Temps de desconnexió per a la sessió
-SessionExplanation=Aquest número garanteix que la sessió no caduqui abans d'aquest retard, si el netejador de sessió es fa mitjançant un netejador de sessió de PHP intern (i res més). El netejador de sessió intern de PHP no garanteix que la sessió expire després d'aquest retard. Caducarà, després d'aquest retard, i quan s'executi el netejador de sessió, de manera que cada accés <b> %s / %s </b>, però només durant l'accés fet per altres sessions (si el valor és 0, significa que l'eliminació de la sessió només es fa mitjançant un extern procés). <br> Nota: en alguns servidors amb un mecanisme de neteja de sessió externa (cron sota debian, ubuntu ...), les sessions es poden destruir després d'un període definit per una configuració externa, independentment del valor introduït aquí.
+SessionExplanation=Aquest número garanteix que la sessió no caducarà mai abans d'aquest retard, si el netejador de sessions el fa el netejador de sessions intern de PHP (i res més). El netejador de sessions intern de PHP no garanteix que la sessió caduqui després d'aquest retard. Caducarà, després d'aquest retard, i quan s'executi el netejador de sessions, de manera que cada accés <b>%s/%s</b>, però només durant l'accés realitzat per altres sessions (si el valor és 0, vol dir que només s'esborra la sessió per un procés extern).<br>Nota: en alguns servidors amb un mecanisme de neteja de sessions extern (cron sota debian, ubuntu...), les sessions es poden destruir després d'un període definit per una configuració externa, sense importar quin sigui el valor introduït aquí.
 SessionsPurgedByExternalSystem=Sembla que les sessions en aquest servidor són netejades mitjançant un mecanisme extern (cron sota debian, ubuntu ...), probablement cada  <b> %s </b> segons (= el valor del paràmetre  sessió.gc_maxlifetime ), així que modificant aquest valor aquí no té cap efecte, Heu de sol·licitar a l’administrador del servidor que canviï la durada de la sessió.
 TriggersAvailable=Triggers disponibles
 TriggersDesc=Els activadors són fitxers que modificaran el comportament del flux de treball de Dolibarr un cop copiat al directori <b>htdocs/core/triggers</b>. Realitzen accions noves, activades en esdeveniments Dolibarr (creació d'empresa nova, validació de factures...).
@@ -1310,7 +1311,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Heu d'executar aquesta ordre de
 YourPHPDoesNotHaveSSLSupport=Funcions SSL no disponibles al vostre PHP
 DownloadMoreSkins=Més temes per a descarregar
 SimpleNumRefModelDesc=Retorna el número de referència en el format %syymm-nnnn on yy és l'any, mm és el mes i nnnn és un número d'increment automàtic seqüencial sense restablir
-SimpleRefNumRefModelDesc=Returns the reference number in the format n where n is a sequential auto-incrementing number with no reset
+SimpleRefNumRefModelDesc=Retorna el número de referència en el format n on n és un nombre seqüencial d'increment automàtic sense restabliment
 AdvancedNumRefModelDesc=Retorna el número de referència en el format %syymm-nnnn on yy és l'any, mm és el mes i nnnn és un número d'increment automàtic seqüencial sense restablir
 SimpleNumRefNoDateModelDesc=Retorna el número de referència en el format %s-nnnn on nnnn és un número d’increment automàtic seqüencial sense restablir
 ShowProfIdInAddress=Mostra el DNI professional amb adreces
@@ -1369,7 +1370,7 @@ TitleNumberOfActivatedModules=Mòduls activats
 TotalNumberOfActivatedModules=Mòduls activats: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Ha d'activar almenys 1 mòdul.
 YouMustEnableTranslationOverwriteBefore=Primer heu d'activar la sobreescriptura de traduccions per a poder substituir una traducció
-ClassNotFoundIntoPathWarning=La classe %s no s'ha trobat a la ruta PHP
+ClassNotFoundIntoPathWarning=La classe %s no s'ha trobat al camí PHP
 YesInSummer=Sí a l'estiu
 OnlyFollowingModulesAreOpenedToExternalUsers=Tingueu en compte que només els següents mòduls estan disponibles per als usuaris externs (independentment dels permisos d'aquests usuaris) i només si es concedeixen permisos: <br>
 SuhosinSessionEncrypt=Emmagatzematge de sessions xifrades per Suhosin
@@ -1452,8 +1453,8 @@ SuppliersPayment=Pagaments a proveïdors
 SupplierPaymentSetup=Configuració de pagaments a proveïdors
 InvoiceCheckPosteriorDate=Comproveu la data de fabricació abans de la validació
 InvoiceCheckPosteriorDateHelp=La validació d'una factura estarà prohibida si la seva data és anterior a la data de l'última factura del mateix tipus.
-InvoiceOptionCategoryOfOperations=Display the mention "category of operations" on the invoice.
-InvoiceOptionCategoryOfOperationsHelp=Depending on the situation, the mention will appear in the form:<br>- Category of operations: Delivery of goods<br>- Category of operations: Provision of services<br>- Category of operations: Mixed - Delivery of goods & provision of services
+InvoiceOptionCategoryOfOperations=Mostra la menció «categoria d'operacions» a la factura.
+InvoiceOptionCategoryOfOperationsHelp=Segons la situació, la menció apareixerà en la forma:<br>- Categoria d'operacions: Entrega de mercaderies<br>- Categoria d'operacions: Prestació de serveis<br>- Categoria d'operacions: Mixta - Entrega de mercaderies i Prestació de serveis
 InvoiceOptionCategoryOfOperationsYes1=Sí, a sota del bloc d'adreces
 InvoiceOptionCategoryOfOperationsYes2=Sí, a la cantonada inferior esquerra
 ##### Proposals #####
@@ -1700,7 +1701,7 @@ SyslogSetup=Configuració del mòdul Syslog
 SyslogOutput=Sortida del log
 SyslogFacility=Facilitat
 SyslogLevel=Nivell
-SyslogFilename=Nom i ruta de l'arxiu
+SyslogFilename=Nom i camí del fitxer
 YouCanUseDOL_DATA_ROOT=Podeu utilitzar DOL_DATA_ROOT/dolibarr.log per a un fitxer de registre al directori "documents" de Dolibarr. Podeu establir un camí diferent per a emmagatzemar aquest fitxer.
 ErrorUnknownSyslogConstant=La constant %s no és una constant syslog coneguda
 OnlyWindowsLOG_USER=En Windows, només s'admetrà la funció LOG_USER
@@ -1766,7 +1767,7 @@ FCKeditorForNotePublic=WYSIWIG creació/edició del camp "notes públiques" d'el
 FCKeditorForNotePrivate=Creació/edició WYSIWIG del camp "notes privades" d'elements
 FCKeditorForCompany=Creació / edició de WYSIWIG de la descripció del camp d'elements (excepte productes / serveis)
 FCKeditorForProductDetails=Creació/edició WYSIWIG de descripció de productes o línies per objectes (línies de pressupostos, comandes, factures, etc...).
-FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files.
+FCKeditorForProductDetails2=Avís: l'ús d'aquesta opció per a aquest cas no es recomana, ja que pot crear problemes amb caràcters especials i format de pàgina en crear fitxers PDF.
 FCKeditorForMailing= Creació/edició WYSIWIG dels E-Mails
 FCKeditorForUserSignature=Creació/edició WYSIWIG de la signatura de l'usuari
 FCKeditorForMail=Edició/creació WYSIWIG per tots els e-mails (excepte Eines->eMailing)
@@ -1863,7 +1864,7 @@ StockDecreaseForPointOfSaleDisabledbyBatch=La disminució d'accions en POS no é
 CashDeskYouDidNotDisableStockDecease=No vau desactivar la disminució de l'estoc en fer una venda des del TPV. Per tant, es requereix un magatzem.
 CashDeskForceDecreaseStockLabel=S'ha forçat la disminució de l'estoc de productes per lots.
 CashDeskForceDecreaseStockDesc=Disminuïu primer les dates més antigues de consumir i vendre.
-CashDeskReaderKeyCodeForEnter=Key ASCII code for "Enter" defined in barcode reader (Example: 13)
+CashDeskReaderKeyCodeForEnter=Codi ASCII per "Enter" definit al lector de codis de barres (Exemple: 13)
 ##### Bookmark #####
 BookmarkSetup=Configuració del mòdul Bookmark
 BookmarkDesc=Aquest mòdul us permet gestionar els marcadors. També podeu afegir dreceres a totes les pàgines de Dolibarr o llocs web externs al menú de l'esquerra.
@@ -1934,7 +1935,7 @@ SalariesSetup=Configuració del mòdul de salaris
 SortOrder=Ordre de classificació
 Format=Format
 TypePaymentDesc=0:Forma de pagament a client, 1:Forma de pagament a proveïdor, 2:Mateixa forma de pagament per clients i proveïdors
-IncludePath=Incloure ruta (que es defineix a la variable %s)
+IncludePath=Inclou el camí (definit en la variable %s)
 ExpenseReportsSetup=Configuració del mòdul Informe de Despeses
 TemplatePDFExpenseReports=Plantilles de documents per a generar un document d’informe de despeses
 ExpenseReportsRulesSetup=Configurar mòdul Informes de despeses - Regles
@@ -1952,7 +1953,7 @@ BackupDumpWizard=Assistent per a crear el fitxer d'exportació de la base de dad
 BackupZipWizard=Assistent per a crear el directori d’arxiu de documents
 SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòduls externs des de la interfície web per la següent raó:
 SomethingMakeInstallFromWebNotPossible2=Per aquest motiu, el procés d'actualització descrit aquí és un procés manual que només un usuari privilegiat pot realitzar.
-InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules or dynamic websites, from the application, is currently locked for security purpose. Please contact us if you need to enable this feature.
+InstallModuleFromWebHasBeenDisabledContactUs=La instal·lació o desenvolupament de mòduls externs o llocs web dinàmics, des de l'aplicació, està actualment bloquejat per motius de seguretat. Si us plau, poseu-vos en contacte amb nosaltres si necessiteu habilitar aquesta funció.
 InstallModuleFromWebHasBeenDisabledByFile=El vostre administrador ha desactivat la instal·lació del mòdul extern des de l'aplicació. Heu de demanar-li que suprimeixi el fitxer <strong> %s </strong> per  a permetre aquesta funció.
 ConfFileMustContainCustom=Per a instal·lar o crear un mòdul extern des de l'aplicació es necessita desar els fitxers del mòdul en el directori <strong>%s</strong>. Per a permetre a Dolibarr el processament d'aquest directori, has de configurar el teu <strong>conf/conf.php</strong> afegint aquestes 2 línies:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Remarca línies de la taula quan el ratolí passi per sobre
@@ -2050,7 +2051,7 @@ activateModuleDependNotSatisfied=El mòdul "%s" depèn del mòdul "%s", que falt
 CommandIsNotInsideAllowedCommands=L'ordre que intenteu executar no es troba a la llista de comandaments permesos definits al paràmetre <strong> $ dolibarr_main_restrict_os_commands </strong> al fitxer <strong> conf.php </strong>.
 LandingPage=Pàgina de destinació principal
 SamePriceAlsoForSharedCompanies=Si utilitzeu un mòdul multicompany, amb l'opció "Preu únic", el preu també serà el mateix per a totes les empreses si es comparteixen productes entre entorns
-ModuleEnabledAdminMustCheckRights=El mòdul s'ha activat. Els permisos per als mòduls activats només es donen als usuaris administradors. És possible que hagueu de concedir permisos a altres usuaris o grups manualment si cal.
+ModuleEnabledAdminMustCheckRights=El mòdul s'ha activat. Els permisos per als mòduls activats només es donen als usuaris administradors. És possible que hàgiu de concedir permisos a altres usuaris o grups manualment si cal.
 UserHasNoPermissions=Aquest usuari no té permisos definits
 TypeCdr=Utilitzeu "Cap" si la data del termini de pagament és la data de la factura més un delta en dies (el delta és el camp "%s") <br> Utilitzeu "Al final del mes", si, després del delta, s'ha d'augmentar la data per a arribar al final del mes (+ opcional "%s" en dies) <br> Utilitzeu "Actual/Següent" perquè la data del termini de pagament sigui la primera N del mes després del delta (el delta és el camp "%s", N s'emmagatzema al camp "%s").
 BaseCurrency=Moneda de referència de l'empresa (anar a la configuració de l'empresa per a canviar-ho)
@@ -2080,8 +2081,8 @@ RemoveSpecialChars=Elimina els caràcters especials
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtre Regex per a netejar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtre Regex al valor net (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=No es permet la duplicació
-RemoveSpecialWords=Clean certain words when generating sub-accounts for customers or suppliers
-RemoveSpecialWordsHelp=Specify the words to be cleaned before calculating the customer or supplier account. Use a ";" between each word
+RemoveSpecialWords=Netegeu certes paraules en generar subcomptes per a clients o proveïdors
+RemoveSpecialWordsHelp=Especifiqueu les paraules a netejar abans de calcular el compte de client o proveïdor. Utilitzeu un ";" entre cada paraula
 GDPRContact=Oficial de protecció de dades (PDO, privadesa de dades o contacte amb GDPR)
 GDPRContactDesc=Si emmagatzemeu dades personals al vostre Sistema d'Informació, podeu anomenar aquí el contacte responsable del Reglament General de Protecció de Dades
 HelpOnTooltip=Ajuda a mostrar el text a la descripció d'informació
@@ -2139,7 +2140,7 @@ CodeLastResult=Últim codi retornat
 NbOfEmailsInInbox=Nombre de correus electrònics en el directori font
 LoadThirdPartyFromName=Carregueu la cerca de tercers al %s (només carrega)
 LoadThirdPartyFromNameOrCreate=Carregueu la cerca de tercers a %s (crear si no es troba)
-LoadContactFromEmailOrCreate=Load contact searching on %s (create if not found)
+LoadContactFromEmailOrCreate=Carregueu el contacte cercant a %s (creeu-lo si no es troba)
 AttachJoinedDocumentsToObject=Deseu els fitxers adjunts als documents d'objectes si es troba una referència d'un objecte al tema del correu electrònic.
 WithDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic enviat des de Dolibarr
 WithoutDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic NO enviat des de Dolibarr
@@ -2243,12 +2244,12 @@ MailToPartnership=Associació
 AGENDA_EVENT_DEFAULT_STATUS=Estat de l'esdeveniment per defecte en crear un esdeveniment des del formulari
 YouShouldDisablePHPFunctions=Hauríeu de desactivar les funcions PHP
 IfCLINotRequiredYouShouldDisablePHPFunctions=Excepte si heu d'executar ordres del sistema en codi personalitzat, hauríeu de desactivar les funcions PHP
-PHPFunctionsRequiredForCLI=For shell purpose (like scheduled job backup or running an antivirus program), you must keep PHP functions
+PHPFunctionsRequiredForCLI=Per a propòsits d'intèrpret d'ordres (com ara una còpia de seguretat de treballs programats o executar un programa antivirus), heu de mantenir les funcions PHP
 NoWritableFilesFoundIntoRootDir=No s'ha trobat cap fitxer ni directori d'escriptura dels programes comuns al directori arrel (Bo)
 RecommendedValueIs=Recomanat: %s
 Recommended=Recomanada
 NotRecommended=No es recomana
-ARestrictedPath=Some restricted path for data files
+ARestrictedPath=Algun camí restringit per als fitxers de dades
 CheckForModuleUpdate=Comproveu si hi ha actualitzacions de mòduls externs
 CheckForModuleUpdateHelp=Aquesta acció es connectarà amb editors de mòduls externs per a comprovar si hi ha una versió nova disponible.
 ModuleUpdateAvailable=Hi ha disponible una actualització
@@ -2296,17 +2297,17 @@ LateWarningAfter=Avís "tard" després
 TemplateforBusinessCards=Plantilla per a una targeta de visita de diferents mides
 InventorySetup= Configuració de l'inventari
 ExportUseLowMemoryMode=Utilitzeu un mode de memòria baixa
-ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
+ExportUseLowMemoryModeHelp=Utilitzeu el mode de memòria baixa per a generar el fitxer d'abocament (la compressió es fa a través d'una canonada en lloc d'entrar a la memòria PHP). Aquest mètode no permet comprovar que el fitxer estigui complet i no es pot informar del missatge d'error si falla. Utilitzeu-lo si no teniu prou errors de memòria.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interfície per a capturar activadors de dolibarr i enviar-lo a un URL
+ModuleWebhookDesc = Interfície per a capturar activadors de dolibarr i enviar dades de l'esdeveniment a un URL
 WebhookSetup = Configuració del webhook
 Settings = Configuració
 WebhookSetupPage = Pàgina de configuració del webhook
 ShowQuickAddLink=Mostra un botó per a afegir ràpidament un element al menú superior dret
 
 HashForPing=Hash utilitzat per a fer ping
-ReadOnlyMode=És una instància en mode "Només lectura".
+ReadOnlyMode=És una instància en mode «Només lectura».
 DEBUGBAR_USE_LOG_FILE=Utilitzeu el fitxer <b> dolibarr.log </b> per a atrapar els registres
 UsingLogFileShowAllRecordOfSubrequestButIsSlower=Utilitzeu el fitxer dolibarr.log per a atrapar els registres en lloc de capturar la memòria en directe. Permet capturar tots els registres en lloc de només el registre del procés actual (per tant, inclosa la de les pàgines de subsol·licituds ajax), però farà que la vostra instància sigui molt molt lenta. No es recomana.
 FixedOrPercent=Fixat (utilitza la paraula clau "fixat") o per cent (utilitza la paraula clau "percentatge")
@@ -2341,34 +2342,37 @@ UsePassword=Utilitzeu una contrasenya
 UseOauth=Utilitzeu un testimoni OAUTH
 Images=Imatges
 MaxNumberOfImagesInGetPost=Nombre màxim d'imatges permeses en un camp HTML enviat en un formulari
-MaxNumberOfPostOnPublicPagesByIP=Max number of posts on public pages with the same IP address in a month
+MaxNumberOfPostOnPublicPagesByIP=Nombre màxim de publicacions a pàgines públiques amb la mateixa adreça IP en un mes
 CIDLookupURL=El mòdul aporta un URL que pot utilitzar una eina externa per a obtenir el nom d'un tercer o contacte des del seu número de telèfon. L'URL a utilitzar és:
 ScriptIsEmpty=El guió és buit
 ShowHideTheNRequests=Mostra/amaga les sol·licituds SQL %s
-DefinedAPathForAntivirusCommandIntoSetup=Definiu una ruta per a un programa antivirus a <b> %s </b>
+DefinedAPathForAntivirusCommandIntoSetup=Definiu un camí per a un programa antivirus a <b>%s</b>
 TriggerCodes=Esdeveniments desencadenants
 TriggerCodeInfo=Introduïu aquí els codis activadors que han de generar una publicació d'una sol·licitud web (només es permet l'URL extern). Podeu introduir diversos codis d'activació separats per una coma.
-EditableWhenDraftOnly=If unchecked, the value can only be modified when object has a draft status
+EditableWhenDraftOnly=Si no està marcat, el valor només es pot modificar quan l'objecte té un estat d'esborrany
 CssOnEdit=Css a les pàgines d'edició
 CssOnView=Css a les pàgines de visualització
 CssOnList=Css a les pàgines de llistat
-HelpCssOnEditDesc=The Css used when editing the field.<br>Example: "minwiwdth100 maxwidth500 widthcentpercentminusx"
-HelpCssOnViewDesc=The Css used when viewing the field.
-HelpCssOnListDesc=The Css used when field is inside a list table.<br>Example: "tdoverflowmax200"
-RECEPTION_PDF_HIDE_ORDERED=Hide the quantity ordered on the generated documents for receptions
-MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Show the price on the generated documents for receptions
+HelpCssOnEditDesc=El Css utilitzat en editar el camp.<br>Exemple: «minwiwdth100 maxwidth500 widthcentpercentminusx»
+HelpCssOnViewDesc=El Css utilitzat en visualitzar el camp.
+HelpCssOnListDesc=El Css utilitzat quan el camp es troba dins d'una taula de llista.<br>Exemple: «tdoverflowmax200»
+RECEPTION_PDF_HIDE_ORDERED=Amaga la quantitat demanada als documents generats per a recepcions
+MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT=Mostra el preu als documents generats per a recepcions
 WarningDisabled=Avís desactivat
 LimitsAndMitigation=Límits d'accés i mitigació
 DesktopsOnly=Només escriptoris
 DesktopsAndSmartphones=Escriptoris i telèfons intel·ligents
 AllowOnlineSign=Permet la signatura en línia
-AllowExternalDownload=Allow external download (without login, using a shared link)
-DeadlineDayVATSubmission=Deadline day for vat submission on the next month
+AllowExternalDownload=Permet la baixada externa (sense iniciar sessió, mitjançant un enllaç compartit)
+DeadlineDayVATSubmission=Dia límit per a la presentació del IVA el mes següent
 MaxNumberOfAttachementOnForms=Nombre màxim de fitxers units en un formulari
-IfDefinedUseAValueBeetween=If defined, use a value between %s and %s
+IfDefinedUseAValueBeetween=Si està definit, utilitzeu un valor entre %s i %s
 Reload=Recarregar
 ConfirmReload=Confirmeu la recàrrega del mòdul
-WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set a parameter to check its version at each page access. This is a bad and not allowed practice that may make the page to administer modules instable. Please contact author of module to fix this.
-WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
-EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
-MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+WarningModuleHasChangedLastVersionCheckParameter=Avís: el mòdul %s ha establert un paràmetre per a comprovar la seva versió a cada accés a la pàgina. Aquesta és una pràctica dolenta i no permesa que pot fer que la pàgina per a administrar mòduls sigui inestable. Poseu-vos en contacte amb l'autor del mòdul per solucionar-ho.
+WarningModuleHasChangedSecurityCsrfParameter=Avís: el mòdul %s ha desactivat la seguretat CSRF de la vostra instància. Aquesta acció és sospitosa i és possible que la vostra instal·lació ja no estigui segura. Poseu-vos en contacte amb l'autor del mòdul per a obtenir una explicació.
+EMailsInGoingDesc=Els correus electrònics entrants són gestionats pel mòdul %s. Heu d'activar-lo i configurar-lo si necessiteu donar suport als correus electrònics entrants.
+MAIN_IMAP_USE_PHPIMAP=Utilitzeu la biblioteca PHP-IMAP per a IMAP en comptes de l'IMAP PHP natiu. Això també permet l'ús d'una connexió OAuth2 per IMAP (també s'ha d'activar el mòdul OAuth).
+MAIN_CHECKBOX_LEFT_COLUMN=Mostra la columna per a la selecció de camps i línies a l'esquerra (a la dreta per defecte)
+
+CSSPage=Estil CSS
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index 8161362f142..86236c79c19 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -88,7 +88,7 @@ SupplierInvoiceSentByEMail=Factura de proveïdor %s enviada per e-mail
 ShippingSentByEMail=Enviament %s enviat per email
 ShippingValidated= Enviament %s validat
 InterventionSentByEMail=Intervenció %s enviada per e-mail
-ProjectSentByEMail=Project %s sent by email
+ProjectSentByEMail=Projecte %s enviat per correu electrònic
 ProposalDeleted=Pressupost esborrat
 OrderDeleted=Comanda esborrada
 InvoiceDeleted=Factura esborrada
@@ -102,7 +102,7 @@ PRODUCT_DELETEInDolibarr=Producte %s eliminat
 HOLIDAY_CREATEInDolibarr=S'ha creat la sol·licitud de permís %s
 HOLIDAY_MODIFYInDolibarr=S'ha modificat la sol·licitud de permís %s
 HOLIDAY_APPROVEInDolibarr=Sol·licitud de dies lliures %s aprovada
-HOLIDAY_VALIDATEInDolibarr=La sol·licitud d’excedència %s validada
+HOLIDAY_VALIDATEInDolibarr=Sol·licitud de dies lliures %s validada
 HOLIDAY_DELETEInDolibarr=S'ha suprimit la sol·licitud de permís %s
 EXPENSE_REPORT_CREATEInDolibarr=Creat l'informe de despeses %s
 EXPENSE_REPORT_VALIDATEInDolibarr=S'ha validat l'informe de despeses %s
@@ -152,7 +152,7 @@ ExtSitesEnableThisTool=Mostra calendaris externs (definit a la configuració glo
 ExtSitesNbOfAgenda=Nombre de calendaris
 AgendaExtNb=Calendari núm. %s
 ExtSiteUrlAgenda=URL per a accedir al fitxer .ical
-ExtSiteNoLabel=Sense descripció
+ExtSiteNoLabel=Sense nom
 VisibleTimeRange=Rang de temps visible
 VisibleDaysRange=Rang de dies visible
 AddEvent=Crear esdeveniment
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index e72b34bf506..33c218e65ec 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -25,7 +25,7 @@ InitialBankBalance=Saldo inicial
 EndBankBalance=Saldo final
 CurrentBalance=Saldo actual
 FutureBalance=Saldo previst
-ShowAllTimeBalance=Mostar balanç des de principi
+ShowAllTimeBalance=Mostra el saldo des de l'inici
 AllTime=Des del principi
 Reconciliation=Conciliació
 RIB=Compte bancari
@@ -144,7 +144,7 @@ AllAccounts=Tots els comptes bancaris i en efectiu
 BackToAccount=Tornar al compte
 ShowAllAccounts=Mostra per a tots els comptes
 FutureTransaction=Transacció futura. No és possible conciliar.
-SelectChequeTransactionAndGenerate=Seleccioneu / filtreu els xecs que s’inclouran al rebut del dipòsit de xecs. A continuació, feu clic a "Crea".
+SelectChequeTransactionAndGenerate=Seleccioneu/filtreu els xecs que s'han d'incloure a la remesa de xecs. A continuació, feu clic a «Crea».
 InputReceiptNumber=Selecciona l'estat del compte bancari relacionat amb la conciliació. Utilitza un valor numèric que es pugui ordenar: AAAAMM o AAAAMMDD
 EventualyAddCategory=Finalment, especifiqueu una categoria on classificar els registres
 ToConciliate=A conciliar?
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 70c5d1e927f..0a38b7cbfb4 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -13,7 +13,7 @@ BillsStatistics=Estadístiques factures a clients
 BillsStatisticsSuppliers=Estadístiques de Factures de proveïdors
 DisabledBecauseDispatchedInBookkeeping=Desactivat perquè la factura ja s'ha comptabilitzat
 DisabledBecauseNotLastInvoice=Desactivat perquè la factura no es pot esborrar. Algunes factures s'han registrat després d'aquesta i això crearia espais buits al comptador.
-DisabledBecauseNotLastSituationInvoice=Disabled because invoice is not erasable. This invoice is not the last one in situation invoice cycle.
+DisabledBecauseNotLastSituationInvoice=S'ha desactivat perquè la factura no es pot esborrar. Aquesta factura no és l'última del cicle de facturació de situació.
 DisabledBecauseNotErasable=S'ha desactivat perquè no es pot esborrar
 InvoiceStandard=Factura estàndard
 InvoiceStandardAsk=Factura estàndard
@@ -99,12 +99,12 @@ PaymentAmount=Import pagament
 PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
 HelpPaymentHigherThanReminderToPay=Atenció, l'import del pagament d'una o més factures és superior a l'import pendent de pagar. <br> Editeu la vostra entrada; en cas contrari, confirmeu i considereu la possibilitat de crear un abonament per l'excés rebut per cada factura pagada de més.
 HelpPaymentHigherThanReminderToPaySupplier=Atenció, l'import del pagament d'una o més factures és superior a l'import pendent de pagar.<br>Editeu l'entrada, en cas contrari, confirmeu i considereu la possibilitat de crear un abonament per l'excés pagat per cada factura pagada de més.
-ClassifyPaid=Classifica "Pagat"
-ClassifyUnPaid=Classifica &quot;sense pagar&quot;
-ClassifyPaidPartially=Classifica "Pagat parcialment"
-ClassifyCanceled=Classifica "Abandonat"
-ClassifyClosed=Classifica "Tancat"
-ClassifyUnBilled=Classifiqueu 'facturar'
+ClassifyPaid=Marca «Pagat»
+ClassifyUnPaid=Marca «No pagat»
+ClassifyPaidPartially=Marca «Pagat parcialment»
+ClassifyCanceled=Marca «Abandonats»
+ClassifyClosed=Marca «Tancat»
+ClassifyUnBilled=Marca «No facturat»
 CreateBill=Crear factura
 CreateCreditNote=Crear abonament
 AddBill=Crear factura o abonament
@@ -131,7 +131,7 @@ BillStatusPaidBackOrConverted=Nota de crèdit reembossada o marcada com a crèdi
 BillStatusConverted=Pagada (llesta per a utilitzar-se en la factura final)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
-BillStatusStarted=Pagada parcialment
+BillStatusStarted=Començat
 BillStatusNotPaid=Pendent
 BillStatusNotRefunded=No reemborsat
 BillStatusClosedUnpaid=Tancada (Pendent)
@@ -143,7 +143,7 @@ Refunded=Reemborsada
 BillShortStatusConverted=Tractada
 BillShortStatusCanceled=Abandonada
 BillShortStatusValidated=Validada
-BillShortStatusStarted=Començada
+BillShortStatusStarted=Començat
 BillShortStatusNotPaid=Pendent
 BillShortStatusNotRefunded=No reemborsat
 BillShortStatusClosedUnpaid=Tancada
@@ -172,7 +172,7 @@ NewBill=Factura nova
 LastBills=Últimes %s factures
 LatestTemplateInvoices=Últimes %s plantilles de factura 
 LatestCustomerTemplateInvoices=Últimes %s plantilles de factures de client 
-LatestSupplierTemplateInvoices=Darreres %s plantilles de factures de proveïdor 
+LatestSupplierTemplateInvoices=Últimes %s plantilles de factures de proveïdor 
 LastCustomersBills=Últimes %s factures de client
 LastSuppliersBills=Últimes %s factures de proveïdor
 AllBills=Totes les factures
@@ -188,7 +188,7 @@ ConfirmValidateBill=Està segur de voler validar aquesta factura amb la referèn
 ConfirmUnvalidateBill=Està segur de voler tornar la factura <b>%s</b> a l'estat esborrany?
 ConfirmClassifyPaidBill=Està segur de voler classificar la factura <b>%s</b> com pagada?
 ConfirmCancelBill=Està segur de voler anul·lar la factura <b>%s</b>?
-ConfirmCancelBillQuestion=Per quina raó vols classificar aquesta factura com 'abandonada'?
+ConfirmCancelBillQuestion=Per què voleu marcar aquesta factura com a «abandonada»?
 ConfirmClassifyPaidPartially=Està segur de voler classificar la factura <b>%s</b> com pagada?
 ConfirmClassifyPaidPartiallyQuestion=Aquesta factura no s'ha pagat completament. Quin és el motiu de tancament d'aquesta factura?
 ConfirmClassifyPaidPartiallyReasonAvoir=La resta a pagar <b>(%s %s)</b> és un descompte atorgat perquè el pagament es va fer abans de temps. Regularitzaré l'IVA d'aquest descompte amb un abonament.
@@ -196,7 +196,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=La resta a pagar <b>(%s %s)</b> és u
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=La resta a pagar <b>(%s %s)</b> és un descompte acordat després de la facturació. Accepto perdre l'IVA d'aquest descompte
 ConfirmClassifyPaidPartiallyReasonDiscountVat=La resta a pagar <b>(%s %s)</b> és un descompte atorgat perquè el pagament es va fer abans de temps. Recupero l'IVA d'aquest descompte, sense un abonament.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Client morós
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deducció per banc (comissions bancàries intermediaris)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Deducció per banc (comissions bancàries)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
 ConfirmClassifyPaidPartiallyReasonOther=D'altra raó
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Aquesta opció és possible si la vostra factura ha rebut els comentaris adequats. (Exemple «Només l'impost corresponent al preu realment pagat dona dret a la deducció»)
@@ -204,7 +204,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=En alguns països, aquesta opc
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Aquesta elecció és l'elecció que s'ha de prendre si les altres no són aplicables
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b> client morós </b> és un client que es nega a pagar el seu deute.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Aquesta elecció és possible si el cas de pagament incomplet és arran d'una devolució de part dels productes
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=L'import no pagat és <b> comissions bancàries intermediaris </b> , deduïdes directament de l'import correcte <b> </b> pagat pel Client.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=L'import no pagat son <b>comissions bancàries</b>, deduïdes directament de <b>l'import correcte</b> pagat pel Client.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilitza aquesta opció si totes les altres no són adequades, per exemple, en la següent situació: <br>- el pagament no s'ha completat perquè alguns productes es van tornar a enviar<br>- la quantitat reclamada és massa important perquè s'ha oblidat un descompte <br>En tots els casos, s'ha de corregir l'import excessiu en el sistema de comptabilitat mitjançant la creació d’un abonament.
 ConfirmClassifyAbandonReasonOther=Altres
 ConfirmClassifyAbandonReasonOtherDesc=Aquesta elecció serà per a qualsevol altre cas. Per exemple arran de la intenció de crear una factura rectificativa.
@@ -275,7 +275,7 @@ DatePointOfTax=Punt d'impostos
 NoInvoice=Cap factura
 NoOpenInvoice=No hi ha factura oberta
 NbOfOpenInvoices=Nombre de factures obertes
-ClassifyBill=Classifica la factura
+ClassifyBill=Marca la factura
 SupplierBillsToPay=Factures de proveïdors pendents de pagament
 CustomerBillsUnpaid=Factures de client pendents de cobrament
 NonPercuRecuperable=No percebut recuperable
@@ -535,12 +535,12 @@ CantRemovePaymentSalaryPaid=No es pot eliminar el pagament perquè el salari est
 ExpectedToPay=Esperant el pagament
 CantRemoveConciliatedPayment=No es pot eliminar el pagament reconciliat
 PayedByThisPayment=Pagada per aquest pagament
-ClosePaidInvoicesAutomatically=Classifiqueu automàticament totes les factures estàndard, de pagament inicial o de reemplaçament com a "Pagades" quan el pagament es realitzi completament.
-ClosePaidCreditNotesAutomatically=Classifiqueu automàticament totes les notes de crèdit com a "Pagades" quan es faci la devolució íntegra.
-ClosePaidContributionsAutomatically=Classifiqueu automàticament totes les contribucions socials o fiscals com a "Pagades" quan el pagament es realitzi íntegrament.
-ClosePaidVATAutomatically=Classifica automàticament la declaració d'IVA com a "Pagada" quan el pagament es realitzi completament.
-ClosePaidSalaryAutomatically=Classifiqueu automàticament el salari com a "Pagat" quan el pagament es faci completament.
-AllCompletelyPayedInvoiceWillBeClosed=Totes les factures no pendents de pagament es tancaran automàticament amb l'estat "Pagat".
+ClosePaidInvoicesAutomatically=Marca automàticament totes les factures estàndard, de pagament inicial o de substitució com a «Pagades» quan el pagament s'hagi fet completament.
+ClosePaidCreditNotesAutomatically=Marca automàticament totes les notes de crèdit com a «Pagades» quan el reemborsament s'hagi fet completament.
+ClosePaidContributionsAutomatically=Marca automàticament totes les cotitzacions socials o fiscals com a "Pagades" quan el pagament s'hagi fet íntegrament.
+ClosePaidVATAutomatically=Marca automàticament la declaració d'IVA com a «Pagada» quan el pagament s'hagi fet completament.
+ClosePaidSalaryAutomatically=Marca automàticament el sou com a «Pagat» quan el pagament s'hagi fet completament.
+AllCompletelyPayedInvoiceWillBeClosed=Totes les factures sense pagaments pendents es tancaran automàticament amb l'estat «Pagat».
 ToMakePayment=Pagar
 ToMakePaymentBack=Reemborsar
 ListOfYourUnpaidInvoices=Llistat de factures impagades
@@ -555,7 +555,7 @@ PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de fac
 TerreNumRefModelDesc1=Retorna el número en el format %syymm-nnnn per a les factures estàndard i %syymm-nnnn per a les notes de crèdit on aa és any, mm és mes i nnnn és un número d’increment automàtic seqüencial sense interrupció i sense retorn a 0
 MarsNumRefModelDesc1=Número de devolució en el format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a factures de substitució, %syymm-nnnn per a factures d’avançament i %syymm notes i any sense descans i sense retorn a 0
 TerreNumRefModelError=Ja existeix una factura que comença amb $syymm i no és compatible amb aquest model de seqüència. Elimineu-la o canvieu-li el nom per a activar aquest mòdul.
-CactusNumRefModelDesc1=Número de devolució en el format %syymm-nnnn per a les factures estàndard, %syymm-nnnn per a les notes de crèdit i %syymm-nnnn per a les factures d’avançament en què yy és any, mm és mes i nnnn és un número que no ha de retorn automàtic 0
+CactusNumRefModelDesc1=Retorna un número en el format %syymm-nnnn per a factures estàndard, %syymm-nnnn per a devolucions i %syymm-nnnn per a factures de bestreta on yy és l'any, mm és el mes i nnnn és un número seqüencial auto-incrementat sense ruptura ni retorn a 0
 EarlyClosingReason=Motiu de tancament anticipat
 EarlyClosingComment=Nota de tancament anticipat
 ##### Types de contacts #####
@@ -626,8 +626,8 @@ PaymentRegisteredAndInvoiceSetToPaid=Pagament registrat i factura %s configurada
 SendEmailsRemindersOnInvoiceDueDate=Envieu un recordatori per correu electrònic per a les factures no pagades
 MakePaymentAndClassifyPayed=Registre de pagament
 BulkPaymentNotPossibleForInvoice=El pagament massiu no és possible per a la factura %s (tipus o estat incorrecte)
-MentionVATDebitOptionIsOn=Option to pay tax based on debits
+MentionVATDebitOptionIsOn=Opció de pagar impostos en funció de dèbits
 MentionCategoryOfOperations=Categoria d'operacions
 MentionCategoryOfOperations0=Lliurament de mercaderies
 MentionCategoryOfOperations1=Prestació de serveis
-MentionCategoryOfOperations2=Mixed - Delivery of goods & provision of services
+MentionCategoryOfOperations2=Mixt: lliurament de béns i prestació de serveis
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index 2f762867307..68a77898282 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -18,13 +18,13 @@ BoxLastActions=Últimes accions
 BoxLastContracts=Últims contractes
 BoxLastContacts=Últims contactes/adreces
 BoxLastMembers=Últims socis
-BoxLastModifiedMembers=Darrers membres modificats
-BoxLastMembersSubscriptions=Últimes subscripcions de membres
+BoxLastModifiedMembers=Últims socis modificats
+BoxLastMembersSubscriptions=Últimes subscripcions de socis
 BoxFicheInter=Últimes intervencions
 BoxCurrentAccounts=Balanç de comptes oberts
 BoxTitleMemberNextBirthdays=Aniversaris d'aquest mes (membres)
 BoxTitleMembersByType=Membres per tipus i estat
-BoxTitleMembersByTags=Members by tags and status
+BoxTitleMembersByTags=Socis per etiquetes i estat
 BoxTitleMembersSubscriptionsByYear=Subscripcions de membres per any
 BoxTitleLastRssInfos=Últimes %s notícies de %s
 BoxTitleLastProducts=Productes / Serveis: últims %s modificats
@@ -33,8 +33,8 @@ BoxTitleLastSuppliers=Últims %s proveïdors registrats
 BoxTitleLastModifiedSuppliers=Proveïdors: últims %s modificats
 BoxTitleLastModifiedCustomers=Clients: últims %s modificats
 BoxTitleLastCustomersOrProspects=Últims %s clients o clients potencials
-BoxTitleLastCustomerBills=Darreres %s factures a client modificades
-BoxTitleLastSupplierBills=Darreres %s factures de proveïdor modificades
+BoxTitleLastCustomerBills=Últimes %s factures de client modificades
+BoxTitleLastSupplierBills=Últimes %s factures de proveïdor modificades
 BoxTitleLastModifiedProspects=Clients Potencials: últims %s modificats
 BoxTitleLastModifiedMembers=Últims %s socis
 BoxTitleLastFicheInter=Últimes %s intervencions modificades
@@ -48,12 +48,12 @@ BoxOldestExpiredServices=Serveis antics expirats
 BoxOldestActions=Els esdeveniments més antics per a fer
 BoxLastExpiredServices=Últims %s contactes amb serveis actius expirats
 BoxTitleLastActionsToDo=Últimes %s accions a fer
-BoxTitleOldestActionsToDo=Oldest %s events to do, not completed
-BoxTitleLastContracts=Últims contractes %s que es van modificar
-BoxTitleLastModifiedDonations=Últimes donacions %s que es van modificar
-BoxTitleLastModifiedExpenses=Últims informes de despeses %s que es van modificar
-BoxTitleLatestModifiedBoms=Últims BOMs %s que es van modificar
-BoxTitleLatestModifiedMos=Últimes comandes de fabricació %s que es van modificar
+BoxTitleOldestActionsToDo=Els esdeveniments %s més antics per a fer, no s'han completat
+BoxTitleLastContracts=Últims %s contractes que s'han modificat
+BoxTitleLastModifiedDonations=Últimes %s donacions que s'han modificat
+BoxTitleLastModifiedExpenses=Últims %s informes de despeses que s'han modificat
+BoxTitleLatestModifiedBoms=Últims %s BOMs que s'han modificat
+BoxTitleLatestModifiedMos=Últimes %s ordres de fabricació modificades
 BoxTitleLastOutstandingBillReached=Clients que han superat el màxim pendent
 BoxGlobalActivity=Activitat global
 BoxGoodCustomers=Bons clients
@@ -61,7 +61,7 @@ BoxTitleGoodCustomers=% bons clients
 BoxScheduledJobs=Tasques programades
 BoxTitleFunnelOfProspection=Oportunitat embut
 FailedToRefreshDataInfoNotUpToDate=No s'ha pogut actualitzar el flux RSS. Última data d'actualització amb èxit: %s
-LastRefreshDate=Última data que es va refrescar
+LastRefreshDate=Última data d'actualització
 NoRecordedBookmarks=No hi ha marcadors personals.
 ClickToAdd=Feu clic aquí per a afegir.
 NoRecordedCustomers=Cap client registrat
@@ -94,8 +94,8 @@ BoxTitleLatestModifiedSupplierOrders=Comandes a Proveïdor: últimes %s modifica
 BoxTitleLastModifiedCustomerBills=Factures del client: últimes %s modificades
 BoxTitleLastModifiedCustomerOrders=Comandes de venda: últimes %s modificades
 BoxTitleLastModifiedPropals=Últims %s pressupostos modificats
-BoxTitleLatestModifiedJobPositions=Últims llocs de treball modificats %s
-BoxTitleLatestModifiedCandidatures=Últimes aplicacions de treball modificades %s
+BoxTitleLatestModifiedJobPositions=Últims %s llocs de treball modificats
+BoxTitleLatestModifiedCandidatures=Últimes %s sol·licituds de feina modificades
 ForCustomersInvoices=Factures a clients
 ForCustomersOrders=Comandes de clients
 ForProposals=Pressupostos
@@ -103,7 +103,7 @@ LastXMonthRolling=Els últims %s mesos consecutius
 ChooseBoxToAdd=Afegeix el panell a la teva taula de control
 BoxAdded=S'ha afegit el panell a la teva taula de control
 BoxTitleUserBirthdaysOfMonth=Aniversaris d'aquest mes (usuaris)
-BoxLastManualEntries=Últim registre de comptabilitat introduït manualment o sense document d'origen
+BoxLastManualEntries=Últim registre en comptabilitat introduït manualment o sense document d'origen
 BoxTitleLastManualEntries=%s últim registre introduït manualment o sense document d'origen
 NoRecordedManualEntries=No hi ha registres d'entrades manuals en comptabilitat
 BoxSuspenseAccount=Operació comptable de comptes amb compte de suspens
@@ -118,6 +118,27 @@ BoxCustomersOutstandingBillReached=Clients que superen el límit pendent
 UsersHome=Usuaris i grups domèstics
 MembersHome=Membres a casa
 ThirdpartiesHome=Inici Tercers
+productindex=Inici de productes i serveis
+mrpindex=Inici MRP
+commercialindex=Inici de comercial
+projectsindex=Inici de projectes
+invoiceindex=Inici de factures
+hrmindex=Inici de factures
 TicketsHome=Entrades a casa
+stockindex=Inici d'estocs
+sendingindex=Inici d'enviaments
+receptionindex=inici de recepcions
+activityindex=Inici d'activitat
+proposalindex=Inici de propostes
+ordersindex=Inici de comandes
+orderssuppliersindex=Inici de comandes a proveïdors
+contractindex=Inici de contractes
+interventionindex=Inici de intervencions
+suppliersproposalsindex=Inici de propostes de proveïdors
+donationindex=Inici de donacions
+specialexpensesindex=Inici de despeses especials
+expensereportindex=Inici de informe de despeses
+mailingindex=Inici de correu massiu
+opensurveyindex=Inici d'enquesta oberta
 AccountancyHome=Inici Comptabilitat
 ValidatedProjects=Projectes validats
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index f5af27b9064..f737d4b7413 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -312,7 +312,7 @@ CustomerRelativeDiscountShort=Descompte relatiu
 CustomerAbsoluteDiscountShort=Descompte fixe
 CompanyHasRelativeDiscount=Aquest client té un descompte per defecte de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Aquest client no té descomptes relatius per defecte
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasRelativeDiscountFromSupplier=Teniu un descompte predeterminat de <b>%s%%</b> amb aquest proveïdor
 HasNoRelativeDiscountFromSupplier=No hi ha descompte relatiu predeterminat amb aquest venedor
 CompanyHasAbsoluteDiscount=Aquest client té descomptes disponibles (notes de crèdit o bestretes) per <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Aquest client té un descompte disponible (comercial, de pagament) per a <b>%s</b>%s
@@ -357,7 +357,7 @@ RequiredIfSupplier=Obligatori si un tercer és proveïdor
 ValidityControledByModule=Validesa controlada pel mòdul
 ThisIsModuleRules=Regles per a aquest mòdul
 ProspectToContact=Client potencial a contactar
-CompanyDeleted=L'empresa "%s" ha estat eliminada
+CompanyDeleted=L'empresa «%s» s'ha suprimit de la base de dades.
 ListOfContacts=Llistat de contactes
 ListOfContactsAddresses=Llistat de contactes
 ListOfThirdParties=Llista de tercers
@@ -386,7 +386,7 @@ VATIntraCheck=Verificar
 VATIntraCheckDesc=El NIF Intracomunitari ha d'incloure el prefix del país. L'enllaç <b>%s</b> utilitza el servei europeu de verificació de NIF (VIES) que requereix accés a Internet des del servidor Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verifica el NIF Intracomunitari a la web de la Comissió Europea
-VATIntraManualCheck=També podeu comprovar manualment al lloc web de la Comissió Europea <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
+VATIntraManualCheck=També podeu comprovar manualment al lloc web de la Comissió Europea <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Comprovació impossible. El servei de comprovació no és prestat pel país membre (%s).
 NorProspectNorCustomer=Ni client, ni client potencial
 JuridicalStatus=Tipus d'entitat empresarial
@@ -462,7 +462,7 @@ ListSuppliersShort=Llistat de proveïdors
 ListProspectsShort=Llistat de clients potencials
 ListCustomersShort=Llistat de clients
 ThirdPartiesArea=Àrea de tercers i contactes
-LastModifiedThirdParties=Últims tercers %s que van ser modificats
+LastModifiedThirdParties=Últims %s tercers que s'han modificat
 UniqueThirdParties=Nombre total de tercers
 InActivity=Actiu
 ActivityCeased=Tancat
@@ -499,7 +499,7 @@ OutOfEurope=Fora d’Europa (CEE)
 CurrentOutstandingBillLate=Factura pendent actual en retard
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Ves amb compte, en funció de la configuració del preu del producte, has de canviar de tercer abans d’afegir el producte al TPV.
 EmailAlreadyExistsPleaseRewriteYourCompanyName=El correu electrònic ja existeix, si us plau, reescriu el nom de la teva empresa
-TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
+TwoRecordsOfCompanyName=Hi ha més d'un registre per a aquesta empresa, poseu-vos en contacte amb nosaltres per a completar la vostra sol·licitud d'associació
 CompanySection=Secció d'empresa
 ShowSocialNetworks=Mostra les xarxes socials
 HideSocialNetworks=Amaga les xarxes socials
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index 348a68aad1b..f3dc2c6aff7 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - compta
 MenuFinancial=Financera
 TaxModuleSetupToModifyRules=Aneu a <a href="%s"> Configuració del mòdul Impostos </a> per a modificar les regles de càlcul
-TaxModuleSetupToModifyRulesLT=Aneu a <a href="%s"> Configuració de l'empresa </a> per a modificar les regles de càlcul
+TaxModuleSetupToModifyRulesLT=Aneu a <a href="%s">Configuració de l'empresa</a> per a modificar les regles de càlcul
 OptionMode=Opció de gestió comptable
 OptionModeTrue=Opció Ingressos-Despeses
 OptionModeVirtual=Opció Crèdits-Deutes
 OptionModeTrueDesc=En aquest context, la facturació es calcula sobre els pagaments (data dels pagaments). La validesa de les xifres només està assegurada si la comptabilitat es controla mitjançant l'entrada/sortida dels comptes mitjançant factures.
 OptionModeVirtualDesc=En aquest context, la facturació es calcula sobre les factures (data de validació). Quan es venguin aquestes factures, tant si s'han pagat com si no, s'enumeren a la sortida de la facturació.
-FeatureIsSupportedInInOutModeOnly=Funció disponible només en el mode comptes CREDITS-DEUTES (Veure la configuració del mòdul comptes)
+FeatureIsSupportedInInOutModeOnly=Funció només disponible en el mode de comptabilitat CRÈDITS-DEUTES (vegeu la configuració del mòdul de comptabilitat)
 VATReportBuildWithOptionDefinedInModule=Els imports obtinguts es calculen segons la configuració del mòdul Impostos.
 LTReportBuildWithOptionDefinedInModule=Els imports obtinguts es calculen segons la configuració de l'Empresa
 Param=Configuració
@@ -73,7 +73,7 @@ SocialContributions=Impostos varis
 SocialContributionsDeductibles=Impostos varis deduïbles
 SocialContributionsNondeductibles=Impostos varis no deduïbles
 DateOfSocialContribution=Data de l’impost social o fiscal
-LabelContrib=Aportació d'etiquetes
+LabelContrib=Nom d'aportació
 TypeContrib=Tipus d'aportació
 MenuSpecialExpenses=Pagaments especials
 MenuTaxAndDividends=Impostos i càrregues
@@ -132,7 +132,7 @@ ByThirdParties=Per tercer
 ByUserAuthorOfInvoice=Per autor de la factura
 CheckReceipt=Ingrés de xec
 CheckReceiptShort=Ingrés de xec
-LastCheckReceiptShort=Últimes %s remeses de xec
+LastCheckReceiptShort=Últims %s rebuts de xec
 NewCheckReceipt=Descompte nou
 NewCheckDeposit=Ingrés nou
 NewCheckDepositOn=Crear el rebut per a l'ingrés al compte: %s
@@ -142,9 +142,9 @@ NbOfCheques=Nombre de xecs
 PaySocialContribution=Pagar un impost varis
 PayVAT=Paga una declaració d’IVA
 PaySalary=Pagar una targeta salarial
-ConfirmPaySocialContribution=Esteu segur que voleu classificar aquest impost varis com a pagat?
-ConfirmPayVAT=Esteu segur que voleu classificar aquesta declaració d'IVA com a pagada?
-ConfirmPaySalary=Esteu segur que voleu classificar aquesta targeta salarial com a pagada?
+ConfirmPaySocialContribution=Esteu segur que voleu marcar aquest impost varis com a pagat?
+ConfirmPayVAT=Esteu segur que voleu marcar aquesta declaració d'IVA com a pagada?
+ConfirmPaySalary=Esteu segur que voleu marcar aquesta fitxa salarial com a pagada?
 DeleteSocialContribution=Elimina un pagament d'impost varis
 DeleteVAT=Suprimeix una declaració d’IVA
 DeleteSalary=Elimina una fitxa salarial
@@ -236,7 +236,7 @@ Pcg_subtype=Subtipus de compte
 InvoiceLinesToDispatch=Línies de factures a desglossar
 ByProductsAndServices=Per producte i servei
 RefExt=Ref. externa
-ToCreateAPredefinedInvoice=Per a crear una plantilla de factura, creeu una factura estàndard, després, sense validar-la, feu clic al botó "%s".
+ToCreateAPredefinedInvoice=Per a crear una plantilla de factura, creeu una factura estàndard, després, sense validar-la, feu clic al botó «%s».
 LinkedOrder=Enllaçar a una comanda
 Mode1=Mètode 1
 Mode2=Mètode 2
@@ -252,7 +252,7 @@ ACCOUNTING_VAT_PAY_ACCOUNT=Compte (del pla comptable) que s'utilitzarà com a co
 ACCOUNTING_ACCOUNT_CUSTOMER=Compte (del pla comptable) utilitzat per a tercers «clients».
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=El compte comptable dedicat definit a la fitxa de tercer només s’utilitzarà per a la comptabilitat auxiliar. Aquest s'utilitzarà per al llibre major i com a valor per defecte de la comptabilitat auxiliar si no es defineix un compte comptable de client dedicat a tercers.
 ACCOUNTING_ACCOUNT_SUPPLIER=Compte (del pla comptable) utilitzat per a tercers «proveïdors».
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=El compte comptable dedicat definit a la fitxa de tercers només s'utilitzarà per al Llibre Major. Aquest serà utilitzat pel Llibre Major i com a valor predeterminat del subcompte si no es defineix un compte comptable a la fitxa del tercer.
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=El compte comptable dedicat definit a la fitxa de tercers s'utilitzarà només per a la comptabilitat de subllibre. Aquest s'utilitzarà per al Llibre Major i com a valor predeterminat de la comptabilitat del subllibre si no es defineix un compte comptable de proveïdor dedicat a tercers.
 ConfirmCloneTax=Confirma el clonat d'un impost social / fiscal
 ConfirmCloneVAT=Confirma la còpia d’una declaració d’IVA
 ConfirmCloneSalary=Confirmeu el clon d'un salari
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index 36ca171cb7d..fc0861cb206 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -57,12 +57,12 @@ LastContracts=Últims %s contractes
 LastModifiedServices=Últims %s serveis modificats
 ContractStartDate=Data inici
 ContractEndDate=Data finalització
-DateStartPlanned=Data prevista posada en servei
-DateStartPlannedShort=Data inici prevista
+DateStartPlanned=Data d'inici prevista
+DateStartPlannedShort=Data d'inici prevista
 DateEndPlanned=Data prevista finalització del servei
 DateEndPlannedShort=Data final prevista
-DateStartReal=Data real posada en servei
-DateStartRealShort=Data inici
+DateStartReal=Data d'inici real
+DateStartRealShort=Data d'inici real
 DateEndReal=Data real finalització del servei
 DateEndRealShort=Data real finalització
 CloseService=Finalitzar servei
@@ -89,7 +89,7 @@ ListOfServicesToExpire=Llistat de serveis actius a expirar
 NoteListOfYourExpiredServices=Aquest llistat només conté els serveis de contractes de tercers que tens enllaçats com a agent comercial
 StandardContractsTemplate=Plantilla de contracte Standard
 ContactNameAndSignature=Per %s, nom i signatura:
-OnlyLinesWithTypeServiceAreUsed=Només les línies amb tipus "Servei" seran clonades.
+OnlyLinesWithTypeServiceAreUsed=Només es clonaran les línies amb el tipus «Servei».
 ConfirmCloneContract=Esteu segur que voleu clonar el contracte <b> %s </b>?
 LowerDateEndPlannedShort=Baixa data de finalització planificada dels serveis actius 
 SendContractRef=Informació del contracte __REF__
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index b2c8d96b8fc..ac78fb3c03a 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -64,7 +64,7 @@ CronTaskInactive=Aquest treball està desactivat (no programat)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Nom del directori del mòdul de Dolibarr (també funciona amb mòduls externs). <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/<u>product</u>/class/product.class.php, el valor pel mòdul és <br><i>product</i>
-CronClassFileHelp=La ruta relativa i el nom del fitxer a carregar (la ruta és relativa al directori arrel del servidor web). <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/<u>product.class.php</u>, el valor del nom del fitxer de classe és<br> <i>product/class/product.class.php</i>
+CronClassFileHelp=El camí relatiu i el nom del fitxer a carregar (el camí és relatiu al directori arrel del servidor web). <BR> Per exemple, per a cridar al mètode fetch de l'objecte Producte de Dolibarr htdocs/product/class/<u>product.class.php</u>, el valor del nom del fitxer de classe és <br><i>product/class/product.class.php</i>
 CronObjectHelp=El nom de l'objecte a carregar. <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel nom del fitxer de classe és<br> <i>Product</i>
 CronMethodHelp=El mètode d'objecte a cridar. <BR> Per exemple, per cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor pel mètode és<br> <i>fetch</i>
 CronArgsHelp=Els arguments del mètode. <BR> Per exemple, cridar al mètode "fetch" de l'objecte Producte de Dolibarr /htdocs/product/class/product.class.php, el valor dels paràmetres pot ser <br> <i>0, ProductRef</i>
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index e87dbee9bcc..1c4effe2e01 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -5,7 +5,7 @@ ECMSectionManual=Carpeta manual
 ECMSectionAuto=Carpeta automàtica
 ECMSectionsManual=Arbre manual
 ECMSectionsAuto=Arbre automàtic
-ECMSectionsMedias=Medias tree
+ECMSectionsMedias=Arbre dels multimèdia
 ECMSections=Carpetes
 ECMRoot=Arrel del ECM
 ECMNewSection=Carpeta nova
@@ -17,9 +17,9 @@ ECMNbOfFilesInSubDir=Nombre d'arxius en les subcarpetes
 ECMCreationUser=Creador
 ECMArea=Àrea SGD/GCE
 ECMAreaDesc=L’àrea SGD/GED (Sistema de Gestió de Documents / Gestió de Continguts Electrònics) us permet desar, compartir i cercar ràpidament tota mena de documents a Dolibarr.
-ECMAreaDesc2a=* Manual directories can be used to save documents not linked to a particular element.
-ECMAreaDesc2b=* Automatic directories are filled automatically when adding documents from the page of an element.
-ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files from emailing or website module.
+ECMAreaDesc2a=* Els directoris manuals es poden utilitzar per a desar documents no vinculats a un element concret.
+ECMAreaDesc2b=* Els directoris automàtics s'omplen automàticament quan s'afegeixen documents des de la pàgina d'un element.
+ECMAreaDesc3=* Els directoris de multimèdia són fitxers del subdirectori <b>/medias</b> del directori de documents, llegibles per a tothom sense necessitat de registrar-se i sense necessitat de compartir el fitxer de manera explícita. S'utilitza per a emmagatzemar fitxers d'imatge per al mòdul de correu electrònic o lloc web, per exemple.
 ECMSectionWasRemoved=La carpeta <b>%s</b> ha estat eliminada
 ECMSectionWasCreated=S'ha creat el directori <b>%s</b>.
 ECMSearchByKeywords=Cercar per paraules clau
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 813e62d4cb9..9a38acece6c 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -15,10 +15,10 @@ ErrorGroupAlreadyExists=El grup %s ja existeix.
 ErrorEmailAlreadyExists=El correu electrònic %s ja existeix.
 ErrorRecordNotFound=Registre no trobat
 ErrorRecordNotFoundShort=No trobat
-ErrorFailToCopyFile=No s'ha pogut copiar el fitxer "<b> %s </b>" a "<b> %s </b>".
+ErrorFailToCopyFile=No s'ha pogut copiar el fitxer «<b>%s</b>» a «<b>%s</b>».
 ErrorFailToCopyDir=No s'ha pogut copiar el directori '<b> %s </b>' a '<b> %s </b>'.
 ErrorFailToRenameFile=Error al renomenar l'arxiu '<b>%s</b>' a '<b>%s</b>'.
-ErrorFailToDeleteFile=No s'ha pogut eliminar el fitxer "<b> %s </b>".
+ErrorFailToDeleteFile=No s'ha pogut eliminar el fitxer «<b>%s</b>».
 ErrorFailToCreateFile=Error al crear l'arxiu  '<b>%s</b>'
 ErrorFailToRenameDir=Error al renomenar la carpeta '<b>%s</b>' a '<b>%s</b>'.
 ErrorFailToCreateDir=Error al crear la carpeta '<b>%s</b>'
@@ -60,8 +60,8 @@ ErrorSetupOfEmailsNotComplete=La configuració dels correus electrònics no s'ha
 ErrorFeatureNeedJavascript=Aquesta funcionalitat requereix javascript actiu per funcionar. Modifiqueu en configuració->entorn.
 ErrorTopMenuMustHaveAParentWithId0=Un menú del tipus 'Superior' no pot tenir un menú pare. Poseu 0 al menú pare o trieu un menú del tipus 'Esquerra'.
 ErrorLeftMenuMustHaveAParentId=Un menú del tipus 'Esquerra' ha de tenir un ID de pare
-ErrorFileNotFound=Arxiu no trobat (ruta incorrecta, permisos incorrectes o accés prohibit pel paràmetre openbasedir)
-ErrorDirNotFound=Directori <b>%s</b> no trobat (Ruta incorrecta, permisos inadequats o accés prohibit pel paràmetre PHP openbasedir o safe_mode)
+ErrorFileNotFound=No s'ha trobat el fitxer <b>%s</b> (camí incorrecte, permisos incorrectes o accés denegat pel paràmetre PHP openbasedir o safe_mode)
+ErrorDirNotFound=No s'ha trobat el directori <b>%s</b> (camí incorrecte, permisos incorrectes o accés denegat pel paràmetre PHP openbasedir o safe_mode)
 ErrorFunctionNotAvailableInPHP=La funció <b>%s</b> és requerida per aquesta característica, però no es troba disponible en aquesta versió/instal·lació de PHP.
 ErrorDirAlreadyExists=Ja existeix una carpeta amb aquest nom.
 ErrorFileAlreadyExists=Ja existeix un fitxer amb aquest nom.
@@ -84,7 +84,7 @@ ErrorNoAccountancyModuleLoaded=Mòdul de comptabilitat no activat
 ErrorExportDuplicateProfil=El nom d'aquest perfil ja existeix per aquest conjunt d'exportació
 ErrorLDAPSetupNotComplete=La configuració Dolibarr-LDAP és incompleta.
 ErrorLDAPMakeManualTest=S'ha generat un fitxer .ldif al directori %s. Proveu de carregar-lo manualment des de la línia d'ordres per a obtenir més informació sobre els errors.
-ErrorCantSaveADoneUserWithZeroPercentage=No es pot desar una acció amb "estat no iniciat" si el camp "fet per" també s'omple.
+ErrorCantSaveADoneUserWithZeroPercentage=No es pot desar una acció amb «estat no iniciat» si també s'omple el camp «fet per».
 ErrorRefAlreadyExists=La referència <b> %s </b> ja existeix.
 ErrorPleaseTypeBankTransactionReportName=Introduïu el nom de l’extracte bancari on s’ha d’informar de l’entrada (format AAAAAMM o AAAAAMMDD)
 ErrorRecordHasChildren=No s'ha pogut eliminar el registre, ja que té alguns registres fills.
@@ -97,7 +97,7 @@ ErrorWrongValueForField=Camp <b> %s </b>: '<b> %s </b>' no coincideix amb la reg
 ErrorHtmlInjectionForField=Camp <b> %s </b> : el valor ' <b> %s </b> no conté dades malicioses '
 ErrorFieldValueNotIn=Camp <b> %s </b>: '<b> %s </b>' no és un valor trobat en el camp <b> %s </b> de <b> %s </b>
 ErrorFieldRefNotIn=Camp <b> %s </b>: '<b> %s </b>' no és un <b> %s </b> ref actual
-ErrorMultipleRecordFoundFromRef=Several record found when searching from ref <b>%s</b>. No way to know which ID to use.
+ErrorMultipleRecordFoundFromRef=S'han trobat diversos registres en cercar des de la referència<b>%s</b>. No hi ha manera de saber quina identificació utilitzar.
 ErrorsOnXLines=S'han trobat %s errors
 ErrorFileIsInfectedWithAVirus=L'antivirus no ha pogut validar aquest arxiu (és probable que estigui infectat per un virus)!
 ErrorNumRefModel=Hi ha una referència a la base de dades (%s) i no és compatible amb aquesta regla de numeració. Elimineu el registre o canvieu el nom de referència per a activar aquest mòdul.
@@ -125,7 +125,7 @@ ErrorCantReadFile=Error de lectura del fitxer '%s'
 ErrorCantReadDir=Error de lectura de la carpeta '%s'
 ErrorBadLoginPassword=Identificadors d'usuari o contrasenya incorrectes
 ErrorLoginDisabled=El seu compte està desactivat
-ErrorFailedToRunExternalCommand=No s'ha pogut executar l'ordre extern. Comproveu que estigui disponible i executable pel vostre usuari del servidor PHP. Comproveu que l'ordre no estigui protegida a nivell d'intèrpret d'ordres per una capa de seguretat com apparmor.
+ErrorFailedToRunExternalCommand=No s'ha pogut executar l'ordre extern. Comproveu que estigui disponible i que l'executi el vostre usuari del servidor PHP. Comproveu també que l'ordre no estigui protegida en l'àmbit d'intèrpret d'ordres per una capa de seguretat com apparmor.
 ErrorFailedToChangePassword=Error en la modificació de la contrasenya
 ErrorLoginDoesNotExists=El compte d'usuari de <b>%s</b> no s'ha trobat.
 ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
@@ -136,7 +136,7 @@ ErrorLinesCantBeNegativeForOneVATRate=El total de línies (net d’impostos) no
 ErrorLinesCantBeNegativeOnDeposits=Les línies no poden ser negatives en un dipòsit. Si ho feu, podreu tenir problemes quan necessiteu consumir el dipòsit a la factura final
 ErrorQtyForCustomerInvoiceCantBeNegative=La quantitat a les línies de factures a client no poden ser negatives
 ErrorWebServerUserHasNotPermission=El compte d'execució del servidor web <b>%s</b> no disposa dels permisos per això
-ErrorNoActivatedBarcode=No hi ha activat cap tipus de codi de barres
+ErrorNoActivatedBarcode=No s'ha activat cap mena de codi de barres
 ErrUnzipFails=No s'ha pogut descomprimir el fitxer %s amb ZipArchive
 ErrNoZipEngine=No engine to zip/unzip %s file in this PHP
 ErrorFileMustBeADolibarrPackage=El fitxer %s ha de ser un paquet Dolibarr en format zip
@@ -244,7 +244,7 @@ ErrorObjectMustHaveStatusActiveToBeDisabled=Per a desactivar els objectes, han d
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Per ser activats, els objectes han de tenir l'estat "Esborrany" o "Desactivat"
 ErrorNoFieldWithAttributeShowoncombobox=Cap camp té la propietat "showoncombobox" en la definició de l'objecte "%s". No es pot mostrar el llistat desplegable.
 ErrorFieldRequiredForProduct=El camp "%s" és obligatori per al producte %s
-AlreadyTooMuchPostOnThisIPAdress=You have already posted too much on this IP address.
+AlreadyTooMuchPostOnThisIPAdress=Ja heu publicat massa en aquesta adreça IP.
 ProblemIsInSetupOfTerminal=El problema està en la configuració del terminal %s.
 ErrorAddAtLeastOneLineFirst=Afegeix almenys una primera línia
 ErrorRecordAlreadyInAccountingDeletionNotPossible=Error, el registre ja s’ha transferit a la comptabilitat, no es pot eliminar.
@@ -262,6 +262,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Error, el paràmetre <b> %s </b> s
 ErrorLoginDateValidity=Error, aquest inici de sessió està fora de l'interval de dates de validesa
 ErrorValueLength=La longitud del camp '<b> %s </b>' ha de ser superior a '<b> %s </b>'
 ErrorReservedKeyword=La paraula '<b> %s </b>' és una paraula clau reservada
+ErrorFilenameReserved=El nom de fitxer <b>%s</b> no es pot utilitzar perquè és una ordre reservada i protegida.
 ErrorNotAvailableWithThisDistribution=No disponible amb aquesta distribució
 ErrorPublicInterfaceNotEnabled=La interfície pública no s'ha activat
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Cal definir l'idioma de la pàgina nova si es defineix com a traducció d'una altra pàgina
@@ -280,8 +281,8 @@ ErrorWrongFileName=El nom del fitxer no pot contenir __COSA__
 ErrorNotInDictionaryPaymentConditions=No es troba al Diccionari de condicions de pagament, modifiqueu-lo.
 ErrorIsNotADraft=%s no és un esborrany
 ErrorExecIdFailed=No es pot executar l'ordre "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the field %s
-ErrorRequestTooLarge=Error, request too large or session expired
+ErrorBadCharIntoLoginName=Caràcter no autoritzat al camp %s
+ErrorRequestTooLarge=Error, sol·licitud massa gran o sessió caducada
 ErrorNotApproverForHoliday=No sou l'autor de l'abandonament %s
 ErrorAttributeIsUsedIntoProduct=Aquest atribut s'utilitza en una o més variants de producte
 ErrorAttributeValueIsUsedIntoProduct=Aquest valor d'atribut s'utilitza en una o més variants de producte
@@ -298,17 +299,17 @@ ErrorFailedToLoadThirdParty=No s'ha pogut trobar/carregar un tercer des d'id=%s,
 ErrorThisPaymentModeIsNotSepa=Aquest mode de pagament no és un compte bancari
 ErrorStripeCustomerNotFoundCreateFirst=El client de Stripe no està configurat per a aquest tercer (o s'ha establert un valor suprimit al costat de Stripe). Creeu-lo (o torneu-lo a adjuntar) primer.
 ErrorCharPlusNotSupportedByImapForSearch=La cerca IMAP no pot cercar al remitent o al destinatari una cadena que contingui el caràcter +
-ErrorTableNotFound=Table <b>%s</b> not found
-ErrorValueForTooLow=Value for <b>%s</b> is too low
-ErrorValueCantBeNull=Value for <b>%s</b> can't be null
-ErrorDateOfMovementLowerThanDateOfFileTransmission=The date of the bank transaction can't be lower than the date of the file transmission
-ErrorTooMuchFileInForm=Too much files in form, the maximum number is %s file(s)
-ErrorSessionInvalidatedAfterPasswordChange=The session was been invalidated following a change of password, status or dates of validity. Please relogin.
-ErrorExistingPermission = Permission <b>%s</b> for object <b>%s</b> already exists
-ErrorFieldExist=The value for <b>%s</b> already exist
-ErrorEqualModule=Module invalid in <b>%s</b>
-ErrorFieldValue=Value for <b>%s</b> is incorrect
-ErrorCoherenceMenu=<b>%s</b> is required when <b>%</b> equal LEFT
+ErrorTableNotFound=No s'ha trobat la taula <b>%s</b>
+ErrorValueForTooLow=El valor de <b>%s</b> és massa baix
+ErrorValueCantBeNull=El valor de <b>%s</b> no pot ser nul
+ErrorDateOfMovementLowerThanDateOfFileTransmission=La data de la transacció bancària no pot ser inferior a la data de transmissió del fitxer
+ErrorTooMuchFileInForm=Hi ha massa fitxers en el formulari, el nombre màxim és de %s fitxers
+ErrorSessionInvalidatedAfterPasswordChange=La sessió s'ha invalidat després d'un canvi de contrasenya, estat o dates de validesa. Si us plau, torneu a iniciar sessió.
+ErrorExistingPermission = Ja existeix el permís <b>%s</b> per a l'objecte <b>%s</b>
+ErrorFieldExist=El valor de <b>%s</b> ja existeix
+ErrorEqualModule=El mòdul no és vàlid a <b>%s</b>
+ErrorFieldValue=El valor de <b>%s</b> és incorrecte
+ErrorCoherenceMenu= <b>%s</b> és necessari quan <b>%s</b> és «left»
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El paràmetre PHP upload_max_filesize (%s) és superior al paràmetre PHP post_max_size (%s). No es tracta d’una configuració consistent.
@@ -346,8 +347,8 @@ WarningModuleXDisabledSoYouMayMissEventHere=El mòdul %s no s'ha habilitat. Per
 WarningPaypalPaymentNotCompatibleWithStrict=El valor "Estricte" fa que les funcions de pagament en línia no funcionin correctament. Utilitzeu "Lax".
 WarningThemeForcedTo=Avís, el tema s'ha forçat a <b> %s </b> per la constant oculta MAIN_FORCETHEME
 WarningPagesWillBeDeleted=Advertència, això també suprimirà totes les pàgines/contenidors existents del lloc web. Hauríeu d'exportar el vostre lloc web abans, de manera que tingueu una còpia de seguretat per tornar-lo a importar més tard.
-WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=Automatic validation is disabled when option to decrease stock is set on "Invoice validation".
-WarningModuleNeedRefrech = Module <b>%s</b> has been disabled. Don't forget to enable it
+WarningAutoValNotPossibleWhenStockIsDecreasedOnInvoiceVal=La validació automàtica es desactiva quan l'opció de disminució d'estoc s'estableix a "Validació de la factura".
+WarningModuleNeedRefrech = El mòdul <b>%s</b> s'ha desactivat. No oblideu activar-lo
 
 # Validate
 RequireValidValue = El valor no és vàlid
diff --git a/htdocs/langs/ca_ES/help.lang b/htdocs/langs/ca_ES/help.lang
index 431e2d14223..95c3c5ae6ef 100644
--- a/htdocs/langs/ca_ES/help.lang
+++ b/htdocs/langs/ca_ES/help.lang
@@ -3,10 +3,10 @@ CommunitySupport=Assistència Forums i Wiki
 EMailSupport=Assistència E-Mail
 RemoteControlSupport=Suport en línia en temps real / remot
 OtherSupport=Altres tipus d'assistència
-ToSeeListOfAvailableRessources=Per contactar/veure els recursos disponibles:
+ToSeeListOfAvailableRessources=Per a contactar/veure els recursos disponibles:
 HelpCenter=Centre d'ajuda
 DolibarrHelpCenter=Centre d'Ajuda i Suport de Dolibarr
-ToGoBackToDolibarr=En cas contrari, <a href="%s"> fes clic aquí per continuar utilitzant Dolibarr </a>.
+ToGoBackToDolibarr=En cas contrari, <a href="%s">feu clic aquí per a continuar utilitzant Dolibarr</a>.
 TypeOfSupport=Tipus de suport
 TypeSupportCommunauty=Comunitari (gratuït)
 TypeSupportCommercial=Comercial
@@ -20,4 +20,4 @@ BackToHelpCenter=En cas contrari, <a href="%s"> torna a la pàgina d'inici del C
 LinkToGoldMember=Pots trucar a un dels formadors preseleccionats per Dolibarr pel teu idioma (%s) fent clic al seu Panell (l'estat i el preu màxim s'actualitzen automàticament):
 PossibleLanguages=Idiomes disponibles
 SubscribeToFoundation=Ajuda al projecte Dolibarr, adhereix-te a l'associació
-SeeOfficalSupport=Per a obtenir suport oficial de Dolibarr en el vostre idioma: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
+SeeOfficalSupport=Per a obtenir suport oficial de Dolibarr en el vostre idioma: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index af0c560f896..c29fa3d1198 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -8,7 +8,7 @@ MenuAddCP=Sol·licitud nova de dia lliure
 MenuCollectiveAddCP=Nova sol·licitud de festiu col·lectiu
 NotActiveModCP=Heu d'habilitar el mòdul Dies lliures per a veure aquesta pàgina.
 AddCP=Feu una sol·licitud de dia lliure
-DateDebCP=Data inici
+DateDebCP=Data d'inici
 DateFinCP=Data fi
 DraftCP=Esborrany
 ToReviewCP=A l'espera d'aprovació
@@ -85,7 +85,7 @@ AddEventToUserOkCP=S'ha completat la incorporació del dia lliure excepcional.
 ErrorFieldRequiredUserOrGroup=Cal omplir el camp "grup" o el camp "usuari".
 fusionGroupsUsers=El camp de grups i el camp d'usuari es fusionaran
 MenuLogCP=Veure registre de canvis
-LogCP=Registre de totes les actualitzacions fetes a "Saldo de dies lliures"
+LogCP=Registre de totes les actualitzacions fetes a «Saldo de dies lliures»
 ActionByCP=Actualitzat per
 UserUpdateCP=Actualitzat per a
 PrevSoldeCP=Saldo anterior
@@ -107,7 +107,7 @@ HolidaysCancelation=Cancel·lació de la sol·licitud de dies lliures
 EmployeeLastname=Cognoms de l'empleat
 EmployeeFirstname=Nom de l'empleat
 TypeWasDisabledOrRemoved=El tipus de dia lliure (id %s) ha sigut desactivat o eliminat
-LastHolidays=Les darreres %s sol·licituds de permís
+LastHolidays=Últimes %s sol·licituds de dies lliures
 AllHolidays=Totes les sol·licituds de permís
 HalfDay=Mig dia
 NotTheAssignedApprover=No sou l'aprovador assignat
@@ -129,13 +129,13 @@ HolidaysToValidateBody=A continuació es mostra una sol·licitud de permís per
 HolidaysToValidateDelay=Aquesta sol·licitud de dies lliures retribuïts tindrà lloc en un termini de menys de %s dies.
 HolidaysToValidateAlertSolde=L'usuari que ha realitzat la sol·licitud de dies lliures retribuïts no disposa de suficients dies disponibles
 HolidaysValidated=Sol·licituds de permís validats
-HolidaysValidatedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut validada.
+HolidaysValidatedBody=La vostra sol·licitud de dies lliures de %s a %s s'ha validat.
 HolidaysRefused=Dies lliures retribuïts denegats
 HolidaysRefusedBody=La seva sol·licitud de dies lliures retribuïts des de el %s al %s ha sigut denegada per el següent motiu:
 HolidaysCanceled=Dies lliures retribuïts cancel·lats
 HolidaysCanceledBody=S'ha cancel·lat la vostra sol·licitud de permís del %s al %s.
 FollowedByACounter=1: Aquest tipus de dia lliure necessita el seguiment d'un comptador. El comptador s'incrementa manualment o automàticament i quan hi ha una petició de dia lliure validada, el comptador es decrementa.<br>0: No seguit per un comptador.
-NoLeaveWithCounterDefined=No hi ha cap tipus de dia lliure definit que hagi de seguir un comptador
+NoLeaveWithCounterDefined=No hi ha cap mena de dia lliure definit que hagi de ser seguit per un comptador
 GoIntoDictionaryHolidayTypes=Aneu a <strong> Inici - Configuració - Diccionaris - Tipus de dies lliures </strong> per a configurar els diferents tipus de dies lliures.
 HolidaySetup=Configuració del mòdul Dies de permís
 HolidaysNumberingModules=Models de numeració de sol·licituds de dies de permís
@@ -149,10 +149,10 @@ XIsAUsualNonWorkingDay=%s sol ser un dia NO laborable
 BlockHolidayIfNegative=Bloqueja si el saldo és negatiu
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=La creació d'aquesta sol·licitud de vacances està bloquejada perquè el vostre saldo és negatiu
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=La sol·licitud d'abandonament %s ha de ser esborrany, cancel·lada o rebutjada per eliminar-la
-IncreaseHolidays=Increase leave balance
-HolidayRecordsIncreased= %s leave balances increased
-HolidayRecordIncreased=Leave balance increased
-ConfirmMassIncreaseHoliday=Bulk leave balance increase
-NumberDayAddMass=Number of day to add to the selection
-ConfirmMassIncreaseHolidayQuestion=Are you sure you want to increase holiday of the %s selected record(s)?
+IncreaseHolidays=Augmentar el saldo de dies lliures
+HolidayRecordsIncreased= %s saldos de dies lliures augmentats
+HolidayRecordIncreased=Saldo de dies lliures augmentat
+ConfirmMassIncreaseHoliday=Augment massiu del saldo de dies lliures
+NumberDayAddMass=Nombre de dia per a afegir a la selecció
+ConfirmMassIncreaseHolidayQuestion=Esteu segur que voleu augmentar les vacances dels registres seleccionats %s?
 HolidayQtyNotModified=El saldo dels dies restants per a %s no s'ha canviat
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 4057871b57b..7591d31118f 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -8,7 +8,7 @@ ConfFileIsNotWritable=L'arxiu de configuració <b>%s</b> no és modificable. Com
 ConfFileIsWritable=L'arxiu <b>%s</b> és modificable.
 ConfFileMustBeAFileNotADir=El fitxer de configuració <b> %s</b> ha de ser un fitxer, no un directori.
 ConfFileReload=Actualització dels paràmetres del fitxer de configuració.
-NoReadableConfFileSoStartInstall=El fitxer de configuració <b> conf/conf.php </b> no existeix o no es pot llegir. Executarem el procés d'instal·lació per intentar inicialitzar-lo.
+NoReadableConfFileSoStartInstall=El fitxer de configuració <b>conf/conf.php</b> no existeix o no es pot llegir. Executarem el procés d'instal·lació per a intentar inicialitzar-lo.
 PHPSupportPOSTGETOk=Aquest PHP suporta bé les variables POST i GET.
 PHPSupportPOSTGETKo=És possible que aquest PHP no suport les variables POST i/o GET. Comproveu el paràmetre <b>variables_order</b> del php.ini.
 PHPSupportSessions=Aquest PHP suporta sessions
@@ -82,7 +82,7 @@ GoToDolibarr=Aneu a Dolibarr
 GoToSetupArea=Aneu a Dolibarr (àrea de configuració)
 MigrationNotFinished=La versió de la base de dades no està completament actualitzada: torneu a executar el procés d'actualització.
 GoToUpgradePage=Aneu de nou a la pàgina d'actualització
-WithNoSlashAtTheEnd=Sense el signe "/" al final
+WithNoSlashAtTheEnd=Sense la barra inclinada «/» al final
 DirectoryRecommendation= <span class="warning"> IMPORTANT </span>: Heu d'utilitzar un directori que es troba fora de les pàgines web (no utilitzeu un subdirector del paràmetre anterior).
 LoginAlreadyExists=Ja existeix
 DolibarrAdminLogin=Nom d'usuari d’administrador de Dolibarr
@@ -94,7 +94,7 @@ ChoosedMigrateScript=Elecció de l'script de migració
 DataMigration=Migració de la base de dades (dades)
 DatabaseMigration=Migració de la base de dades (estructura + algunes dades)
 ProcessMigrateScript=Execució del script
-ChooseYourSetupMode=Trieu el mode de configuració i feu clic a "Comença"...
+ChooseYourSetupMode=Trieu el vostre mode de configuració i feu clic a «Inici»...
 FreshInstall=Nova instal·lació
 FreshInstallDesc=Utilitzeu aquest mode si aquesta és la vostra primera instal·lació. Si no, aquest mode pot reparar una instal·lació prèvia incompleta. Si voleu actualitzar la vostra versió, seleccioneu "Actualitzar".
 Upgrade=Actualització
@@ -129,7 +129,7 @@ MigrationCustomerOrderShipping=Migració de dades d'enviament de comandes de ven
 MigrationShippingDelivery=Actualització de les dades d'enviaments
 MigrationShippingDelivery2=Actualització de les dades d'enviaments 2
 MigrationFinished=S'ha acabat la migració
-LastStepDesc=<strong> Darrer pas </strong>: definiu aquí l'inici de sessió i la contrasenya que voleu utilitzar per connectar-se a Dolibarr. <b> No perdis això, ja que és el compte mestre per administrar tots els altres / comptes d'usuari addicionals.</b>
+LastStepDesc=<strong>Últim pas</strong>: Definiu aquí l'inici de sessió i la contrasenya que voleu utilitzar per a connectar-vos a Dolibarr. <b>No la perdeu, ja que és el compte principal per a administrar tots els altres comptes d'usuari addicionals.</b>
 ActivateModule=Activació del mòdul %s
 ShowEditTechnicalParameters=Feu clic aquí per a mostrar/editar els paràmetres avançats (mode expert)
 WarningUpgrade=Avís:\nHas fet una còpia de seguretat de la base de dades primer?\nAixò és molt recomanable. La pèrdua de dades (a causa, per exemple, d'errors a la versió de mysql 5.5.40/41/42/43) és possible durant aquest procés, per la qual cosa és essencial fer un bolcat complet de la base de dades abans d'iniciar qualsevol migració.\n\nFeu clic a D'acord per a iniciar el procés de migració...
@@ -157,7 +157,7 @@ MigrationPaymentsUpdate=Actualització dels pagaments (vincle nn pagaments-factu
 MigrationPaymentsNumberToUpdate=%s pagament(s) a actualitzar
 MigrationProcessPaymentUpdate=Actualització pagament(s) %s
 MigrationPaymentsNothingToUpdate=No hi ha més pagaments orfes que hagin de corregir.
-MigrationPaymentsNothingUpdatable=No hi ha més pagaments per corregir
+MigrationPaymentsNothingUpdatable=No hi ha més pagaments que es puguin corregir
 MigrationContractsUpdate=Actualització dels contractes sense detalls (gestió del contracte + detall de contracte)
 MigrationContractsNumberToUpdate=%s contracte(s) a actualitzar
 MigrationContractsLineCreation=Crea una línia de contracte per referència del contracte %s
@@ -165,8 +165,8 @@ MigrationContractsNothingToUpdate=No hi ha més contractes (vinculats a un produ
 MigrationContractsFieldDontExist=El camp fk_facture ja no existeix. Res a fer.
 MigrationContractsEmptyDatesUpdate=Correcció de la data buida de contracte
 MigrationContractsEmptyDatesUpdateSuccess=La correcció de la data buida del contracte s'ha realitzat correctament
-MigrationContractsEmptyDatesNothingToUpdate=No hi ha data de contracte buida per corregir
-MigrationContractsEmptyCreationDatesNothingToUpdate=No hi ha data de creació del contracte per corregir
+MigrationContractsEmptyDatesNothingToUpdate=Cap data de contracte buida a corregir
+MigrationContractsEmptyCreationDatesNothingToUpdate=Cap data de creació de contracte a corregir
 MigrationContractsInvalidDatesUpdate=Correcció del valor incorrecte de la data de contracte
 MigrationContractsInvalidDateFix=Corregir contracte %s (data contracte=%s, Data posada en servei min=%s)
 MigrationContractsInvalidDatesNumber=%s contractes modificats
@@ -205,13 +205,13 @@ MigrationResetBlockedLog=Restablir el mòdul BlockedLog per l'algoritme v7
 MigrationImportOrExportProfiles=Migració de perfils d'importació o exportació (%s)
 ShowNotAvailableOptions=Mostra les opcions no disponibles
 HideNotAvailableOptions=Amaga les opcions no disponibles
-ErrorFoundDuringMigration=S'han reportat error(s) durant el procés de migració, de manera que el següent pas no està disponible. Per ignorar els errors, podeu <a href="%s"> fer clic aquí </a>, però l'aplicació o algunes funcions no funcionen correctament fins que es resolen els errors.
+ErrorFoundDuringMigration=S'han informat errors durant el procés de migració, de manera que el pas següent no està disponible. Per a ignorar els errors, podeu fer <a href="%s">clic aquí</a>, però és possible que l'aplicació o algunes funcions no funcionin correctament fins que es resolguin els errors.
 YouTryInstallDisabledByDirLock=L'aplicació ha intentat actualitzar-se automàticament, però les pàgines d'instal·lació / actualització s'han desactivat per a la seguretat (el directori rep el nom amb el sufix .lock). <br>
 YouTryInstallDisabledByFileLock=L'aplicació s'ha intentat actualitzar automàticament, però les pàgines d'instal·lació / actualització s'han desactivat per a la seguretat (per l'existència d'un fitxer de bloqueig <strong> install.lock </strong> al directori de documents del dolibarr). <br>
-YouTryUpgradeDisabledByMissingFileUnLock=The application tried to self-upgrade, but the upgrade process is currently not allowed.<br>
+YouTryUpgradeDisabledByMissingFileUnLock=L'aplicació ha intentat actualitzar-se, però el procés d'actualització no està permès actualment. <br>
 ClickHereToGoToApp=Fes clic aquí per anar a la teva aplicació
 ClickOnLinkOrRemoveManualy=Si una actualització està en curs, espereu. Si no, feu clic al següent enllaç. Si sempre veieu aquesta mateixa pàgina, heu de suprimir / canviar el nom del fitxer install.lock del directori de documents.
-ClickOnLinkOrCreateUnlockFileManualy=If an upgrade is in progress, please wait... If not, you must create a file upgrade.unlock into the Dolibarr documents directory.
+ClickOnLinkOrCreateUnlockFileManualy=Si hi ha una actualització en curs, espereu... Si no, heu de crear un fitxer upgrade.unlock al directori de documents de Dolibarr.
 Loaded=Carregat
 FunctionTest=Prova de funció
 NodoUpgradeAfterDB=Cap acció sol·licitada pels mòduls externs després de l'actualització de la base de dades
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index 0297d3da2bf..b281400e064 100644
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -24,9 +24,9 @@ NameAndSignatureOfInternalContact=Nom i signatura del participant:
 NameAndSignatureOfExternalContact=Nom i signatura del client:
 DocumentModelStandard=Document model estàndard per a intervencions
 InterventionCardsAndInterventionLines=Fitxes i línies d'intervenció
-InterventionClassifyBilled=Classifica "Facturat"
-InterventionClassifyUnBilled=Classifica "No facturat"
-InterventionClassifyDone=Classifica com a "Fet"
+InterventionClassifyBilled=Marca «Facturat»
+InterventionClassifyUnBilled=Marca «No facturat»
+InterventionClassifyDone=Marca «Fet»
 StatusInterInvoiced=Facturada
 SendInterventionRef=Presentar intervenció %s
 SendInterventionByMail=Envia la intervenció per e-mail
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Oculta hores i minuts del camp de dates dels regis
 InterventionStatistics=Estadístiques de intervencions
 NbOfinterventions=Nombre de fitxers d’intervenció
 NumberOfInterventionsByMonth=Nombre de fitxes d'intervenció per mes (data de validació)
-AmountOfInteventionNotIncludedByDefault=La quantitat d'intervenció no s'inclou per defecte als beneficis (en la majoria dels casos, les fulles de temps s'utilitzen per a comptar el temps dedicat). Afegiu l'opció PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT a 1 a Inici-Vonfiguració-Altres per a incloure'ls.
+AmountOfInteventionNotIncludedByDefault=La quantitat d'intervenció no s'inclou per defecte als beneficis (en la majoria dels casos, les fulles de temps s'utilitzen per a comptar el temps dedicat). Podeu utilitzar l'opció PROJECT_ELEMENTS_FOR_ADD_MARGIN i PROJECT_ELEMENTS_FOR_MINUS_MARGIN a la configuració d'Inici-Configuració-Altres per a completar la llista d'elements inclosos als beneficis.
 InterId=Id. d'intervenció
 InterRef=Ref. d'intervenció
 InterDateCreation=Data de creació de la intervenció
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index e1b776a6649..e4aab8c1d43 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -7,10 +7,10 @@ MailCard=Fitxa E-Mailing
 MailRecipients=Destinataris
 MailRecipient=Destinatari
 MailTitle=Descripció
-MailFrom=Remitent
+MailFrom=De
 MailErrorsTo=Errors a
 MailReply=Respondre a
-MailTo=Destinatari(s)
+MailTo=Enviar a
 MailToUsers=A l'usuari(s)
 MailCC=Còpia a
 MailToCCUsers=Còpia l'usuari(s)
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contactes per càrrec
 MailingModuleDescEmailsFromFile=Correus electrònics des de fitxer
 MailingModuleDescEmailsFromUser=Entrada de correus electrònics per usuari
 MailingModuleDescDolibarrUsers=Usuaris amb correus electrònics
-MailingModuleDescThirdPartiesByCategories=Tercers (per categories)
+MailingModuleDescThirdPartiesByCategories=Tercers
 SendingFromWebInterfaceIsNotAllowed=L'enviament des de la interfície web no està permès.
 EmailCollectorFilterDesc=Tots els filtres han de coincidir perquè es reculli un correu electrònic
 
@@ -106,7 +106,7 @@ NbOfCompaniesContacts=Contactes/adreces únics
 MailNoChangePossible=Destinataris d'un E-Mailing validat no modificables
 SearchAMailing=Cercar un E-Mailing
 SendMailing=Envia e-mailing
-SentBy=Enviat por
+SentBy=Enviat per
 MailingNeedCommand=L’enviament de correus electrònics massius es pot realitzar des de la línia d'ordres. Demaneu a l'administrador del servidor que iniciï la següent ordre per a enviar els correus electrònics a tots els destinataris:
 MailingNeedCommand2=No obstant això, podeu enviar-los en línia afegint el paràmetre MAILING_LIMIT_SENDBYWEB amb el valor del nombre màxim de correus electrònics que vulgueu enviar per sessió. Per a això, aneu a Inici - Configuració - Altres.
 ConfirmSendingEmailing=Si voleu enviar correus electrònics directament des d'aquesta pantalla, confirmeu que esteu segur que voleu enviar correus electrònics ara des del vostre navegador?
@@ -118,8 +118,8 @@ NbOfEMailingsReceived=E-Mailings en massa rebuts
 NbOfEMailingsSend=E-mails massius enviats
 IdRecord=ID registre
 DeliveryReceipt=Justificant de recepció.
-YouCanUseCommaSeparatorForSeveralRecipients=Podeu utilitzar el separador <b> coma </b> per a especificar diversos destinataris.
-TagCheckMail=Seguiment de l'obertura del email
+YouCanUseCommaSeparatorForSeveralRecipients=Podeu utilitzar el separador <b>coma</b> per a especificar diversos destinataris.
+TagCheckMail=Seguiment de l'obertura del correu
 TagUnsubscribe=Enllaç de cancel·lació de la subscripció
 TagSignature=Signatura de l'usuari remitent
 EMailRecipient=Correu electrònic del destinatari
@@ -142,17 +142,17 @@ NbOfTargetedContacts=Nombre actual de correus electrònics de contactes destinat
 UseFormatFileEmailToTarget=El fitxer importat ha de tenir el format <strong>email;nom;cognom;altre</strong>
 UseFormatInputEmailToTarget=Entra una cadena amb el format <strong>email;nom;cognom;altre</strong>
 MailAdvTargetRecipients=Destinataris (selecció avançada)
-AdvTgtTitle=Ompliu els camps d'entrada per seleccionar prèviament els tercers o contactes / adreces a destinació
+AdvTgtTitle=Ompliu els camps d'entrada per a preseleccionar els tercers o els contactes/adreces de destí
 AdvTgtSearchTextHelp=Utilitzeu %% com a comodins. Per exemple, per a trobar tots els elements com <b> jean, joe, jim </b>, podeu introduir <b> j%% </b>, també podeu utilitzar ; com a separador de valor i utilitzar ! per excepcions d'aquest valor. Per exemple, <b> jean;joe;jim%%;!jimo;!jima%% </b> tindrà com a objectiu tots els jean, joe, començant per jim però no jimo ni tot el que comenci amb jima
-AdvTgtSearchIntHelp=Utilitza un interval per seleccionar un valor enter o decimal
+AdvTgtSearchIntHelp=Utilitzeu un interval per a seleccionar un valor enter o decimal
 AdvTgtMinVal=Valor mínim
 AdvTgtMaxVal=Valor màxim
-AdvTgtSearchDtHelp=Utilitza un interval per seleccionar el valor de la data
+AdvTgtSearchDtHelp=Utilitzeu l'interval per a seleccionar el valor de la data
 AdvTgtStartDt=Dt. inici
 AdvTgtEndDt=Dt. final
 AdvTgtTypeOfIncudeHelp=Target E-mail de tercers i correu electrònic de contacte del tercer, o simplement un correu electrònic de tercers o només un correu electrònic de contacte
-AdvTgtTypeOfIncude=Tipus de e-mail marcat
-AdvTgtContactHelp=Utilitza només si marques el contacte en "Tipus de e-mails marcats"
+AdvTgtTypeOfIncude=Tipus de correu electrònic dirigit
+AdvTgtContactHelp=Feu servir només si orienteu el contacte a "Tipus de correu electrònic dirigit"
 AddAll=Afegeix tot
 RemoveAll=Elimina tot
 ItemsCount=Registre(s)
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Registre creat pel Receptor de correus electrònic
 DefaultBlacklistMailingStatus=Valor per defecte del camp '%s' en crear un contacte nou
 DefaultStatusEmptyMandatory=Buit però obligatori
 WarningLimitSendByDay=ADVERTIMENT: la configuració o el contracte de la vostra instància limita el vostre nombre de correus electrònics per dia a <b> %s </b> . Si intenteu enviar-ne més, pot ser que la vostra instància es ralenteixi o se suspengui. Poseu-vos en contacte amb el vostre servei d'assistència si necessiteu una quota més alta.
+NoMoreRecipientToSendTo=No hi ha més destinatari a qui enviar el correu electrònic
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index a7f516e8eed..8703eca1e78 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -13,7 +13,7 @@ DIRECTION=ltr
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
-SeparatorThousand=None
+SeparatorThousand=.
 FormatDateShort=%d/%m/%Y
 FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
@@ -54,9 +54,9 @@ ErrorConstantNotDefined=Parámetre %s no definit
 ErrorUnknown=Error desconegut
 ErrorSQL=Error de SQL
 ErrorLogoFileNotFound=No s'ha trobat el fitxer de logotip «%s».
-ErrorGoToGlobalSetup=Aneu a la configuració "Empresa/Organització" per a solucionar-ho
+ErrorGoToGlobalSetup=Aneu a la configuració «Empresa/Organització» per a solucionar-ho
 ErrorGoToModuleSetup=Aneu a Configuració del mòdul per a solucionar-ho
-ErrorFailedToSendMail=Error en l'enviament de l'e-mail (emissor =%s, destinatairo =%s)
+ErrorFailedToSendMail=No s'ha pogut enviar el correu (emissor=%s, receptor=%s)
 ErrorFileNotUploaded=El fitxer no s'ha pogut transferir
 ErrorInternalErrorDetected=Error detectat
 ErrorWrongHostParameter=Paràmetre Servidor invàlid
@@ -70,11 +70,11 @@ ErrorDuplicateField=Duplicat en un camp únic
 ErrorSomeErrorWereFoundRollbackIsDone=S'han trobat alguns errors. Modificacions desfetes.
 ErrorConfigParameterNotDefined=El paràmetre <b>%s</b> no està definit en el fitxer de configuració Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Impossible trobar l'usuari <b>%s</b> a la base de dades Dolibarr.
-ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al país '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, cap tipus d'impost varis definit per al país '%s'.
+ErrorNoVATRateDefinedForSellerCountry=Error, no s'han definit les taxes d'IVA per al país «%s».
+ErrorNoSocialContributionForSellerCountry=Error, no s'ha definit cap mena d'impost varis per al país «%s».
 ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
-ErrorCannotAddThisParentWarehouse=Esteu intentant afegir un magatzem primari que ja és fill d'un mag    atzem existent
-FieldCannotBeNegative=El camp "%s" no pot ser negatiu
+ErrorCannotAddThisParentWarehouse=Esteu intentant afegir un magatzem principal que ja és fill d'un magatzem existent
+FieldCannotBeNegative=El camp «%s» no pot ser negatiu
 MaxNbOfRecordPerPage=Màx. nombre de registres per pàgina
 NotAuthorized=No estàs autoritzat per a fer-ho.
 SetDate=Indica la data
@@ -122,14 +122,14 @@ ReturnCodeLastAccessInError=Retorna el codi per les últimes peticions d'accés
 InformationLastAccessInError=Informació de les últimes peticions d'accés a la base de dades amb error
 DolibarrHasDetectedError=Dolibarr ha trobat un error tècnic
 YouCanSetOptionDolibarrMainProdToZero=Podeu llegir el fitxer de registre o establir l'opció $dolibarr_main_prod a '0' al fitxer de configuració per a obtenir més informació.
-InformationToHelpDiagnose=Aquesta informació pot ser útil per a finalitats de diagnòstic (podeu establir l'opció $dolibarr_main_prod a '1' per amagar informació sensible)
+InformationToHelpDiagnose=Aquesta informació pot ser útil per a finalitats de diagnòstic (podeu establir l'opció $dolibarr_main_prod a «1» per a amagar informació delicada)
 MoreInformation=Més informació
 TechnicalInformation=Informació tècnica
 TechnicalID=ID Tècnic
 LineID=ID de línia
 NotePublic=Nota (pública)
 NotePrivate=Nota (privada)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr està configurat per limitar la precisió dels preus unitaris a <b>%s </b> decimals.
+PrecisionUnitIsLimitedToXDecimals=Dolibarr està configurat per a limitar la precisió dels preus unitaris a <b>%s</b> decimals.
 DoTest=Provar
 ToFilter=Filtre
 NoFilter=Sense filtre
@@ -281,7 +281,7 @@ Date=Data
 DateAndHour=Data i hora
 DateToday=Data d'avui
 DateReference=Data de referència
-DateStart=Data inicial
+DateStart=Data d'inici
 DateEnd=Data final
 DateCreation=Data de creació
 DateCreationShort=Data creació
@@ -475,11 +475,11 @@ ActionsToDo=Esdeveniments a realitzar
 ActionsToDoShort=A realitzar
 ActionsDoneShort=Realitzades
 ActionNotApplicable=No aplicable
-ActionRunningNotStarted=No començat
+ActionRunningNotStarted=Començar
 ActionRunningShort=En progrés
 ActionDoneShort=Acabat
 ActionUncomplete=Incomplet
-LatestLinkedEvents=Darrers %s esdeveniments vinculats
+LatestLinkedEvents=Últims %s esdeveniments vinculats
 CompanyFoundation=Empresa/Organització
 Accountant=Comptador
 ContactsForCompany=Contactes d'aquest tercer
@@ -514,6 +514,7 @@ NotYetAvailable=Encara no disponible
 NotAvailable=No disponible
 Categories=Etiquetes
 Category=Etiqueta
+SelectTheTagsToAssign=Seleccioneu les etiquetes/categories que voleu assignar
 By=Per
 From=De
 FromDate=De
@@ -783,7 +784,7 @@ CoreErrorTitle=Error del sistema
 CoreErrorMessage=Ho sentim, s'ha produït un error. Poseu-vos en contacte amb l'administrador del sistema per a comprovar els registres o desactiva $dolibarr_main_prod=1 per a obtenir més informació.
 CreditCard=Targeta de crèdit
 ValidatePayment=Validar aquest pagament
-CreditOrDebitCard=Tarja de crèdit o dèbit
+CreditOrDebitCard=Targeta de crèdit o dèbit
 FieldsWithAreMandatory=Els camps marcats per un <b>%s</b> són obligatoris
 FieldsWithIsForPublic=Els camps marcats per <b>%s</b> es mostren en la llista pública de socis. Si no voleu veure'ls, desactiveu la casella "públic".
 AccordingToGeoIPDatabase=(Obtingut per conversió GeoIP)
@@ -826,7 +827,7 @@ LinkToMo=Enllaç a Mo
 CreateDraft=Crea esborrany
 SetToDraft=Tornar a redactar
 ClickToEdit=Clic per a editar
-ClickToRefresh=Clic per actualitzar
+ClickToRefresh=Feu clic per a actualitzar
 EditWithEditor=Editar amb CKEditor
 EditWithTextEditor=Editar amb l'editor de text
 EditHTMLSource=Editar el codi HTML
@@ -902,8 +903,8 @@ ConfirmMassClone=Confirma la clonació massiva
 ConfirmMassCloneQuestion=Seleccioneu el projecte per a clonar
 ConfirmMassCloneToOneProject=Clonar al projecte %s
 RelatedObjects=Objectes relacionats
-ClassifyBilled=Classifica facturat
-ClassifyUnbilled=Classifica no facturat
+ClassifyBilled=Marca facturat
+ClassifyUnbilled=Marca no facturat
 Progress=Progrés
 ProgressShort=Progr.
 FrontOffice=Front office
@@ -916,8 +917,8 @@ ExportFilteredList=Llistat filtrat d'exportació
 ExportList=Llistat d'exportació
 ExportOptions=Opcions d'exportació
 IncludeDocsAlreadyExported=Inclou documents ja exportats
-ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
-ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
+ExportOfPiecesAlreadyExportedIsEnable=Els documents ja exportats són visibles i s'exportaran
+ExportOfPiecesAlreadyExportedIsDisable=Els documents ja exportats s'amaguen i no s'exportaran
 AllExportedMovementsWereRecordedAsExported=Tots els moviments exportats s'han registrat com a exportats
 NotAllExportedMovementsCouldBeRecordedAsExported=No s'ha pogut registrar tots els moviments exportats com a exportats
 Miscellaneous=Diversos
@@ -928,9 +929,9 @@ ViewFlatList=Veure llista plana
 ViewAccountList=Veure llibre major
 ViewSubAccountList=Vegeu el subcompte del llibre major
 RemoveString=Eliminar cadena '%s'
-SomeTranslationAreUncomplete=Alguns dels idiomes que s'ofereixen poden estar traduïts només parcialment o poden contenir errors. Si us plau, ajudeu a corregir el vostre idioma registrant-vos a <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/</a> per a afegir les vostres millores.
+SomeTranslationAreUncomplete=Alguns dels idiomes que s'ofereixen poden estar traduïts només parcialment o poden contenir errors. Si us plau, ajudeu a corregir el vostre idioma registrant-vos a <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> per a afegir les vostres millores.
 DirectDownloadLink=Enllaç de descàrrega públic
-PublicDownloadLinkDesc=Per baixar el fitxer només es necessita l'enllaç
+PublicDownloadLinkDesc=Només cal l'enllaç per a descarregar el fitxer
 DirectDownloadInternalLink=Enllaç de descàrrega privat
 PrivateDownloadLinkDesc=Cal estar registrat i amb permisos per a visualitzar o descarregar el fitxer
 Download=Descarrega
@@ -1160,15 +1161,15 @@ SetSupervisor=Estableix el supervisor
 CreateExternalUser=Crea un usuari extern
 ConfirmAffectTag=Assignació massiva d'etiquetes
 ConfirmAffectUser=Assignació massiva d'usuaris
-ProjectRole=Role assigned on each project/opportunity
-TasksRole=Role assigned on each task (if used)
-ConfirmSetSupervisor=Bulk Supervisor Set
-ConfirmUpdatePrice=Choose a increase/decrease price rate
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
+ProjectRole=Rol assignat a cada projecte/oportunitat
+TasksRole=Rol assignat a cada tasca (si s'utilitza)
+ConfirmSetSupervisor=Estableix el supervisor massivament
+ConfirmUpdatePrice=Trieu una taxa de preu d'augment/disminució
+ConfirmAffectTagQuestion=Esteu segur que voleu assignar etiquetes als registres seleccionats %s?
+ConfirmAffectUserQuestion=Esteu segur que voleu assignar usuaris als registres seleccionats %s?
 ConfirmSetSupervisorQuestion=Esteu segur que voleu establir el supervisor als %s registres seleccionats?
-ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
-CategTypeNotFound=No s'ha trobat cap tipus d'etiqueta per al tipus de registres
+ConfirmUpdatePriceQuestion=Esteu segur que voleu actualitzar el preu dels registres seleccionats %s?
+CategTypeNotFound=No s'ha trobat cap mena d'etiqueta per al tipus de registre
 Rate=Tipus
 SupervisorNotFound=No s'ha trobat el supervisor
 CopiedToClipboard=Copiat al porta-retalls
@@ -1205,8 +1206,8 @@ Terminated=Baixa
 AddLineOnPosition=Afegeix una línia a la posició (al final si està buida)
 ConfirmAllocateCommercial=Assigna la confirmació del representant de vendes
 ConfirmAllocateCommercialQuestion=Esteu segur que voleu assignar els registres seleccionats (%s)?
-CommercialsAffected=Sales representatives assigned
-CommercialAffected=Sales representative assigned
+CommercialsAffected=Agents comercials assignats
+CommercialAffected=Agent comercial assignat
 YourMessage=El teu missatge
 YourMessageHasBeenReceived=S'ha rebut el teu missatge. Et respondrem o contactarem al més aviat possible.
 UrlToCheck=URL per a comprovar
@@ -1217,11 +1218,12 @@ UserAgent=Agent d'usuari
 InternalUser=Usuari intern
 ExternalUser=Usuari extern
 NoSpecificContactAddress=No hi ha cap contacte ni adreça específics
-NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
+NoSpecificContactAddressBis=Aquesta pestanya està dedicada a forçar contactes o adreces específiques per a l'objecte actual. Utilitzeu-lo només si voleu definir un o diversos contactes o adreces específiques per a l'objecte quan la informació del tercer no sigui suficient o no sigui precisa.
 HideOnVCard=Amaga %s
 AddToContacts=Afegeix una adreça als meus contactes
 LastAccess=Últim accés
 UploadAnImageToSeeAPhotoHere=Carregueu una imatge de la pestanya %s per a veure una foto aquí
 LastPasswordChangeDate=Data de l'últim canvi de contrasenya
-PublicVirtualCardUrl=Virtual business card page
+PublicVirtualCardUrl=URL de la pàgina de la fitxa de visita virtual
+PublicVirtualCard=Targeta de visita virtual
 TreeView=Vista d'arbre
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index 0ab8a76b6d0..e0c32c282ad 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -6,9 +6,10 @@ TotalMargin=Marge total
 MarginOnProducts=Marge / Productes
 MarginOnServices=Marge / Serveis
 MarginRate=Marge sobre cost
-MarkRate=Marge sobre venda
+ModifyMarginRates=Modificar les taxes de marge
+MarkRate=Marge de venda
 DisplayMarginRates=Mostrar els marges sobre cost
-DisplayMarkRates=Mostrar els marges sobre venda
+DisplayMarkRates=Mostra els marges de venda
 InputPrice=Introduir un preu
 margin=Gestió de marges
 margesSetup=Configuració de la gestió de marges
@@ -22,7 +23,7 @@ ProductService=Producte o servei
 AllProducts=Tots els productes i serveis
 ChooseProduct/Service=Tria el producte o servei
 ForceBuyingPriceIfNull=Forçar preu de cost/compra al preu de venda si no s'ha definit
-ForceBuyingPriceIfNullDetails=Si no es proporciona el preu de compra / cost quan afegim una nova línia i aquesta opció està "ACTIVADA", el marge serà 0%% a la nova línia (preu de compra / cost = preu de venda). Si aquesta opció està "DESACTIVADA" (recomanat), el marge serà igual al valor suggerit per defecte (i pot ser 100%% si no es pot trobar cap valor per defecte).
+ForceBuyingPriceIfNullDetails=Si el preu de compra/cost no es proporciona quan afegim una línia nova i aquesta opció està «ACTIVADA», el marge serà 0%% a la línia nova (preu de compra/cost = preu de venda). Si aquesta opció està «DESACTIVADA» (recomanat), el marge serà igual al valor suggerit per defecte (i pot ser 100%% si no es troba cap valor per defecte).
 MARGIN_METHODE_FOR_DISCOUNT=Mètode de gestió de descomptes globals
 UseDiscountAsProduct=Com un producte
 UseDiscountAsService=Com un servei
@@ -30,16 +31,16 @@ UseDiscountOnTotal=Sobre el total
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Indica si un descompte global es pren en compte com un producte, servei o només en el total a l'hora de calcular els marges.
 MARGIN_TYPE=Preu de cost suggerit per defecte pel càlcul de marge
 MargeType1=Marge en el millor preu de proveïdor
-MargeType2=Marge en Preu mitjà ponderat (PMP)
+MargeType2=Marge sobre el Preu Mitjà Ponderat (PMP)
 MargeType3=Marge en preu de cost
-MarginTypeDesc=* Marge en el millor preu de compra = Preu de venda: el preu del millor proveïdor es defineix a la targeta de producte. <br>* Marge en el preu mitjà ponderat (WAP) = preu de venda: el preu mitjà ponderat del producte (WAP) o el millor preu del proveïdor si WAP encara no està definit <br> * Marge sobre el preu de cost = Preu de venda: preu de cost definit a la targeta de producte o WAP si el preu de cost no està definit o el millor preu del proveïdor si WAP encara no està definit
-CostPrice=Preu de compra
+MarginTypeDesc=* Marge del millor preu de compra = Preu de venda - Millor preu de proveïdor definit a la fitxa del producte<br>* Marge del Preu Mitjà Ponderat (PMP) = Preu de venda - Preu Mitjà Ponderat del producte (PMP) o el millor preu de proveïdor si encara no s'ha definit el PMP<br>* Marge a Preu de cost = Preu de venda - Preu de cost definit a la fitxa del producte o PMP si el preu de cost no està definit, o el millor preu de proveïdor si encara no s'ha definit el PMP
+CostPrice=Preu de cost
 UnitCharges=Càrrega unitària
-Charges=Càrreges
+Charges=Càrrecs
 AgentContactType=Tipus de contacte comissionat
 AgentContactTypeDetails=Definiu quin tipus de contacte (enllaçat en factures) que s’utilitzarà per a l’informe del marge per contacte / adreça. Tingueu en compte que la lectura d’estadístiques d’un contacte no és fiable, ja que en la majoria dels casos es pot no definir explícitament el contacte a les factures.
 rateMustBeNumeric=El marge ha de ser un valor numèric
-markRateShouldBeLesserThan100=El marge té que ser menor que 100
-ShowMarginInfos=Mostrar info de marges
+markRateShouldBeLesserThan100=El marge ha de ser inferior a 100
+ShowMarginInfos=Mostra informació de marge
 CheckMargins=Detall de marges
 MarginPerSaleRepresentativeWarning=L'informe de marge per usuari utilitza l'enllaç entre tercers i representants de vendes per a calcular el marge de cada representant de venda. Com que és possible que algunes terceres parts no tinguin cap representant de venda dedicat i que hi hagi tercers que estiguin vinculats a diversos, és possible que algunes quantitats no s'incloguin a aquest informe (si no hi ha cap representant de vendes) i que algunes puguin aparèixer en línies diferents (per a cada representant de venda) .
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 0ab882c079a..8f80415fe12 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -4,6 +4,8 @@ MemberCard=Fitxa de soci
 SubscriptionCard=Fitxa cotització
 Member=Soci
 Members=Socis
+NoRecordedMembers=No hi ha socis registrats
+NoRecordedMembersByType=No hi ha socis registrats
 ShowMember=Mostra la fitxa de soci
 UserNotLinkedToMember=Usuari no enllaçat a un soci
 ThirdpartyNotLinkedToMember=Tercer no vinculat a un membre
@@ -36,7 +38,7 @@ DateEndSubscription=Data de finalització de la subscripció
 EndSubscription=Fi de la pertinença
 SubscriptionId=Identificador de contribució
 WithoutSubscription=Sense pertinença
-WaitingSubscription=Membership pending
+WaitingSubscription=Renovació pendent
 MemberId=Identificador de membre
 MemberRef=Membre Ref
 NewMember=Soci nou
@@ -74,19 +76,19 @@ MemberTypeCanNotBeDeleted=El tipus de soci no es pot eliminar
 NewSubscription=Aportació nova
 NewSubscriptionDesc=Aquest formulari us permet registrar la vostra afiliació com a soci nou de l'entitat. Si voleu renovar l'afiliació (si ja sou soci), poseu-vos en contacte amb el gestor de l'entitat per correu electrònic %s.
 Subscription=Contribució
-AnyAmountWithAdvisedAmount=Any amount of your choice, recommended %s
-AnyAmountWithoutAdvisedAmount=Any amount of your choice
+AnyAmountWithAdvisedAmount=Qualsevol quantitat que escolliu, recomanada %s
+AnyAmountWithoutAdvisedAmount=Qualsevol quantitat que escolliu
 CanEditAmountShort=Qualsevol import
 CanEditAmountShortForValues=recomanat, qualsevol import
 MembershipDuration=Duració
-GetMembershipButtonLabel=Join
+GetMembershipButtonLabel=Uneix-te
 Subscriptions=Aportacions
 SubscriptionLate=En retard
 SubscriptionNotReceived=No s’ha rebut cap contribució
 ListOfSubscriptions=Llista de contribucions
 SendCardByMail=Enviar una targeta per correu electrònic
 AddMember=Crea soci
-NoTypeDefinedGoToSetup=No s'ha definit cap tipus de soci. Aneu al menú "Tipus de socis"
+NoTypeDefinedGoToSetup=No s'ha definit cap mena de soci. Aneu al menú «Tipus de socis»
 NewMemberType=Tipus de soci nou
 WelcomeEMail=Correu electrònic de benvinguda
 SubscriptionRequired=Cal aportació
@@ -117,7 +119,7 @@ ForceMemberType=Força el tipus de soci
 ExportDataset_member_1=Membres i contribucions
 ImportDataset_member_1=Socis
 LastMembersModified=Últims %s socis modificats
-LastSubscriptionsModified=Últimes contribucions modificades %s
+LastSubscriptionsModified=Últimes %s contribucions modificades
 String=Cadena
 Text=Text llarg
 Int=Enter
@@ -178,8 +180,8 @@ DocForAllMembersCards=Generació de targetes per a tots els socis
 DocForOneMemberCards=Generació de targetes per a un soci en particular
 DocForLabels=Generació d'etiquetes d'adreces (Format de plantilla configurat actualment: <b>%s</b>)
 SubscriptionPayment=Pagament de la contribució
-LastSubscriptionDate=Data del darrer pagament de la contribució
-LastSubscriptionAmount=Import de la darrera contribució
+LastSubscriptionDate=Data de l'últim pagament de contribució
+LastSubscriptionAmount=Import de l'última aportació
 LastMemberType=Darrer tipus de soci
 MembersStatisticsByCountries=Estadístiques de socis per país
 MembersStatisticsByState=Estadístiques de socis per província
@@ -195,8 +197,8 @@ MembersByNature=Aquesta pantalla us mostra estadístiques dels membres per natur
 MembersByRegion=Aquesta pantalla us mostra les estadístiques dels membres per regió.
 MembersStatisticsDesc=Tria les estadístiques que vols consultar...
 MenuMembersStats=Estadístiques
-LastMemberDate=Darrera data de subscripció
-LatestSubscriptionDate=Darrera data de contribució
+LastMemberDate=Última data d'adhesió
+LatestSubscriptionDate=Última data de contribució
 MemberNature=Naturalesa del membre
 MembersNature=Naturalesa dels membres
 Public=La informació és pública
@@ -206,7 +208,7 @@ SubscriptionsStatistics=Estadístiques de contribucions
 NbOfSubscriptions=Nombre de contribucions
 AmountOfSubscriptions=Import recaptat de les contribucions
 TurnoverOrBudget=Volum de vendes (empresa) o Pressupost (associació o col.lectiu)
-DefaultAmount=Import per defecte de la contribució (només s'utilitza si no es defineix cap import a nivell de tipus de soci)
+DefaultAmount=Import per defecte de la contribució (només s'utilitza si no es defineix cap import en l'àmbit tipus de soci)
 MinimumAmount=Import mínim (només s'utilitza quan l'import de la contribució és gratuït)
 CanEditAmount=L'import de la subscripció és gratuït
 CanEditAmountDetail=El visitant pot triar/editar la quantitat de la seva contribució independentment del tipus de soci
@@ -233,3 +235,4 @@ CreateDolibarrThirdPartyDesc=Un tercer és l'entitat jurídica que s'utilitzarà
 MemberFirstname=Nom del membre
 MemberLastname=Cognom del membre
 MemberCodeDesc=Codi de soci, únic per a tots els socis
+NoRecordedMembers=No hi ha socis registrats
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 362e623b434..cde13c6a1c0 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -18,7 +18,7 @@ ModuleInitialized=Mòdul inicialitzat
 FilesForObjectInitialized=S'han inicialitzat els fitxers per al objecte nou '%s'
 FilesForObjectUpdated=Fitxers de l'objecte '%s' actualitzat (fitxers .sql i fitxer .class.php)
 ModuleBuilderDescdescription=Introduïu aquí tota la informació general que descrigui el vostre mòdul.
-ModuleBuilderDescspecifications=Podeu introduir aquí una descripció detallada de les especificacions del mòdul que encara no està estructurada en altres pestanyes. Així que teniu a la vostra disposició totes les normes que es desenvolupin. També aquest contingut de text s'inclourà a la documentació generada (veure l'última pestanya). Podeu utilitzar el format de Markdown, però es recomana utilitzar el format Asciidoc (comparació entre .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescspecifications=Podeu introduir aquí una descripció detallada de les especificacions del vostre mòdul que encara no està estructurada en altres pestanyes. Així que tens a l'abast de totes les regles a desenvolupar. També aquest contingut de text s'inclourà a la documentació generada (vegeu l'última pestanya). Podeu utilitzar el format Markdown, però es recomana utilitzar el format Asciidoc (comparació entre .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
 ModuleBuilderDescobjects=Definiu aquí els objectes que voleu gestionar amb el vostre mòdul. Es generarà una classe CRUD DAO, fitxers SQL, una pàgina per a llistar el registre d'objectes, per a crear/editar/visualitzar un registre i una API.
 ModuleBuilderDescmenus=Aquesta pestanya està dedicada a definir les entrades de menú proporcionades pel teu mòdul.
 ModuleBuilderDescpermissions=Aquesta pestanya està dedicada a definir els permisos nous que voleu proporcionar amb el vostre mòdul.
@@ -30,7 +30,7 @@ EnterNameOfModuleToDeleteDesc=Podeu suprimir el vostre mòdul. AVÍS: se suprimi
 EnterNameOfObjectToDeleteDesc=Podeu suprimir un objecte. AVÍS: Tots els fitxers de codificació (generats o creats manualment) relacionats amb l'objecte s'eliminaran.
 DangerZone=Zona perillosa
 BuildPackage=Construeix el paquet
-BuildPackageDesc=Podeu generar un paquet zip de la vostra aplicació de manera que estigueu a punt per distribuir-lo a qualsevol Dolibarr. També podeu distribuir-lo o vendre-lo al mercat com <a href="https://www.dolistore.com">DoliStore.com</a> .
+BuildPackageDesc=Pots generar un paquet zip de la teva aplicació perquè puguis distribuir-lo a qualsevol Dolibarr. També podeu distribuir-lo o vendre'l a <a href="https://www.dolistore.com">DoliStore.com</a>.
 BuildDocumentation=Construeix documentació
 ModuleIsNotActive=Aquest mòdul encara no està activat. Aneu a %s per a publicar-lo o feu clic aquí
 ModuleIsLive=Aquest mòdul ha estat activat. Qualsevol canvi pot trencar la funció actual en viu.
@@ -46,7 +46,7 @@ PageForAgendaTab=Pàgina de PHP per a la pestanya d'esdeveniments
 PageForDocumentTab=Pàgina de PHP per a la pestanya de documents
 PageForNoteTab=Pàgina de PHP per a la pestanya de notes
 PageForContactTab=Pàgina PHP per a la pestanya de contacte
-PathToModulePackage=Ruta al zip del paquet del mòdul/aplicació
+PathToModulePackage=Camí al zip del paquet del mòdul/aplicació
 PathToModuleDocumentation=Camí al fitxer de la documentació del mòdul / aplicació (%s)
 SpaceOrSpecialCharAreNotAllowed=Els espais o caràcters especials no estan permesos.
 FileNotYetGenerated=El fitxer encara no s'ha generat
@@ -92,9 +92,9 @@ ListOfDictionariesEntries=Llista d'entrades de diccionaris
 ListOfPermissionsDefined=Llista de permisos definits
 SeeExamples=Mira exemples aquí
 EnabledDesc=Condició per tenir aquest camp actiu. <br> <br> Exemples: <br> 1 <br> isModEnabled('MAIN_MODULE_MYMODULE') a0342fccfda19bzLE_Get ='GCCFda19bz0'
-VisibleDesc=Is the field visible ? (Examples: 0=Never visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create), 5=Visible on list end view form only (not create, not update).<br><br>Using a negative value means field is not shown by default on list but can be selected for viewing).
-ItCanBeAnExpression=It can be an expression. Example:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRight('holiday', 'define_holiday')?1:5
-DisplayOnPdfDesc=Display this field on compatible PDF documents, you can manage position with "Position" field.<br><strong>For document :</strong><br>0 = not displayed <br>1 = display<br>2 = display only if not empty<br><br><strong>For document lines :</strong><br>0 = not displayed <br>1 = displayed in a column<br>3 = display in line description column after the description<br>4 = display in description column after the description only if not empty
+VisibleDesc=El camp és visible? (Exemples: 0=Mai visible, 1=Visible a la llista i formularis de creació/actualització/visualització, 2=Visible només a la llista, 3=Visible només al formulari de creació/actualització/visualització (no a la llista), 4=Visible a la llista i actualització/visualització només del formulari (no crear), 5=Visible només al formulari de visualització final de la llista (no crear, no actualitzar). <br><br> L'ús d'un valor negatiu significa que el camp no es mostra per defecte a la llista, però es pot seleccionar per a veure'l).
+ItCanBeAnExpression=Pot ser una expressió. Exemple:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>$user->hasRight('holiday', 'define_holiday')?1:5
+DisplayOnPdfDesc=Mostra aquest camp en documents PDF compatibles, pots gestionar la posició amb el camp «Posició».<br><strong>Per document:</strong><br>0 = no es mostra<br>1 = es mostra<br>2 = es mostra només si no està buit<br><br><strong>Per linies de document:</strong><br>0 = no es mostra<br>1 = es mostra en una columna<br>3 = es mostra en la línia de la columna de descripció després de la descripció<br>4 = es mostra a la columna de descripció després de la descripció només si no està buida
 DisplayOnPdf=En PDF
 IsAMeasureDesc=Es pot acumular el valor del camp per a obtenir un total a la llista? (Exemples: 1 o 0)
 SearchAllDesc=El camp utilitzat per realitzar una cerca des de l'eina de cerca ràpida? (Exemples: 1 o 0)
@@ -136,9 +136,9 @@ UseSpecificEditorURL = Utilitzeu editor específic URL
 UseSpecificFamily = Utilitzeu una família específica
 UseSpecificAuthor = Utilitzeu un autor específic
 UseSpecificVersion = Utilitzeu una versió inicial específica
-IncludeRefGeneration=The reference of this object must be generated automatically by custom numbering rules
+IncludeRefGeneration=La referència d'aquest objecte s'ha de generar automàticament mitjançant regles de numeració personalitzades
 IncludeRefGenerationHelp=Marqueu-ho si voleu incloure codi per gestionar automàticament la generació de la referència mitjançant regles de numeració personalitzades
-IncludeDocGeneration=I want the feature to generate some documents (PDF, ODT) from templates for this object
+IncludeDocGeneration=Vull que la funció generi alguns documents (PDF, ODT) a partir de plantilles per a aquest objecte
 IncludeDocGenerationHelp=Si ho marques, es generarà el codi per a afegir una casella "Generar document" al registre.
 ShowOnCombobox=Mostra el valor en quadres combinats
 KeyForTooltip=Clau per donar més informació
@@ -147,24 +147,24 @@ CSSViewClass=CSS per al formulari de lectura
 CSSListClass=CSS per a llistats
 NotEditable=No editable
 ForeignKey=Clau forana
-ForeignKeyDesc=If the value of this field must be guaranted to exists into another table. Enter here a value matching syntax: tablename.parentfieldtocheck
-TypeOfFieldsHelp=Example:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br>'1' means we add a + button after the combo to create the record<br>'filter' is a sql condition, example: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
-TypeOfFieldsHelpIntro=This is the type of the field/attribute.
+ForeignKeyDesc=Si el valor d'aquest camp s'ha de garantir que existeix en una altra taula. Introduïu aquí un valor que coincideixi amb la sintaxi: tablename.parentfieldtocheck
+TypeOfFieldsHelp=Exemple:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br>'1' significa que afegim un botó + després de la combinació per a crear el registre<br>«filter» és una condició sql, exemple: «status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)»
+TypeOfFieldsHelpIntro=Aquest és el tipus de camp/atribut.
 AsciiToHtmlConverter=Convertidor Ascii a HTML
 AsciiToPdfConverter=Convertidor Ascii a PDF
 TableNotEmptyDropCanceled=La taula no està buida. S'ha cancel·lat l'eliminació.
 ModuleBuilderNotAllowed=El creador de mòduls està disponible però no permès al vostre usuari.
 ImportExportProfiles=Importar i exportar perfils
-ValidateModBuilderDesc=Set this to 1 if you want to have the method $this->validateField() of object being called to validate the content of the field during insert or update. Set 0 if there is no validation required.
+ValidateModBuilderDesc=Establiu-ho a 1 si voleu que es cridi el mètode $this->validateField() de l'objecte per va alidar el contingut del camp durant la inserció o l'actualització. Establiu-ho a 0 si no es requereix validació.
 WarningDatabaseIsNotUpdated=Avís: la base de dades no s'actualitza automàticament, heu de destruir les taules i desactivar-habilitar el mòdul perquè es tornin a crear taules.
 LinkToParentMenu=Menú principal (fk_xxxxmenu)
 ListOfTabsEntries=Llista d'entrades de pestanyes
 TabsDefDesc=Definiu aquí les pestanyes proporcionades pel vostre mòdul
 TabsDefDescTooltip=Les pestanyes proporcionades pel vostre mòdul/aplicació es defineixen a la matriu <strong> $this->tabs </strong> al fitxer descriptor del mòdul. Podeu editar manualment aquest fitxer o utilitzar l'editor incrustat.
 BadValueForType=Valor incorrecte per al tipus %s
-DefinePropertiesFromExistingTable=Define properties from an existing table
-DefinePropertiesFromExistingTableDesc=If a table in the database (for the object to create) already exists, you can use it to define the properties of the object.
-DefinePropertiesFromExistingTableDesc2=Keep empty if the table does not exist yet. The code generator will use different kinds of fields to build an example of table that you can edit later.
+DefinePropertiesFromExistingTable=Definiu propietats a partir d'una taula existent
+DefinePropertiesFromExistingTableDesc=Si ja existeix una taula a la base de dades (per a que l'objecte es creï), podeu utilitzar-la per a definir les propietats de l'objecte.
+DefinePropertiesFromExistingTableDesc2=Manteniu-lo buit si la taula encara no existeix. El generador de codi utilitzarà diferents tipus de camps per a crear un exemple de taula que podeu editar més tard.
 GeneratePermissions=Vull afegir els permisos d'aquest objecte
 GeneratePermissionsHelp=generar permisos per defecte per a aquest objecte
 PermissionDeletedSuccesfuly=El permís s'ha eliminat correctament
diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang
index 20e66cf2b42..e1a7ad8c7b2 100644
--- a/htdocs/langs/ca_ES/mrp.lang
+++ b/htdocs/langs/ca_ES/mrp.lang
@@ -83,7 +83,7 @@ ProductsToProduce=Productes a produir
 UnitCost=Cost unitari
 TotalCost=Cost total
 BOMTotalCost=El cost de produir aquesta Llista de materials en funció del cost de cada quantitat i producte a consumir (utilitza el preu de cost si està definit, altrament el preu mitjà ponderat si està definit, altrament el millor preu de compra)
-BOMTotalCostService=If the "Workstation" module is activated and a workstation is defined by default on the line, then the calculation is "quantity (converted into hours) x workstation ahr", otherwise "quantity (converted into hours) x cost price of the service"
+BOMTotalCostService=Si el mòdul «Estació de treball» està activat i una estació de treball està definida per defecte a la línia, el càlcul és «quantitat (convertida en hores) x ahr de l'estació de treball», en cas contrari «quantitat (convertida en hores) x preu de cost del servei»
 GoOnTabProductionToProduceFirst=Per a tancar una Ordre de fabricació primer heu d'iniciar la producció (vegeu la pestanya «%s»). Però podeu cancel·lar-la.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit no es pot utilitzar en una llista de material o en una OF
 Workstation=Estació de treball
@@ -109,13 +109,16 @@ HumanMachine=Humà / Màquina
 WorkstationArea=Zona d’estació de treball
 Machines=Màquines
 THMEstimatedHelp=Aquesta taxa permet definir un cost previst de l'article
-BOM=Factura de materials
+BOM=Llista de materials
 CollapseBOMHelp=Podeu definir la visualització per defecte dels detalls de la nomenclatura a la configuració del mòdul BOM
 MOAndLines=Comandes i línies de fabricació
 MoChildGenerate=Genera Child Mo
 ParentMo=MO Pare
 MOChild=MO Nen
 BomCantAddChildBom=La nomenclatura %s ja està present a l'arbre que porta a la nomenclatura %s
-BOMNetNeeds = Necessitats netes en BOM
+BOMNetNeeds = Necessitats netes
 BOMProductsList=Productes de BOM
 BOMServicesList=Serveis de BOM
+Manufacturing=Fabricació
+Disassemble=Desmuntar
+ProducedBy=Produït per
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 94002f6a891..744d5d8bf79 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -85,8 +85,8 @@ OrdersOpened=Comandes a processar
 NoDraftOrders=Sense comandes esborrany
 NoOrder=Sense comanda
 NoSupplierOrder=Sense comanda de compra
-LastOrders=Últimes %scomandes de vendes  
-LastCustomerOrders=Últimes %scomandes de vendes  
+LastOrders=Últimes %s comandes de vendes  
+LastCustomerOrders=Últimes %s comandes de vendes  
 LastSupplierOrders=Últimes %s comandes de compra 
 LastModifiedOrders=Últimes %s comandes modificades
 AllOrders=Totes les comandes
@@ -108,9 +108,9 @@ ConfirmUnvalidateOrder=Vols restaurar la comanda <b>%s</b> a l'estat esborrany?
 ConfirmCancelOrder=Vols anul·lar aquesta comanda?
 ConfirmMakeOrder=Vols confirmar la creació d'aquesta comanda a data de <b>%s</b>?
 GenerateBill=Facturar
-ClassifyShipped=Classifica enviat
+ClassifyShipped=Marca lliurat
 PassedInShippedStatus=classificat lliurat
-YouCantShipThis=Això no ho puc classificar. Si us plau, comproveu els permisos dels usuaris
+YouCantShipThis=Això no ho puc classificar. Comproveu els permisos dels usuaris
 DraftOrders=Esborranys de comandes
 DraftSuppliersOrders=Esborrany de comandes de compra
 OnProcessOrders=Comandes en procés
@@ -165,7 +165,7 @@ CreateInvoiceForThisCustomer=Facturar comandes
 CreateInvoiceForThisSupplier=Facturar comandes
 CreateInvoiceForThisReceptions=Recepcions de factures
 NoOrdersToInvoice=Sense comandes facturables
-CloseProcessedOrdersAutomatically=Classifica com a "Processades" totes les comandes seleccionades.
+CloseProcessedOrdersAutomatically=Marca com a «Processades» totes les comandes seleccionades.
 OrderCreation=Creació comanda
 Ordered=Comandat
 OrderCreated=Les vostres comandes s'han creat
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 2ee4d2f4be1..5e08f5f3ab7 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -34,7 +34,7 @@ GraphInBarsAreLimitedToNMeasures=Els gràfics es limiten a  %s mesures en mode "
 OnlyOneFieldForXAxisIsPossible=Actualment, només és possible 1 camp com a eix X. Només s'ha seleccionat el primer camp seleccionat.
 AtLeastOneMeasureIsRequired=Almenys 1 camp per a la mesura és obligatori
 AtLeastOneXAxisIsRequired=Almenys 1 camp per a l'Eix X és obligatori
-LatestBlogPosts=Darreres publicacions al bloc
+LatestBlogPosts=Últimes publicacions del blog
 notiftouser=A usuaris
 notiftofixedemail=Al correu fix
 notiftouserandtofixedemail=A l'usuari i correu fix
@@ -81,7 +81,7 @@ Notify_TASK_MODIFY=Tasca modificada
 Notify_TASK_DELETE=Tasca eliminada
 Notify_EXPENSE_REPORT_VALIDATE=Informe de despeses validat (cal aprovar)
 Notify_EXPENSE_REPORT_APPROVE=Informe de despeses aprovat
-Notify_HOLIDAY_VALIDATE=Sol·licitud de sol licitud validada (cal aprovar)
+Notify_HOLIDAY_VALIDATE=Sol·licitud de dies lliures validada (cal aprovació)
 Notify_HOLIDAY_APPROVE=Sol·licitud de permís aprovada
 Notify_ACTION_CREATE=S'ha afegit l'acció a l'Agenda
 SeeModuleSetup=Vegi la configuració del mòdul %s
@@ -213,9 +213,9 @@ EMailTextInvoiceValidated=La factura %s ha estat validada.
 EMailTextInvoicePayed=S'ha pagat la factura %s.
 EMailTextProposalValidated=S'ha validat la proposta %s.
 EMailTextProposalClosedSigned=La proposta %s s'ha tancat amb la signatura.
-EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal page.
-EMailTextProposalClosedRefused=Proposal %s has been closed refused.
-EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
+EMailTextProposalClosedSignedWeb=La proposta %s s'ha tancat signada a la pàgina del portal.
+EMailTextProposalClosedRefused=La proposta %s ha estat tancada i rebutjada.
+EMailTextProposalClosedRefusedWeb=La proposta %s s'ha tancat a la pàgina del portal.
 EMailTextOrderValidated=S'ha validat l'ordre %s.
 EMailTextOrderApproved=S'ha aprovat l'ordre %s.
 EMailTextOrderValidatedBy=L'ordre %s ha estat registrada per %s.
@@ -225,8 +225,8 @@ EMailTextOrderRefusedBy=L'ordre %s ha estat rebutjat per %s.
 EMailTextExpeditionValidated=S'ha validat l'enviament %s.
 EMailTextExpenseReportValidated=L'informe de despeses %s ha estat validat.
 EMailTextExpenseReportApproved=S'ha aprovat l'informe de despeses %s.
-EMailTextHolidayValidated=S'ha validat la sol licitud %s.
-EMailTextHolidayApproved=S'ha aprovat la sol licitud %s.
+EMailTextHolidayValidated=La sol·licitud de dies lliures %s s'ha validat.
+EMailTextHolidayApproved=La sol·licitud de dies lliures %s s'ha aprovat.
 EMailTextActionAdded=L'acció %s s'ha afegit a l'agenda.
 ImportedWithSet=Lot d'importació (import key)
 DolibarrNotification=Notificació automàtica
@@ -244,7 +244,7 @@ UseAdvancedPerms=Usar els drets avançats en els permisos dels mòduls
 FileFormat=Format d'arxiu
 SelectAColor=Tria un color
 AddFiles=Afegeix arxius
-StartUpload=Transferir
+StartUpload=Inicia la càrrega
 CancelUpload=Cancel·lar transferència
 FileIsTooBig=L'arxiu és massa gran
 PleaseBePatient=Si us plau sigui pacient...
@@ -257,7 +257,7 @@ ClickHereToGoTo=Clica aquí per anar a %s
 YouMustClickToChange=De totes formes, primer heu de fer clic al següent enllaç per a validar aquest canvi de contrasenya
 ConfirmPasswordChange=Confirmeu el canvi de contrasenya
 ForgetIfNothing=Si vostè no ha sol·licitat aquest canvi, simplement ignori aquest e-mail. Les seves credencials són guardades de forma segura
-IfAmountHigherThan=si l'import es major que <strong>%s</strong>
+IfAmountHigherThan=Si l'import és superior a <strong>%s</strong>
 SourcesRepository=Repositori de fonts
 Chart=Gràfic
 PassEncoding=Codificació de contrasenya
@@ -293,7 +293,7 @@ WEBSITE_PAGEURL=URL de pàgina
 WEBSITE_TITLE=Títol
 WEBSITE_DESCRIPTION=Descripció
 WEBSITE_IMAGE=Imatge
-WEBSITE_IMAGEDesc=Ruta relativa dels suports d’imatge. Podeu mantenir-la buida, ja que rarament es fa servir (pot ser utilitzada per contingut dinàmic per a mostrar una miniatura a la llista de publicacions del bloc). Utilitzeu __WEBSITE_KEY__ a la ruta si aquesta depèn del nom del lloc web (per exemple: image/__ WEBSITE_KEY __ /stories/lamevaimatge.png).
+WEBSITE_IMAGEDesc=Camí relatiu del suport d'imatge. Podeu mantenir-lo buit, ja que s'utilitza rarament (pot ser utilitzat per contingut dinàmic per a mostrar una miniatura en una llista d'entrades del bloc). Utilitzeu __WEBSITE_KEY__ al camí si el camí depèn del nom del lloc web (per exemple: image/__WEBSITE_KEY__/stories/lamevaimatge.png).
 WEBSITE_KEYWORDS=Paraules clau
 LinesToImport=Línies per importar
 
@@ -306,7 +306,7 @@ ProductStatistics=Productes / Serveis Estadístiques
 NbOfQtyInOrders=Quantitat en comandes
 SelectTheTypeOfObjectToAnalyze=Seleccioneu un objecte per a veure'n les estadístiques...
 
-ConfirmBtnCommonContent = Esteu segur que voleu "%s"?
+ConfirmBtnCommonContent = Esteu segur que voleu «%s»?
 ConfirmBtnCommonTitle = Confirmeu la vostra acció
 CloseDialog = Tancar
 Autofill = Emplenament automàtic
diff --git a/htdocs/langs/ca_ES/partnership.lang b/htdocs/langs/ca_ES/partnership.lang
index a88b18b8b4d..29182a4d6dd 100644
--- a/htdocs/langs/ca_ES/partnership.lang
+++ b/htdocs/langs/ca_ES/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Associació: consulteu l'enllaç de retrocés de refer
 # Menu
 #
 NewPartnership=Nova associació
-NewPartnershipbyWeb= La vostra associació s'ha afegit correctament.
+NewPartnershipbyWeb=La vostra sol·licitud d'associació s'ha afegit correctament. Ens posarem en contacte amb tu aviat...
 ListOfPartnerships=Llista d'associació
 
 #
@@ -38,7 +38,7 @@ ListOfPartnerships=Llista d'associació
 PartnershipSetup=Configuració de l'associació
 PartnershipAbout=Quant a Partnership
 PartnershipAboutPage=Associació sobre la pàgina
-partnershipforthirdpartyormember=L'estat de soci s'ha de definir en un "tercer" o un "membre".
+partnershipforthirdpartyormember=L'estatus de soci s'ha de definir com a «tercer» o «soci»
 PARTNERSHIP_IS_MANAGED_FOR=Associació gestionada per
 PARTNERSHIP_BACKLINKS_TO_CHECK=Retroenllaços per a comprovar
 PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb de dies abans de cancel·lar l'estat d'una associació quan la subscripció ha caducat
@@ -52,7 +52,7 @@ PublicFormRegistrationPartnerDesc=Dolibarr us pot proporcionar un URL/lloc web p
 DeletePartnership=Suprimiu una associació
 PartnershipDedicatedToThisThirdParty=Associació dedicada a aquest tercer
 PartnershipDedicatedToThisMember=Associació dedicada a aquest membre
-DatePartnershipStart=Data inicial
+DatePartnershipStart=Data d'inici
 DatePartnershipEnd=Data final
 ReasonDecline=Rebutjar la raó
 ReasonDeclineOrCancel=Rebutjar la raó
@@ -92,5 +92,5 @@ LastCheckBacklink=Data de l'última comprovació de l'URL
 ReasonDeclineOrCancel=Rebutjar la raó
 
 NewPartnershipRequest=Nova sol·licitud de col·laboració
-NewPartnershipRequestDesc=Aquest formulari us permet sol·licitar formar part d'un dels nostres programes d'associació. Si necessiteu ajuda per omplir aquest formulari, poseu-vos en contacte amb el correu electrònic <b> %s </b>.
+NewPartnershipRequestDesc=Aquest formulari us permet sol·licitar formar part d'un dels nostres programes d'associació. Si necessiteu ajuda per a omplir aquest formulari, poseu-vos en contacte amb el correu electrònic <b>%s</b>.
 
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index f599efead62..928872a1a96 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Ref. producte
 ProductLabel=Nom del producte
-ProductLabelTranslated=Nom de producte traduïda
+ProductLabelTranslated=Nom del producte traduït
 ProductDescription=Descripció del producte
-ProductDescriptionTranslated=Descripció de producte traduïda
+ProductDescriptionTranslated=Descripció del producte traduït
 ProductNoteTranslated=Nota de producte traduïda
 ProductServiceCard=Fitxa producte/servei
 TMenuProducts=Productes
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Serveis només en venda
 ServicesOnPurchaseOnly=Serveis només per compra
 ServicesNotOnSell=Serveis no a la venda i no per a la compra
 ServicesOnSellAndOnBuy=Serveis en venda o de compra
-LastModifiedProductsAndServices=Últims productes / serveis %s que es van modificar
+LastModifiedProductsAndServices=Últims %s productes/serveis que s'han modificat
 LastRecordedProducts=Últims %s productes registrats
 LastRecordedServices=Últims %s serveis registrats
 CardProduct0=Producte
@@ -127,7 +127,7 @@ ProductParentList=Llista de kits amb aquest producte com a component
 ErrorAssociationIsFatherOfThis=Un dels productes seleccionats és pare del producte en curs
 DeleteProduct=Eliminar un producte/servei
 ConfirmDeleteProduct=Esteu segur de voler eliminar aquest producte/servei?
-ProductDeleted=El producte/servei "%s" s'ha eliminat de la base de dades.
+ProductDeleted=El producte/servei «%s» s'ha eliminat de la base de dades.
 ExportDataset_produit_1=Productes
 ExportDataset_service_1=Serveis
 ImportDataset_produit_1=Productes
@@ -146,10 +146,10 @@ NoSupplierPriceDefinedForThisProduct=No hi ha cap preu / quantitat de proveïdor
 PredefinedItem=Element predefinit
 PredefinedProductsToSell=Producte predefinit
 PredefinedServicesToSell=Servei predefinit
-PredefinedProductsAndServicesToSell=Productes/serveis predefinits per vendre
-PredefinedProductsToPurchase=Producte predefinit per comprar
-PredefinedServicesToPurchase=Serveis predefinits per comprar
-PredefinedProductsAndServicesToPurchase=Productes / serveis predefinits per comprar
+PredefinedProductsAndServicesToSell=Productes/serveis predefinits a vendre
+PredefinedProductsToPurchase=Producte predefinit per a comprar
+PredefinedServicesToPurchase=Serveis predefinits per a comprar
+PredefinedProductsAndServicesToPurchase=Productes/serveis predefinits per a comprar
 NotPredefinedProducts=Sense productes/serveis predefinits
 GenerateThumb=Generar l'etiqueta
 ServiceNb=Servei núm. %s
@@ -258,10 +258,10 @@ ProductsMultiPrice=Productes i preus per cada nivell de preu
 ProductsOrServiceMultiPrice=Preus per als clients (de productes o serveis, multipreus)
 ProductSellByQuarterHT=Facturació de productes trimestral abans d'impostos
 ServiceSellByQuarterHT=Facturació de serveis trimestral abans d'impostos
-Quarter1=1º trimestre
-Quarter2=2º trimestre
-Quarter3=3º trimestre
-Quarter4=4º trimestre
+Quarter1=1r trimestre
+Quarter2=2n trimestre
+Quarter3=3r trimestre
+Quarter4=4t trimestre
 BarCodePrintsheet=Imprimeix codis de barres
 PageToGenerateBarCodeSheets=Amb aquesta eina, podeu imprimir fulls adhesius de codis de barres. Trieu el format de la vostra pàgina d'etiqueta, tipus de codi de barres i valor del codi de barres, i feu clic al botó <b> %s </b>.
 NumberOfStickers=Nombre d'adhesius per a imprimir a la pàgina
@@ -304,7 +304,7 @@ DynamicPriceDesc=Podeu definir fórmules matemàtiques per a calcular els preus
 AddVariable=Afegeix variable
 AddUpdater=Afegeix actualitzador
 GlobalVariables=Variables globals
-VariableToUpdate=Variable per actualitzar
+VariableToUpdate=Variable a actualitzar
 GlobalVariableUpdaters=Actualitzacions externes per a variables
 GlobalVariableUpdaterType0=Dades JSON
 GlobalVariableUpdaterHelp0=Analitza les dades JSON de l'URL especificat, VALUE especifica la ubicació del valor rellevant,
@@ -399,7 +399,7 @@ ActionAvailableOnVariantProductOnly=Acció només disponible sobre la variant de
 ProductsPricePerCustomer=Preus dels productes per clients
 ProductSupplierExtraFields=Atributs addicionals (preus de proveïdors)
 DeleteLinkedProduct=Suprimeix el producte fill enllaçat a la combinació
-AmountUsedToUpdateWAP=Unit amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=Import unitari a utilitzar per a actualitzar el Preu Mitjà Ponderat
 PMPValue=Preu mitjà ponderat
 PMPValueShort=PMP
 mandatoryperiod=Períodes obligatoris
@@ -416,7 +416,7 @@ ProductsMergeSuccess=Els productes s'han fusionat
 ErrorsProductsMerge=Errors en la combinació de productes
 SwitchOnSaleStatus=Canvia l'estat de venda
 SwitchOnPurchaseStatus=Activa l'estat de compra
-UpdatePrice=Increase/decrease customer price
+UpdatePrice=Augmenta/disminueix el preu del client
 StockMouvementExtraFields= Camps addicionals (moviment d'existències)
 InventoryExtraFields= Camps addicionals (inventari)
 ScanOrTypeOrCopyPasteYourBarCodes=Escaneja o escriviu o copieu/enganxeu els vostres codis de barres
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 229e6971e98..b5521f91926 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -65,7 +65,7 @@ TimeToBill=Temps no facturat
 TimeBilled=Temps facturat
 Tasks=Tasques
 Task=Tasca
-TaskDateStart=Data d'inici
+TaskDateStart=Data d'inici de la tasca
 TaskDateEnd=Data de finalització
 TaskDescription=Descripció de tasca
 NewTask=Tasca nova
@@ -242,9 +242,9 @@ OppStatusPENDING=Pendent
 OppStatusWON=Guanyat
 OppStatusLOST=Perdut
 Budget=Pressupost
-AllowToLinkFromOtherCompany=Allow to link an element with a project of other company<br><br><u>Supported values:</u><br>- Keep empty: Can link elements with any projects in the same company (default)<br>- "all": Can link elements with any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link elements with any projects of these third partys (Example: 123,4795,53)<br>
-LatestProjects=Darrers %s projectes 
-LatestModifiedProjects=Darrers %s projectes modificats
+AllowToLinkFromOtherCompany=Permet enllaçar un element amb un projecte d'una altra empresa <br><br><u>Valors admesos: </u><br>- Buit: Pot enllaçar elements amb qualsevol projecte de la mateixa empresa (per defecte)<br>- "all": Pot enllaçar elements amb qualsevol projecte, inclòs projectes d'altres empreses<br> - Una llista d'identificadors de tercers separats per comes: pot enllaçar elements amb qualsevol projecte d'aquests tercers (Exemple: 123,4795,53)<br>
+LatestProjects=Últims %s projectes
+LatestModifiedProjects=Últims %s projectes modificats
 OtherFilteredTasks=Altres tasques filtrades
 NoAssignedTasks=No s'ha trobat cap tasca assignada (assigneu el projecte/tasques a l'usuari actual des del quadre de selecció superior per a introduir-hi l'hora)
 ThirdPartyRequiredToGenerateInvoice=Cal definir un tercer en el projecte per a poder facturar-lo.
@@ -259,7 +259,7 @@ RecordsClosed=%s projecte(s) tancat(s)
 SendProjectRef=Informació del projecte %s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=El mòdul "Salaris" ha d'estar habilitat per a definir la tarifa horària dels empleats per tal de valorar el temps dedicat
 NewTaskRefSuggested=Tasca ref en ús, es requereix una nova tasca ref
-NumberOfTasksCloned=%s task(s) cloned
+NumberOfTasksCloned=%s tasca(s) clonada(s).
 TimeSpentInvoiced=Temps de facturació facturat
 TimeSpentForIntervention=Temps dedicat
 TimeSpentForInvoice=Temps dedicat
@@ -286,11 +286,11 @@ RefTaskParent=Ref. Tasca pare
 ProfitIsCalculatedWith=El benefici es calcula utilitzant
 AddPersonToTask=Afegeix també a les tasques
 UsageOrganizeEvent=Ús: organització d'esdeveniments
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classifica un projecte com a tancat quan s'hagin completat totes les seves tasques (progrés 100%%)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks already set to a progress of 100 %% won't be affected: you will have to close them manually. This option only affects open projects.
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Marca el projecte com a tancat quan s'hagin completat totes les seves tasques (progrés 100%%)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: els projectes existents amb totes les tasques ja configurades amb un progrés de 100%% no es veuran afectats: haureu de tancar-los manualment. Aquesta opció només afecta els projectes oberts.
 SelectLinesOfTimeSpentToInvoice=Seleccioneu les línies de temps invertides que no estiguin facturades i, a continuació, feu l'acció massiva "Genera factura" per a facturar-les.
 ProjectTasksWithoutTimeSpent=Projecte tasques sense temps dedicat
-FormForNewLeadDesc=Gràcies per omplir el següent formulari per contactar amb nosaltres. També podeu enviar-nos un correu electrònic directament a <b> %s </b>.
+FormForNewLeadDesc=Gràcies per a omplir el següent formulari per a contactar amb nosaltres. També podeu enviar-nos un correu electrònic directament a <b>%s</b>.
 ProjectsHavingThisContact=Projectes amb aquest contacte
 StartDateCannotBeAfterEndDate=La data de fi no pot ser anterior a la d'inici
 ErrorPROJECTLEADERRoleMissingRestoreIt=Falta la funció "PROJECTLEADER" o s'ha desactivat; restaura-la al diccionari de tipus de contacte
diff --git a/htdocs/langs/ca_ES/receptions.lang b/htdocs/langs/ca_ES/receptions.lang
index 1ef267132bb..a4063b6c434 100644
--- a/htdocs/langs/ca_ES/receptions.lang
+++ b/htdocs/langs/ca_ES/receptions.lang
@@ -34,7 +34,7 @@ StatusReceptionProcessedShort=Processats
 ReceptionSheet=Full de recepció
 ValidateReception=Valida la recepció
 ConfirmDeleteReception=Vols suprimir aquesta recepció?
-ConfirmValidateReception=Vols validar aquesta recepció amb referència <b> %s </b>?
+ConfirmValidateReception=Esteu segur que voleu validar aquesta recepció amb la referència <b>%s</b>?
 ConfirmCancelReception=Vols cancel·lar aquesta recepció?
 StatsOnReceptionsOnlyValidated=Les estadístiques compten només les recepcions validades. La data utilitzada és la data de validació de la recepció (la data de lliurament planificada no sempre es coneix).
 SendReceptionByEMail=Envia la recepció per correu electrònic
@@ -47,7 +47,7 @@ ProductQtyInSuppliersReceptionAlreadyRecevied=Quantitat de producte des de coman
 ValidateOrderFirstBeforeReception=Primer has de validar la comanda abans de poder fer recepcions.
 ReceptionsNumberingModules=Mòdul de numeració per a recepcions
 ReceptionsReceiptModel=Plantilles de documents per a recepcions
-NoMorePredefinedProductToDispatch=No hi ha més productes predefinits per ser enviats
+NoMorePredefinedProductToDispatch=No hi ha més productes predefinits per a enviar
 ReceptionExist=Hi ha una recepció
 ReceptionBackToDraftInDolibarr=Recepció %s torna a esborrany
 ReceptionClassifyClosedInDolibarr=Recepció %s classificada Tancada
diff --git a/htdocs/langs/ca_ES/resource.lang b/htdocs/langs/ca_ES/resource.lang
index a608f69d929..8738c93e6b0 100644
--- a/htdocs/langs/ca_ES/resource.lang
+++ b/htdocs/langs/ca_ES/resource.lang
@@ -22,7 +22,7 @@ ResourceElementPage=Elements de recursos
 ResourceCreatedWithSuccess=Recurs creat correctament
 RessourceLineSuccessfullyDeleted=Línia de recurs eliminada correctament
 RessourceLineSuccessfullyUpdated=Línia de recurs actualitzada correctament
-ResourceLinkedWithSuccess=Recurs enllaçat correntament
+ResourceLinkedWithSuccess=Recurs vinculat correctament
 
 ConfirmDeleteResource=Estàs segur de voler eliminar aquest element?
 RessourceSuccessfullyDeleted=Recurs eliminat correctament
@@ -35,5 +35,5 @@ AssetNumber=Número de sèrie
 ResourceTypeCode=Codi de tipus de recurs
 ImportDataset_resource_1=Recursos
 
-ErrorResourcesAlreadyInUse=Alguns recursos estan en us
+ErrorResourcesAlreadyInUse=Alguns recursos estan en ús
 ErrorResourceUseInEvent=%s usat en %s esdeveniment
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index 8931092134c..9db1fa15573 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Compte (del pla comptable) utilitzat per defecte per a tercers «usuaris».
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=The dedicated account defined on user card will be used for Subledger accounting only. This one will be used for General Ledger and as default value of Subledger accounting if dedicated user accounting account on user is not defined.
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=El compte dedicat definit a la fitxa d'usuari només s'utilitzarà per a la comptabilitat de subllibre. Aquest s'utilitzarà per al Llibre Major i com a valor predeterminat de la comptabilitat del subllibre si no es defineix un compte comptable d'usuari dedicat a l'usuari.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Compte comptable per defecte per als pagaments salarials
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=De manera predeterminada, deixeu buida l'opció "Crear automàticament un pagament total" quan creeu un sou
 Salary=Sou
@@ -18,7 +18,7 @@ TJM=Tarifa mitjana diària
 CurrentSalary=Salari actual
 THMDescription=Aquest valor es pot utilitzar per a calcular el cost del temps consumit en un projecte introduït pels usuaris si s'utilitza el mòdul de projecte
 TJMDescription=Aquest valor només és informatiu i no s'utilitza en cap càlcul
-LastSalaries=Últims sous %s
+LastSalaries=Últims %s sous
 AllSalaries=Tots els salaris
 SalariesStatistics=Estadístiques de salaris
 SalariesAndPayments=Salaris i pagaments
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 28109142013..03636d18fba 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -109,8 +109,8 @@ WarehousesAndProductsBatchDetail=Magatzems i productes (amb detall per lot/sèri
 AverageUnitPricePMPShort=Preu mitjà ponderat
 AverageUnitPricePMPDesc=El preu unitari mitjà d'entrada que hem hagut de gastar per a incorporar 1 unitat de producte al nostre estoc.
 SellPriceMin=Preu de venda unitari
-EstimatedStockValueSellShort=Valor per vendre
-EstimatedStockValueSell=Valor per vendre
+EstimatedStockValueSellShort=Valor a vendre
+EstimatedStockValueSell=Valor a vendre
 EstimatedStockValueShort=Valor compra (PMP)
 EstimatedStockValue=Valor de compra (PMP)
 DeleteAWarehouse=Eliminar un magatzem
@@ -121,7 +121,7 @@ SelectWarehouseForStockDecrease=Tria el magatzem a utilitzar en el decrement d'e
 SelectWarehouseForStockIncrease=Tria el magatzem a utilitzar en l'increment d'estoc
 NoStockAction=Sense accions sobre l'estoc
 DesiredStock=Estoc desitjat
-DesiredStockDesc=Aquest import d'estoc serà el valor utilitzat per omplir l'estoc en la funció de reaprovisionament.
+DesiredStockDesc=Aquest import d'estoc serà el valor utilitzat per a omplir l'estoc en la funció de reaprovisionament.
 StockToBuy=A demanar
 Replenishment=Reaprovisionament
 ReplenishmentOrders=Ordres de reaprovisionament
@@ -257,7 +257,7 @@ ConfirmFinish=Confirmeu el tancament de l'inventari? Això generarà tots els mo
 ObjectNotFound=no s'ha trobat %s
 MakeMovementsAndClose=Generar moviments i tancar
 AutofillWithExpected=Ompliu la quantitat real amb la quantitat esperada
-ShowAllBatchByDefault=Per defecte, mostreu els detalls del lot a la pestanya "existències" del producte
+ShowAllBatchByDefault=Per defecte, mostreu els detalls del lot a la pestanya «estoc» del producte
 CollapseBatchDetailHelp=Podeu configurar la visualització predeterminada del detall del lot a la configuració del mòdul d'existències
 ErrorWrongBarcodemode=Mode de codi de barres desconegut
 ProductDoesNotExist=El producte no existeix
@@ -268,7 +268,7 @@ WarehouseId=Identificador de magatzem
 WarehouseRef=Magatzem Ref
 SaveQtyFirst=Deseu primer les quantitats reals inventariades, abans de demanar la creació del moviment d'existències.
 ToStart=Comença
-InventoryStartedShort=Començada
+InventoryStartedShort=Començat
 ErrorOnElementsInventory=Operació cancel·lada pel motiu següent:
 ErrorCantFindCodeInInventory=No es pot trobar el codi següent a l'inventari
 QtyWasAddedToTheScannedBarcode=Èxit!! La quantitat s'ha afegit a tots els codis de barres sol·licitats. Podeu tancar l'eina Escàner.
diff --git a/htdocs/langs/ca_ES/supplier_proposal.lang b/htdocs/langs/ca_ES/supplier_proposal.lang
index 5a6546a4e81..ab16b6920c5 100644
--- a/htdocs/langs/ca_ES/supplier_proposal.lang
+++ b/htdocs/langs/ca_ES/supplier_proposal.lang
@@ -51,5 +51,8 @@ ListOfSupplierProposals=Llista de sol·licituds de pressupostos a proveïdor
 ListSupplierProposalsAssociatedProject=Llista de pressupostos de proveïdor associats al projecte
 SupplierProposalsToClose=Pressupostos de proveïdor per a tancar
 SupplierProposalsToProcess=Pressupostos de proveïdor a processar
-LastSupplierProposals=Últims %s preus de sol·licitud
+LastSupplierProposals=Últimes %s sol·licituds de preus
 AllPriceRequests=Totes les peticions
+TypeContact_supplier_proposal_external_SHIPPING=Contacte amb el proveïdor per al lliurament
+TypeContact_supplier_proposal_external_BILLING=Contacte amb el proveïdor per a la facturació
+TypeContact_supplier_proposal_external_SERVICE=Agent comercial del seguiment del pressupost
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index f92bd144ae3..d1d5f8c722f 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -4,16 +4,17 @@ SuppliersInvoice=Factura del proveïdor
 SupplierInvoices=Factures de proveïdor
 ShowSupplierInvoice=Mostra la factura del proveïdor
 NewSupplier=Proveïdor nou
+NewSupplierInvoice = Nova factura de proveïdor
 History=Històric
 ListOfSuppliers=Llista de proveïdors
 ShowSupplier=Mostra el proveïdor
 OrderDate=Data comanda
-BuyingPriceMin=El millor preu de compra
-BuyingPriceMinShort=El millor preu de compra
+BuyingPriceMin=Millor preu de compra
+BuyingPriceMinShort=Millor preu de compra
 TotalBuyingPriceMinShort=Total dels preus de compra dels subproductes
 TotalSellingPriceMinShort=Total dels preus de venda de subproductes
 SomeSubProductHaveNoPrices=Alguns subproductes no tenen preus definits
-AddSupplierPrice=Afegeix preu de compra
+AddSupplierPrice=Afegeix el preu de compra
 ChangeSupplierPrice=Canvia el preu de compra
 SupplierPrices=Preus del proveïdor
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Aquesta referència del proveïdor ja està associada amb el producte: %s
@@ -51,6 +52,6 @@ RepeatableSupplierInvoice=Plantilla de factura del proveïdor
 RepeatableSupplierInvoices=Plantilla de factures de proveïdors
 RepeatableSupplierInvoicesList=Plantilla de factures de proveïdors
 RecurringSupplierInvoices=Factures de proveïdors recurrents
-ToCreateAPredefinedSupplierInvoice=Per crear una plantilla de factura de proveïdor, heu de crear una factura estàndard, després, sense validar-la, feu clic al botó "%s".
+ToCreateAPredefinedSupplierInvoice=Per a crear una plantilla de factura de proveïdor, heu de crear una factura estàndard, després, sense validar-la, feu clic al botó «%s».
 GeneratedFromSupplierTemplate=Generat a partir de la plantilla de factura del proveïdor %s
 SupplierInvoiceGeneratedFromTemplate=Factura del proveïdor %s Generada a partir de la plantilla de factura del proveïdor %s
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index aa8ca8e85f8..af8e5788f5a 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Creat per
 NewTicket=Tiquet nou
 SubjectAnswerToTicket=Resposta de tiquet
 TicketTypeRequest=Tipus de sol·licitud
-TicketCategory=Categorització del tiquet
+TicketCategory=Grup de tiquet
 SeeTicket=Consultar tiquet
 TicketMarkedAsRead=Tiquet ha estat marcat com llegit
 TicketReadOn=Segueix llegint
@@ -204,7 +204,7 @@ TicketMessageSuccessfullyAdded=El missatge s'ha afegit correctament
 TicketMessagesList=Llista de missatges
 NoMsgForThisTicket=No hi ha missatges per aquest tiquet
 TicketProperties=Classificació
-LatestNewTickets=Últimes entrades més noves %s (no llegides)
+LatestNewTickets=Últims %s tiquets més recents (no llegits)
 TicketSeverity=Gravetat
 ShowTicket=Consultar tiquet
 RelatedTickets=Tiquets relacionats
@@ -245,7 +245,7 @@ TicketMessageMailIntroAutoNewPublicMessage=S'ha publicat un nou missatge al tiqu
 TicketAssignedToYou=Tiquet assignat
 TicketAssignedEmailBody=Se us ha assignat el tiquet # %s per %s
 MarkMessageAsPrivate=Marcar el missatge com privat
-TicketMessageSendEmailHelp=An email will be sent to all assigned contact (internal contacts, but also external contacts except if the option "%s" is checked)
+TicketMessageSendEmailHelp=S'enviarà un correu electrònic a tots els contactes assignats (contactes interns, però també contactes externs, excepte si l'opció «%s» està marcada)
 TicketMessagePrivateHelp=Aquest missatge no es mostrarà als usuaris externs
 TicketEmailOriginIssuer=Emissor en l'origen dels tiquets
 InitialMessage=Missatge inicial
@@ -336,12 +336,12 @@ ActionsOnTicket=Esdeveniments en tiquets
 #
 # Boxes
 #
-BoxLastTicket=Últimes entrades creades
-BoxLastTicketDescription=Últimes entrades creades %s
+BoxLastTicket=Últims tiquets creats
+BoxLastTicketDescription=Últims %s tiquets creats
 BoxLastTicketContent=
 BoxLastTicketNoRecordedTickets=No hi ha tiquets pendents de llegir recents
 BoxLastModifiedTicket=Últims tiquets modificats
-BoxLastModifiedTicketDescription=Últimes entrades modificades %s
+BoxLastModifiedTicketDescription=Últims %s tiquets modificats
 BoxLastModifiedTicketContent=
 BoxLastModifiedTicketNoRecordedTickets=No hi ha tiquets modificats recentment
 BoxTicketType=Distribució dels tiquets oberts per tipus
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index 96c385f47f4..ff999beb238 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -1,150 +1,152 @@
 # Dolibarr language file - Source file is en_US - trips
+AUTHOR=Desat per
+AUTHORPAIEMENT=Pagat per
+AddTrip=Crear informe de despeses
+AllExpenseReport=Tots els tipus d’informe de despeses
+AllExpenseReports=Tots els informes de despeses
+AnyOtherInThisListCanValidate=Persona a informar per a validar la sol·licitud.
+AttachTheNewLineToTheDocument=Adjunta la línia a un document carregat
+AucuneLigne=Encara no hi ha informe de despeses declarat
+BrouillonnerTrip=Tornar l'informe de despeses a l'estat "Esborrany"
+byEX_DAY=per dia (limitació a %s)
+byEX_EXP=per línia (limitació a %s)
+byEX_MON=per mes (limitació a %s)
+byEX_YEA=per any (limitació a %s)
+CANCEL_USER=Eliminat per
+CarCategory=Categoria de vehicles
+ClassifyRefunded=Marca «Reemborsat»
+CompanyVisited=Empresa/organització visitada
+ConfirmBrouillonnerTrip=Esteu segur que voleu traslladar aquest informe de despeses a l'estat "Esborrany"?
+ConfirmCancelTrip=Estàs segur que vols cancel·lar aquest informe de despeses?
+ConfirmCloneExpenseReport=Estàs segur de voler clonar aquest informe de despeses ?
+ConfirmDeleteTrip=Estàs segur que vols eliminar aquest informe de despeses?
+ConfirmPaidTrip=Esteu segur que voleu canviar l'estat d'aquest informe de despeses a "Pagat"?
+ConfirmRefuseTrip=Estàs segur que vols denegar aquest informe de despeses?
+ConfirmSaveTrip=Estàs segur que vols validar aquest informe de despeses?
+ConfirmValideTrip=Estàs segur que vols aprovar aquest informe de despeses?
+DATE_CANCEL=Data de cancel·lació
+DATE_PAIEMENT=Data de pagament
+DATE_REFUS=Data de denegació
+DATE_SAVE=Data de validació
+DefaultCategoryCar=Mode de transport per defecte
+DefaultRangeNumber=Número de rang per defecte
+DeleteTrip=Suprimeix l'informe de despeses
+ErrorDoubleDeclaration=Has declarat un altre informe de despeses en un altre rang de dates semblant
+Error_EXPENSEREPORT_ADDON_NotDefined=Error, la regla per a la numeració d'informes de despeses no es va definir a la configuració del mòdul "Informe de despeses"
+ExpenseRangeOffset=Quantitat d'offset: %s
+expenseReportCatDisabled=Categoria deshabilitada: consulteu el diccionari c_exp_tax_cat
+expenseReportCoef=Coeficient
+expenseReportCoefUndefined=(valor no definit)
+expenseReportOffset=Decàleg
+expenseReportPrintExample=offset + (d x coef) = %s
+expenseReportRangeDisabled=S'ha desactivat el rang: consulteu el diccionari c_exp_tax_range
+expenseReportRangeFromTo=de %d a %d
+expenseReportRangeMoreThan=més de %d
+expenseReportTotalForFive=Exemple amb <u>d</u> = 5
+ExpenseReportApplyTo=Aplicar a
+ExpenseReportApproved=S'ha aprovat un informe de despeses
+ExpenseReportApprovedMessage=S'ha aprovat l'informe de despeses %s. <br> - Usuari: %s <br> - Aprovat per: %s <br> Feu clic aquí per a veure l'informe de despeses: %s
+ExpenseReportCanceled=S'ha cancel·lat un informe de despeses
+ExpenseReportCanceledMessage=L'informe de despeses %s s'ha cancel·lat. <br> - Usuari: %s <br> - Cancel·lat per: %s <br> - Motiu de cancel·lació: %s <br> Cliqueu aquí per a veure l'informe de despeses: %s
+ExpenseReportConstraintViolationError=S'ha superat la quantitat màxima (regla %s): %s és superior a %s (excedit prohibit)
+ExpenseReportConstraintViolationWarning=S'ha superat l'import màxim (regla %s): %s és superior a %s (supera l'autoritzat)
+ExpenseReportDateEnd=Data fi
+ExpenseReportDateStart=Data d'inici
+ExpenseReportDomain=Domini a aplicar
+ExpenseReportIkDesc=Podeu modificar el càlcul de les despeses de quilometratge per categoria i abast, els quals s'han definit anteriorment. <b>d</b> és la distància en quilòmetres
+ExpenseReportLimitAmount=Import màxim
+ExpenseReportLimitOn=Limitar a
+ExpenseReportLine=Línia de l'informe de despeses
+ExpenseReportPaid=S'ha pagat un informe de despeses
+ExpenseReportPaidMessage=L'informe de despeses %s s'ha pagat. <br> - Usuari: %s <br> - Pagat per: %s <br> Feu clic aquí per a veure l'informe de despeses: %s
+ExpenseReportPayment=Informe de despeses pagades
+ExpenseReportRef=Ref. de l'informe de despeses
+ExpenseReportRefused=S'ha rebutjat un informe de despeses
+ExpenseReportRefusedMessage=L'informe de despeses %s s'ha denegat. <br> - Usuari: %s <br> - Rebutjat per: %s <br> - Motiu de denegació: %s <br> Cliqueu aquí per a veure l'informe de despeses: %s
+ExpenseReportRestrictive=Superació prohibida
+ExpenseReportRuleErrorOnSave=Error: %s
+ExpenseReportRuleSave=S'ha desat la regla de l'informe de despeses
+ExpenseReportRulesDesc=Podeu definir regles d'import màxim per als informes de despeses. Aquestes regles s'aplicaran quan s'afegeixi una nova despesa a un informe de despeses
+ExpenseReportWaitingForApproval=S'ha generat un nou informe de vendes per aprovació
+ExpenseReportWaitingForApprovalMessage=S'ha enviat un nou informe de despeses i està pendent d'aprovació. <br> - Usuari: %s <br> - Període: %s <br> Cliqueu aquí per a validar: %s
+ExpenseReportWaitingForReApproval=S'ha generat un informe de despeses per a re-aprovació
+ExpenseReportWaitingForReApprovalMessage=S'ha enviat un informe de despeses i s'està esperant una nova aprovació. <br> L'%s, us heu negat a aprovar l'informe de despeses per aquest motiu: %s. <br> S'ha proposat una nova versió i està esperant la vostra aprovació. <br> - Usuari: %s <br> - Període: %s <br> Feu clic aquí per a validar: %s
+ExpenseReportsIk=Configuració de les despeses de quilometratge
+ExpenseReportsRules=Normes d'informe de despeses
+ExpenseReportsToApprove=Informes de despeses per a aprovar
+ExpenseReportsToPay=Informes de despeses a pagar
+ExpensesArea=Àrea d'informes de despeses
+FeesKilometersOrAmout=Import o quilòmetres
+LastExpenseReports=Últims %s informes de despeses 
+ListOfFees=Llista de taxes
+ListOfTrips=Llistat de informes de despeses
+ListToApprove=Pendent d'aprovació
+ListTripsAndExpenses=Llistat d'informes de despeses
+MOTIF_CANCEL=Raó
+MOTIF_REFUS=Raó
+ModePaiement=Tipus de pagament
+NewTrip=Informe de despeses nou
+nolimitbyEX_DAY=per dia (sense límits)
+nolimitbyEX_EXP=per línia (sense límits)
+nolimitbyEX_MON=per mes (sense límits)
+nolimitbyEX_YEA=per any (sense límits)
+NoTripsToExportCSV=No hi ha cap informe de despeses per a exportar en aquest període.
+NOT_AUTHOR=No sou l’autor d’aquest informe de despeses. Operació cancel·lada.
+OnExpense=Línia de despesa
+PDFStandardExpenseReports=Plantilla estàndard per a generar un document PDF per a l'informe de despeses
+PaidTrip=Pagar un informe de despeses
+REFUSEUR=Denegat per
+RangeIk=Rang de quilometratge
+RangeNum=Rang %d
+SaveTrip=Valida l'informe de despeses
 ShowExpenseReport=Mostra l'informe de despeses
+ShowTrip=Mostra l'informe de despeses
+TripCard=Informe de despesa de targeta
+TripId=Id d'informe de despeses
+TripNDF=Informacions de l'informe de despeses
+TripSociete=Informació de l'empresa
 Trips=Informes de despeses
 TripsAndExpenses=Informes de despeses
 TripsAndExpensesStatistics=Estadístiques de l'informe de despeses
-TripCard=Informe de despesa de targeta
-AddTrip=Crear informe de despeses
-ListOfTrips=Llistat de informes de despeses
-ListOfFees=Llista de taxes
 TypeFees=Tipus de despeses
-ShowTrip=Mostra l'informe de despeses
-NewTrip=Informe de despeses nou
-LastExpenseReports=Últims %s informes de despeses 
-AllExpenseReports=Tots els informes de despeses
-CompanyVisited=Empresa/organització visitada
-FeesKilometersOrAmout=Import o quilòmetres
-DeleteTrip=Suprimeix l'informe de despeses
-ConfirmDeleteTrip=Estàs segur que vols eliminar aquest informe de despeses?
-ListTripsAndExpenses=Llistat d'informes de despeses
-ListToApprove=Pendent d'aprovació
-ExpensesArea=Àrea d'informes de despeses
-ClassifyRefunded=Classifica "Retornat"
-ExpenseReportWaitingForApproval=S'ha generat un nou informe de vendes per aprovació
-ExpenseReportWaitingForApprovalMessage=S'ha enviat un nou informe de despeses i està pendent d'aprovació. <br> - Usuari: %s <br> - Període: %s <br> Cliqueu aquí per validar: %s
-ExpenseReportWaitingForReApproval=S'ha generat un informe de despeses per a re-aprovació
-ExpenseReportWaitingForReApprovalMessage=S'ha enviat un informe de despeses i està a l'espera de la seva aprovació.<br>%s, es va negar a aprovar l'informe de despeses per aquest motiu: %s.<br>S'ha proposat una nova versió i espera la seva aprovació.<br> - Usuari: %s<br> - Període: %s<br>Cliqueu aquí per validar: %s
-ExpenseReportApproved=S'ha aprovat un informe de despeses
-ExpenseReportApprovedMessage=S'ha aprovat l'informe de despeses %s. <br> - Usuari: %s <br> - Aprovat per: %s <br> Feu clic aquí per a veure l'informe de despeses: %s
-ExpenseReportRefused=S'ha rebutjat un informe de despeses
-ExpenseReportRefusedMessage=L'informe de despeses %s s'ha denegat. <br> - Usuari: %s <br> - Rebutjat per: %s <br> - Motiu de denegació: %s <br> Cliqueu aquí per a veure l'informe de despeses: %s
-ExpenseReportCanceled=S'ha cancel·lat un informe de despeses
-ExpenseReportCanceledMessage=L'informe de despeses %s s'ha cancel·lat. <br> - Usuari: %s <br> - Cancel·lat per: %s <br> - Motiu de cancel·lació: %s <br> Cliqueu aquí per a veure l'informe de despeses: %s
-ExpenseReportPaid=S'ha pagat un informe de despeses
-ExpenseReportPaidMessage=L'informe de despeses %s s'ha pagat. <br> - Usuari: %s <br> - Pagat per: %s <br> Feu clic aquí per a veure l'informe de despeses: %s
-TripId=Id d'informe de despeses
-AnyOtherInThisListCanValidate=Persona que s’ha d’informar per validar la sol·licitud.
-TripSociete=Informació de l'empresa
-TripNDF=Informacions de l'informe de despeses
-PDFStandardExpenseReports=Plantilla estàndard per a generar un document PDF per a l'informe de despeses
-ExpenseReportLine=Línia de l'informe de despeses
-TF_OTHER=Altres
-TF_TRIP=Transport
-TF_LUNCH=Dieta
-TF_METRO=Metro
-TF_TRAIN=Tren
-TF_BUS=Bus
-TF_CAR=Cotxe
-TF_PEAGE=Peatge
-TF_ESSENCE=Combustible
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
-EX_KME=Cost de quilometratge 
-EX_FUE=CV de benzina
-EX_HOT=Hotel
-EX_PAR=CV d'aparcament
-EX_TOL=CV de peatge
-EX_TAX=Impostos varis
-EX_IND=Indemnització de subscripció de transport
-EX_SUM=Subministrament de manteniment
-EX_SUO=Material d'oficina
-EX_CAR=Lloguer de cotxes
-EX_DOC=Documentació
-EX_CUR=Clients que reben
-EX_OTR=Altres que reben
-EX_POS=Franqueig
-EX_CAM=CV de manteniment i reparació
-EX_EMM=Dinar dels empleats
-EX_GUM=Menjar de convidats
-EX_BRE=Esmorzar
-EX_FUE_VP=PV de benzina
-EX_TOL_VP=PV de peatge
-EX_PAR_VP=PV d'aparcament
-EX_CAM_VP=PV de manteniment i reparació
-DefaultCategoryCar=Mode de transport per defecte
-DefaultRangeNumber=Número de rang per defecte
 UploadANewFileNow=Carrega ara un document nou
-Error_EXPENSEREPORT_ADDON_NotDefined=Error, la regla per a la numeració d'informes de despeses no es va definir a la configuració del mòdul "Informe de despeses"
-ErrorDoubleDeclaration=Has declarat un altre informe de despeses en un altre rang de dates semblant
-AucuneLigne=Encara no hi ha informe de despeses declarat
-ModePaiement=Tipus de pagament
 VALIDATOR=Usuari responsable de l'aprovació
 VALIDOR=Aprovat per
-AUTHOR=Desat per
-AUTHORPAIEMENT=Pagat per
-REFUSEUR=Denegat per
-CANCEL_USER=Eliminat per
-MOTIF_REFUS=Raó
-MOTIF_CANCEL=Raó
-DATE_REFUS=Data de denegació
-DATE_SAVE=Data de validació
-DATE_CANCEL=Data de cancel·lació
-DATE_PAIEMENT=Data de pagament
-ExpenseReportRef=Ref. de l'informe de despeses
 ValidateAndSubmit=Validar i sotmetre a aprovació
 ValidatedWaitingApproval=Validat (pendent d'aprovació)
-NOT_AUTHOR=No sou l’autor d’aquest informe de despeses. Operació cancel·lada.
-ConfirmRefuseTrip=Estàs segur que vols denegar aquest informe de despeses?
 ValideTrip=Aprova l'informe de despeses
-ConfirmValideTrip=Estàs segur que vols aprovar aquest informe de despeses?
-PaidTrip=Pagar un informe de despeses
-ConfirmPaidTrip=Esteu segur que voleu canviar l'estat d'aquest informe de despeses a "Pagat"?
-ConfirmCancelTrip=Estàs segur que vols cancel·lar aquest informe de despeses?
-BrouillonnerTrip=Tornar l'informe de despeses a l'estat "Esborrany"
-ConfirmBrouillonnerTrip=Esteu segur que voleu traslladar aquest informe de despeses a l'estat "Esborrany"?
-SaveTrip=Valida l'informe de despeses
-ConfirmSaveTrip=Estàs segur que vols validar aquest informe de despeses?
-NoTripsToExportCSV=No hi ha cap informe de despeses per a exportar en aquest període.
-ExpenseReportPayment=Informe de despeses pagades
-ExpenseReportsToApprove=Informes de despeses per a aprovar
-ExpenseReportsToPay=Informes de despeses a pagar
-ConfirmCloneExpenseReport=Estàs segur de voler clonar aquest informe de despeses ?
-ExpenseReportsIk=Configuració de les despeses de quilometratge
-ExpenseReportsRules=Normes d'informe de despeses
-ExpenseReportIkDesc=Podeu modificar el càlcul de les despeses de quilometratge per categoria i abast, els quals s'han definit anteriorment. <b>d</b> és la distància en quilòmetres
-ExpenseReportRulesDesc=Podeu definir regles d'import màxim per als informes de despeses. Aquestes regles s'aplicaran quan s'afegeixi una nova despesa a un informe de despeses
-expenseReportOffset=Decàleg
-expenseReportCoef=Coeficient
-expenseReportTotalForFive=Exemple amb <u>d</u> = 5
-expenseReportRangeFromTo=de %d a %d
-expenseReportRangeMoreThan=més de %d
-expenseReportCoefUndefined=(valor no definit)
-expenseReportCatDisabled=Categoria deshabilitada: consulteu el diccionari c_exp_tax_cat
-expenseReportRangeDisabled=S'ha desactivat el rang: consulteu el diccionari c_exp_tax_range
-expenseReportPrintExample=offset + (d x coef) = %s
-ExpenseReportApplyTo=Aplicar a
-ExpenseReportDomain=Domini a aplicar
-ExpenseReportLimitOn=Limitar a
-ExpenseReportDateStart=Data inici
-ExpenseReportDateEnd=Data fi
-ExpenseReportLimitAmount=Import màxim
-ExpenseReportRestrictive=Superació prohibida
-AllExpenseReport=Tots els tipus d’informe de despeses
-OnExpense=Línia de despesa
-ExpenseReportRuleSave=S'ha desat la regla de l'informe de despeses
-ExpenseReportRuleErrorOnSave=Error: %s
-RangeNum=Rang %d
-ExpenseReportConstraintViolationError=S'ha superat la quantitat màxima (regla %s): %s és superior a %s (excedit prohibit)
-byEX_DAY=per dia (limitació a %s)
-byEX_MON=per mes (limitació a %s)
-byEX_YEA=per any (limitació a %s)
-byEX_EXP=per línia (limitació a %s)
-ExpenseReportConstraintViolationWarning=S'ha superat l'import màxim (regla %s): %s és superior a %s (supera l'autoritzat)
-nolimitbyEX_DAY=per dia (sense límits)
-nolimitbyEX_MON=per mes (sense límits)
-nolimitbyEX_YEA=per any (sense límits)
-nolimitbyEX_EXP=per línia (sense límits)
-CarCategory=Categoria de vehicles
-ExpenseRangeOffset=Quantitat d'offset: %s
-RangeIk=Rang de quilometratge
-AttachTheNewLineToTheDocument=Adjunta la línia a un document carregat
+
+## Dictionary
+EX_BRE=Esmorzar
+EX_CAM=CV de manteniment i reparació
+EX_CAM_VP=PV de manteniment i reparació
+EX_CAR=Lloguer de cotxes
+EX_CUR=Clients que reben
+EX_DOC=Documentació
+EX_EMM=Dinar dels empleats
+EX_FUE=CV de benzina
+EX_FUE_VP=PV de benzina
+EX_GUM=Menjar de convidats
+EX_HOT=Hotel
+EX_IND=Indemnització de subscripció de transport
+EX_KME=Cost de quilometratge 
+EX_OTR=Altres que reben
+EX_PAR=CV d'aparcament
+EX_PAR_VP=PV d'aparcament
+EX_POS=Franqueig
+EX_SUM=Subministrament de manteniment
+EX_SUO=Material d'oficina
+EX_TAX=Impostos varis
+EX_TOL=CV de peatge
+EX_TOL_VP=PV de peatge
+TF_BUS=Bus
+TF_CAR=Cotxe
+TF_ESSENCE=Combustible
+TF_HOTEL=Hotel
+TF_LUNCH=Dieta
+TF_METRO=Metro
+TF_OTHER=Altres
+TF_PEAGE=Peatge
+TF_TAXI=Taxi
+TF_TRAIN=Tren
+TF_TRIP=Transport
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 6a1485548e1..0223233c8ae 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -33,7 +33,7 @@ Webpage=Pàgina/contenidor web
 AddPage=Afegeix pàgina/contenidor
 PageContainer=Pàgina
 PreviewOfSiteNotYetAvailable=La previsualització del vostre lloc web <strong> %s </strong> encara no està disponible. Primer heu de "<strong> importar una plantilla de lloc web completa </strong>" o simplement "<strong> Afegir una pàgina / contenidor </strong>".
-RequestedPageHasNoContentYet=La pàgina sol·licitada amb l'identificador %s encara no té contingut, o el fitxer de memòria cau .tpl.php s'ha eliminat. Edita el contingut de la pàgina per solucionar-ho.
+RequestedPageHasNoContentYet=La pàgina sol·licitada amb l'identificador %s encara no té contingut o el fitxer de memòria cau .tpl.php s'ha eliminat. Editeu el contingut de la pàgina per a solucionar-ho.
 SiteDeleted=Lloc web '%s' eliminat
 PageContent=Pàgina/Contenidor
 PageDeleted=Pàgina/Contenidor '%s' del lloc web %s eliminat
@@ -54,7 +54,7 @@ ReadPerm=Llegit
 WritePerm=Escriu
 TestDeployOnWeb=Prova / implantació a la web
 PreviewSiteServedByWebServer=<LI>Vista prèvia %s en una nova pestanya.</LI><br><br>El %s serà servit per un servidor web extern (com ara Apache, Nginx, IIS). Heu d'instal·lar i configurar aquest servidor abans d'apuntar al directori:<br><strong>%s</strong><br> URL servit per un servidor extern:<br><strong>%s</strong><br>
-PreviewSiteServedByDolibarr=<u> Previsualitza %s en una nova pestanya. </u><br> <br> El %s serà servit pel servidor Dolibarr així que no cal instal·lar cap servidor web addicional (com ara Apache, Nginx, IIS).<br>L'inconvenient és que l'URL de les pàgines no són amigables i comencen per la ruta del vostre Dolibarr. <br>URL servit per Dolibarr:<br><strong> %s </strong> <br> <br> Per a utilitzar el vostre propi servidor web extern per a servir aquest lloc web, creeu un VIRTUALHOST al vostre servidor web que apunti al directori<br><strong> %s </strong><br>, llavors introduïu el nom d'aquest servidor virtual i feu clic a l'enllaç "Provar/Desplegar a la web".
+PreviewSiteServedByDolibarr=<u>Previsualitza %s en una pestanya nova.</u><br><br>El %s serà servit pel servidor Dolibarr, de manera que no cal instal·lar cap servidor web addicional (com Apache, Nginx, IIS).<br>L'inconvenient és que els URL de les pàgines no són fàcils d'utilitzar i comencen pel camí del vostre Dolibarr.<br>URL servit per Dolibarr: <br><strong>%s</strong><br><br>Per a utilitzar el vostre propi servidor web extern per a servir aquest lloc web, creeu un VIRTUALHOST al vostre servidor web que apunti al directori <br><strong>%s</strong><br>, llavors introduïu el nom d'aquest servidor virtual i feu clic a l'enllaç «Prova/Desplega a la web».
 VirtualHostUrlNotDefined=No s'ha definit l'URL de l'amfitrió virtual servit per un servidor web extern
 NoPageYet=Encara sense pàgines
 YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
@@ -79,7 +79,7 @@ ExportSite=Exporta la web
 ImportSite=Importa la plantilla del lloc web
 IDOfPage=Id de la pàgina
 Banner=Bàner
-BlogPost=Publicació del bloc
+BlogPost=Entrada al blog
 WebsiteAccount=Compte del lloc web
 WebsiteAccounts=Comptes de lloc web
 AddWebsiteAccount=Crear un compte de lloc web
@@ -135,12 +135,12 @@ PublicAuthorAlias=Àlies d’autor públic
 AvailableLanguagesAreDefinedIntoWebsiteProperties=Els idiomes disponibles es defineixen a les propietats del lloc web
 ReplacementDoneInXPages=Substitució realitzada  %s pàgines o contenidors
 RSSFeed=Fils RSS
-RSSFeedDesc=Podeu obtenir un feed RSS dels últims articles amb el tipus «entrada de bloc» mitjançant aquest URL
+RSSFeedDesc=Podeu obtenir un feed RSS dels últims articles amb el tipus «entrada de blog» mitjançant aquest URL
 PagesRegenerated=%s pàgina (es) / contenidor (s) regenerada
 RegenerateWebsiteContent=Regenera els fitxers de memòria cau del lloc web
 AllowedInFrames=Es permet en marcs
 DefineListOfAltLanguagesInWebsiteProperties=Definiu la llista de tots els idiomes disponibles a les propietats del lloc web.
-GenerateSitemaps=Generate website sitemap.xml file
+GenerateSitemaps=Genereu el fitxer sitemap.xml del lloc web
 ConfirmGenerateSitemaps=Si ho confirmeu, suprimireu el fitxer de mapa del lloc existent...
 ConfirmSitemapsCreation=Confirmeu la generació del mapa del lloc
 SitemapGenerated=Fitxer del mapa del lloc <b> %s </b> generat
@@ -150,9 +150,9 @@ ErrorFaviconSize=El favicon ha de tenir una mida de 16x16, 32x32 o 64x64
 FaviconTooltip=Pengeu una imatge que ha de ser PNG (16x16, 32x32 o 64x64)
 NextContainer=Pàgina/Contenidor següent
 PreviousContainer=Pàgina/Contenidor anterior
-WebsiteMustBeDisabled=The website must have the status "%s"
-WebpageMustBeDisabled=The web page must have the status "%s"
-SetWebsiteOnlineBefore=When website is offline, all pages are offline. Change status of website first.
+WebsiteMustBeDisabled=El lloc web ha de tenir l'estat «%s»
+WebpageMustBeDisabled=La pàgina web ha de tenir l'estat «%s»
+SetWebsiteOnlineBefore=Quan el lloc web està fora de línia, totes les pàgines estan fora de línia. Primer canvieu l'estat del lloc web.
 Booking=Reserva
 Reservation=Reserva
 PagesViewedPreviousMonth=Pàgines vistes (mes anterior)
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 00d8bd28f98..371437d9ae1 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -12,7 +12,7 @@ WithdrawalsReceipts=Domiciliacions
 WithdrawalReceipt=Domiciliació
 BankTransferReceipts=Ordres de transferència bancària
 BankTransferReceipt=Ordre de transferència bancària
-LatestBankTransferReceipts=Les %s últimes ordres de transferència bancària
+LatestBankTransferReceipts=Últimes %s ordres de transferència bancària
 LastWithdrawalReceipts=Últims %s fitxers per a la domiciliació bancària
 WithdrawalsLine=Línia d'ordre de domiciliació
 CreditTransfer=Transferència bancària
@@ -33,7 +33,7 @@ InvoiceWaitingPaymentByBankTransfer=Factura en espera de transferència bancàri
 AmountToWithdraw=Import a domiciliar
 AmountToTransfer=Import a transferir
 NoInvoiceToWithdraw=No hi ha cap factura oberta per a '%s'. Aneu a la pestanya "%s" de la fitxa de factura per a fer una sol·licitud.
-NoSupplierInvoiceToWithdraw=No supplier invoice with open '%s' is waiting. Go on tab '%s' on invoice card to make a request.
+NoSupplierInvoiceToWithdraw=No s'està esperant cap factura del proveïdor amb «%s» obert. Aneu a la pestanya «%s» de la fitxa de factura per a fer una sol·licitud.
 ResponsibleUser=Usuari responsable
 WithdrawalsSetup=Configuració del pagament mitjançant domiciliació bancària
 CreditTransferSetup=Configuració de transferència bancària
@@ -49,9 +49,9 @@ BankTransferRequestsDone=S'han registrat %s sol·licituds de transferència
 ThirdPartyBankCode=Codi bancari de tercers
 NoInvoiceCouldBeWithdrawed=Cap factura s'ha carregat amb èxit. Comproveu que els tercers de les factures tenen un IBAN vàlid i que IBAN té un RUM (Referència de mandat exclusiva) amb mode <strong>%s</strong>.
 WithdrawalCantBeCreditedTwice=Aquesta domiciliació ja està marcada com a cobrada; això no es pot fer dues vegades, ja que això podria generar duplicats de pagaments i entrades bancàries.
-ClassCredited=Classifica com "Abonada"
-ClassDebited=Classifica els domiciliats
-ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com abonada al seu compte bancari?
+ClassCredited=Marca abonada
+ClassDebited=Marca els domiciliats
+ClassCreditedConfirm=Esteu segur que voleu marcar aquesta domiciliació com a abonada al vostre compte bancari?
 TransData=Data enviament
 TransMetod=Mètode enviament
 Send=Envia
@@ -109,7 +109,7 @@ DoCreditTransferBeforePayments3=Quan es tanqui l'ordre de transferència de crè
 WithdrawalFile=Fitxer de comanda de dèbit
 CreditTransferFile=Fitxer de transferència de crèdit
 SetToStatusSent=Estableix l'estat "Fitxer enviat"
-ThisWillAlsoAddPaymentOnInvoice=També registrarà els pagaments en les factures i els classificarà com a "Pagats" si resten a pagar és nul
+ThisWillAlsoAddPaymentOnInvoice=Això també registrarà els pagaments a les factures i els classificarà com a "Pagats" si la resta a pagar és nul·la.
 StatisticsByLineStatus=Estadístiques per estats de línies
 RUM=UMR
 DateRUM=Data de signatura del mandat
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index b483e426502..da92a17d9c6 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Boxy
 MaxNbOfLinesForBoxes=Maximální počet řádků pro widgety
 AllWidgetsWereEnabled=Všechny dostupné widgety jsou povoleny
+WidgetAvailable=Widget available
 PositionByDefault=Výchozí pořadí
 Position=Pozice
 MenusDesc=V nastavení menu nastavíte obsah obou panelů nabídek (horizontální i vertikální).
@@ -374,7 +375,7 @@ DoTestSendHTML=Vyzkoušet odesílání HTML
 ErrorCantUseRazIfNoYearInMask=Chyba, nelze použít volbu @ pro reset čítače každý rok, když posloupnost {yy} nebo {yyyy} není v masce.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Chyba, nelze použít volbu @ pokud posloupnost {yy}{mm} or {yyyy}{mm} není uvedena v masce.
 UMask=Umask parametr pro nové soubory na Unix / Linux / BSD / Mac systému souborů.
-UMaskExplanation=Tento parametr umožňuje definovat výchozí oprávnění souborl vytvořených Dolibarr systémem na serveru (např. během nahrávání). <br> Musí se jednat o osmičkovou hodnotu (např. 0666 znamená číst a psát pro všechny). <br> Tento parametr je na serverech Windows k ničemu.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Podívejte se na stránku Wiki, kde najdete seznam přispěvatelů a jejich organizace
 UseACacheDelay= Zpoždění pro ukládání výsledku exportu do mezipaměti v sekundách (0 nebo prázdné pro neukládání)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind konverze možnosti
 Module3200Name=Nezměnitelné archivy
 Module3200Desc=Povolení nezměnitelného protokolu obchodních událostí. Události jsou archivovány v reálném čase. Protokol je tabulka řetězových událostí jen pro čtení, která lze exportovat. Tento modul může být pro některé země povinný.
 Module3300Name=Module Builder
-Module3200Desc=Povolení nezměnitelného protokolu obchodních událostí. Události jsou archivovány v reálném čase. Protokol je tabulka řetězových událostí jen pro čtení, která lze exportovat. Tento modul může být pro některé země povinný.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Sociální sítě
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Nastavení
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/cs_CZ/interventions.lang b/htdocs/langs/cs_CZ/interventions.lang
index 5bebd024405..cd70f4bd6b6 100644
--- a/htdocs/langs/cs_CZ/interventions.lang
+++ b/htdocs/langs/cs_CZ/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Skryje hodiny a minuty z data pole pro zásahové
 InterventionStatistics=Statistiky intervencí
 NbOfinterventions=Počet zásahových karet
 NumberOfInterventionsByMonth=Počet intervenčních karet podle měsíce (datum platnosti)
-AmountOfInteventionNotIncludedByDefault=Částka intervence není zahrnutá do výkazu zisku (ve většině případů se časové pásmo používá k počítání vynaloženého času). Přidejte možnost PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT na hodnotu 1 do domova-nastavení-jiné, abyste je zahrnovali.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=intervence id
 InterRef=Intervence ref.
 InterDateCreation=Datum vytvoření intervence
@@ -66,3 +66,7 @@ RepeatableIntervention=Šablona intervence
 ToCreateAPredefinedIntervention=Chcete-li vytvořit předdefinovaný nebo opakující se zásah, vytvořte společný zásah a převeďte jej na intervenční šablonu
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
 GenerateInter=Generate intervention
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 53cf8879162..82d4ebcb7a6 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Kontakty podle pozice
 MailingModuleDescEmailsFromFile=Emaily ze souboru
 MailingModuleDescEmailsFromUser=Emaily zadávané uživatelem
 MailingModuleDescDolibarrUsers=Uživatelé s e-maily
-MailingModuleDescThirdPartiesByCategories=Subjekty (podle kategorií)
+MailingModuleDescThirdPartiesByCategories=Subjekty
 SendingFromWebInterfaceIsNotAllowed=Odesílání z webového rozhraní není povoleno.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/cy_GB/admin.lang b/htdocs/langs/cy_GB/admin.lang
index ed7c0f29233..32d0d09b175 100644
--- a/htdocs/langs/cy_GB/admin.lang
+++ b/htdocs/langs/cy_GB/admin.lang
@@ -145,6 +145,7 @@ Box=Teclyn
 Boxes=Teclynnau
 MaxNbOfLinesForBoxes=Max. nifer y llinellau ar gyfer teclynnau
 AllWidgetsWereEnabled=Mae'r holl widgets sydd ar gael wedi'u galluogi
+WidgetAvailable=Widget available
 PositionByDefault=Gorchymyn diofyn
 Position=Swydd
 MenusDesc=Mae rheolwyr dewislen yn gosod cynnwys y ddau far dewislen (llorweddol a fertigol).
@@ -374,7 +375,7 @@ DoTestSendHTML=Prawf anfon HTML
 ErrorCantUseRazIfNoYearInMask=Gwall, ni ellir defnyddio opsiwn @ i ailosod cownter bob blwyddyn os nad yw dilyniant {yy} neu {yyyy} mewn mwgwd.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Gwall, ni allwn ddefnyddio opsiwn @ os nad yw dilyniant {yy}{mm} neu {yyyy}{mm} mewn mwgwd.
 UMask=Paramedr UMask ar gyfer ffeiliau newydd ar system ffeiliau Unix/Linux/BSD/Mac.
-UMaskExplanation=Mae'r paramedr hwn yn caniatáu ichi ddiffinio caniatâd a osodwyd yn ddiofyn ar ffeiliau a grëwyd gan Dolibarr ar y gweinydd (yn ystod uwchlwytho er enghraifft). <br> Rhaid iddo fod y gwerth wythol (er enghraifft, mae 0666 yn golygu darllen ac ysgrifennu i bawb). <br> Mae'r paramedr hwn yn ddiwerth ar weinydd Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Cymerwch olwg ar y dudalen Wiki am restr o gyfranwyr a'u sefydliad
 UseACacheDelay= Oedi ar gyfer caching ymateb allforio mewn eiliadau (0 neu wag am ddim celc)
 DisableLinkToHelpCenter=Cuddio'r ddolen " <b> Angen help neu gefnogaeth </b> " ar y dudalen mewngofnodi
@@ -663,7 +664,7 @@ Module2900Desc=Galluoedd trosi GeoIP Maxmind
 Module3200Name=Archifau Annewidiadwy
 Module3200Desc=Galluogi log na ellir ei newid o ddigwyddiadau busnes. Mae digwyddiadau'n cael eu harchifo mewn amser real. Mae'r log yn dabl darllen yn unig o ddigwyddiadau cadwyn y gellir eu hallforio. Gall y modiwl hwn fod yn orfodol ar gyfer rhai gwledydd.
 Module3300Name=Module Builder
-Module3200Desc=Galluogi log na ellir ei newid o ddigwyddiadau busnes. Mae digwyddiadau'n cael eu harchifo mewn amser real. Mae'r log yn dabl darllen yn unig o ddigwyddiadau cadwyn y gellir eu hallforio. Gall y modiwl hwn fod yn orfodol ar gyfer rhai gwledydd.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Rhwydweithiau Cymdeithasol
 Module3400Desc=Galluogi meysydd Rhwydweithiau Cymdeithasol yn drydydd partïon a chyfeiriadau (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Defnyddiwch fodd cof isel
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/cy_GB/interventions.lang b/htdocs/langs/cy_GB/interventions.lang
index 199e7015404..663e1006acd 100644
--- a/htdocs/langs/cy_GB/interventions.lang
+++ b/htdocs/langs/cy_GB/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Yn cuddio oriau a munudau oddi ar y maes dyddiad a
 InterventionStatistics=Ystadegau ymyriadau
 NbOfinterventions=Nifer y cardiau ymyrraeth
 NumberOfInterventionsByMonth=Nifer y cardiau ymyrryd fesul mis (dyddiad dilysu)
-AmountOfInteventionNotIncludedByDefault=Nid yw swm yr ymyriad yn cael ei gynnwys yn yr elw yn ddiofyn (yn y rhan fwyaf o achosion, defnyddir taflenni amser i gyfrif yr amser a dreuliwyd). Ychwanegu opsiwn PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT i 1 i'r gosodiad cartref-arall i'w cynnwys.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=ID ymyrraeth
 InterRef=Cyf ymyrraeth.
 InterDateCreation=Ymyrraeth creu dyddiad
@@ -68,3 +68,5 @@ ConfirmReopenIntervention=A ydych yn siŵr eich bod am agor yr ymyriad <b> %s </
 GenerateInter=Cynhyrchu ymyrraeth
 FichinterNoContractLinked=Intervention %s has been created without a linked contract.
 ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/cy_GB/mails.lang b/htdocs/langs/cy_GB/mails.lang
index bda452eafc9..e0678a9fde2 100644
--- a/htdocs/langs/cy_GB/mails.lang
+++ b/htdocs/langs/cy_GB/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Cysylltiadau yn ôl swydd
 MailingModuleDescEmailsFromFile=E-byst o ffeil
 MailingModuleDescEmailsFromUser=Mewnbwn e-byst gan ddefnyddiwr
 MailingModuleDescDolibarrUsers=Defnyddwyr ag E-byst
-MailingModuleDescThirdPartiesByCategories=Trydydd partïon (yn ôl categorïau)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=Ni chaniateir anfon o ryngwyneb gwe.
 EmailCollectorFilterDesc=Rhaid i bob hidlydd gyfateb i gael e-bost yn cael ei gasglu
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Cofnod a grëwyd gan y Casglwr E-bost %s o e-bost
 DefaultBlacklistMailingStatus=Gwerth rhagosodedig ar gyfer maes '%s' wrth greu cyswllt newydd
 DefaultStatusEmptyMandatory=Yn wag ond yn orfodol
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/cy_GB/ticket.lang b/htdocs/langs/cy_GB/ticket.lang
index cd780e29517..774793349b6 100644
--- a/htdocs/langs/cy_GB/ticket.lang
+++ b/htdocs/langs/cy_GB/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Addasu tocynnau
 Permission56003=Dileu tocynnau
 Permission56004=Rheoli tocynnau
 Permission56005=Gweld tocynnau pob trydydd parti (ddim yn effeithiol ar gyfer defnyddwyr allanol, bob amser yn gyfyngedig i'r trydydd parti y maent yn dibynnu ar)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=Tocyn - Mathau
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Cyfrannwr allanol
 OriginEmail=Ebost y Gohebydd
 Notify_TICKET_SENTBYMAIL=Anfon neges tocyn trwy e-bost
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Darllen
 Assigned=Wedi'i neilltuo
@@ -183,7 +186,7 @@ CreatedBy=Crëwyd gan
 NewTicket=Tocyn Newydd
 SubjectAnswerToTicket=Ateb tocyn
 TicketTypeRequest=Math o gais
-TicketCategory=Categoreiddio tocynnau
+TicketCategory=Ticket group
 SeeTicket=Gweler tocyn
 TicketMarkedAsRead=Mae'r tocyn wedi'i farcio fel wedi'i ddarllen
 TicketReadOn=Darllen ymlaen
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index bfce7602092..3c7a39a0c0f 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Aktivér kombinationsliste for datterselskabskonto (ka
 ACCOUNTING_DATE_START_BINDING=Definer en dato for start af binding og overførsel i regnskab. Under denne dato overføres transaktionerne ikke til regnskab.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ved regnskabsoverførsel, hvilken periode er valgt som standard
 
-ACCOUNTING_SELL_JOURNAL=Salgsjournal (salg og returnering)
-ACCOUNTING_PURCHASE_JOURNAL=Købsjournal (køb og returnering)
-ACCOUNTING_BANK_JOURNAL=Kassekladde (kvitteringer og udbetalinger)
+ACCOUNTING_SELL_JOURNAL=Salgsjournal - salg og returnering
+ACCOUNTING_PURCHASE_JOURNAL=Købsjournal - køb og returnering
+ACCOUNTING_BANK_JOURNAL=Kassekladde - ind- og udbetalinger
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Udgiftskladde
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Almindelig journal
 ACCOUNTING_HAS_NEW_JOURNAL=Ny Journal
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Dette vil slette alle linjer i regnskabet for året/måneden og
 ConfirmDeleteMvtPartial=Dette vil slette transaktionen fra regnskabet (alle linjer relateret til den samme transaktion vil blive slettet)
 FinanceJournal=Finanskladde
 ExpenseReportsJournal=Udgiftskladder
+InventoryJournal=Lagerjournal
 DescFinanceJournal=Regnskabskladde inkl. alle betalingstyper med bankkonto
 DescJournalOnlyBindedVisible=Dette er en oversigt over poster, der er bundet til en regnskabskonto og kan registreres i tidsskrifterne og hovedbogen.
 VATAccountNotDefined=Momskonto ikke defineret
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 7cc08f19041..1a87b301475 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Maks. antal linjer til widgets
 AllWidgetsWereEnabled=Alle tilgængelige widgets er aktiveret
+WidgetAvailable=Widget tilgængelig
 PositionByDefault=Standardrækkefølge
 Position=Position
 MenusDesc=Menumanager indstiller indholdet af de to menulinjer (vandret og lodret).
@@ -374,7 +375,7 @@ DoTestSendHTML=Test afsendelse af HTML
 ErrorCantUseRazIfNoYearInMask=Fejl, kan ikke bruge option @ til at nulstille tælleren hvert år, hvis sekvensen {yy} eller {yyyy} ikke er i masken.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fejl, kan ikke bruge option @, hvis sekvensen {yy}{mm} eller {yyyy}{mm} ikke er i masken.
 UMask=UMask parameter for nye filer på Unix/Linux/BSD/Mac filsystem.
-UMaskExplanation=Denne parameter giver dig mulighed for at definere rettigheder sat som standard på filer oprettet af Dolibarr på serveren (under upload for eksempel).<br>Det skal være den Oktale værdi (f.eks. betyder 0666 læse og skrive rettigheder for alle).<br>Denne parameter bruges ikke på en Windows-server.
+UMaskExplanation=Denne parameter giver dig mulighed for at definere tilladelser sat som standard på filer oprettet af Dolibarr på serveren (under upload for eksempel). <br> Det skal være den oktale værdi (f.eks. betyder 0666 læse og skrive for alle.). Den anbefalede værdi er 0600 eller 0660 <br> Denne parameter er ubrugelig på en Windows-server.
 SeeWikiForAllTeam=Tag et kig på Wiki-siden for en liste over bidragydere og deres organisation
 UseACacheDelay= Forsinkelse for cachelagring af eksport svar i sekunder (0 eller tom for ingen cache)
 DisableLinkToHelpCenter=Skjul linket "<b>Brug for hjælp eller support</b>" på login-siden
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind konverteringsmuligheder
 Module3200Name=Uforanderlige arkiver
 Module3200Desc=Aktiver en uforanderlig log over forretningsbegivenheder. Begivenheder arkiveres i realtid. Loggen er en skrivebeskyttet tabel over kædede hændelser, der kan eksporteres. Dette modul er obligatorisk i nogle lande.
 Module3300Name=Modulbygger
-Module3200Desc=Aktiver en uforanderlig log over forretningsbegivenheder. Begivenheder arkiveres i realtid. Loggen er en skrivebeskyttet tabel over kædede hændelser, der kan eksporteres. Dette modul er obligatorisk i nogle lande.
+Module3300Desc=Et RAD (Rapid Application Development - lav kode og ingen kode) værktøj til at hjælpe udviklere eller avancerede brugere med at bygge deres eget modul/applikation.
 Module3400Name=Sociale netværk
 Module3400Desc=Aktiver sociale netværksfelter til tredjeparter og adresser (Skype, Twitter, Facebook, ...).
 Module4000Name=Personaleadministration
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Brug en tilstand med lav hukommelse
 ExportUseLowMemoryModeHelp=Brug tilstanden med lav hukommelse til at generere dump-filen (komprimering sker gennem et rør i stedet for ind i PHP-hukommelsen). Denne metode tillader ikke at kontrollere, at filen er komplet, og fejlmeddelelsen kan ikke rapporteres, hvis den mislykkes. Brug det, hvis du oplever ikke nok hukommelsesfejl.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface til at fange dolibarr-udløsere og sende det til en URL
+ModuleWebhookDesc = Interface til at fange dolibarr-udløsere og sende data om hændelsen til en URL
 WebhookSetup = Webhook opsætning
 Settings = Indstillinger
 WebhookSetupPage = Webhook opsætningsside
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Advarsel: modulet %s har indsti
 WarningModuleHasChangedSecurityCsrfParameter=Advarsel: modulet %s har deaktiveret CSRF-sikkerheden for din instans. Denne handling er mistænkelig, og din installation er muligvis ikke længere sikret. Kontakt venligst forfatteren af modulet for forklaring.
 EMailsInGoingDesc=Indgående e-mails administreres af modulet %s. Du skal aktivere og konfigurere det, hvis du har brug for at understøtte indgående e-mails.
 MAIN_IMAP_USE_PHPIMAP=Brug PHP-IMAP-biblioteket til IMAP i stedet for native PHP IMAP. Dette tillader også brugen af en OAuth2-forbindelse til IMAP (modulet OAuth skal også være aktiveret).
+MAIN_CHECKBOX_LEFT_COLUMN=Vis kolonnen for felt- og linjevalg til venstre (til højre som standard)
+
+CSSPage=CSS stil
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index 8bdaee3825d..fd2a437462d 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -118,6 +118,27 @@ BoxCustomersOutstandingBillReached=Kunder med en udestående grænse nået
 UsersHome=Hjemmebrugere og grupper
 MembersHome=Hjemmemedlemskab
 ThirdpartiesHome=Hjemme-tredjeparter
+productindex=Hjem produkter og tjenester
+mrpindex=Hjem MRP
+commercialindex=Kommerciel hjemme
+projectsindex=Hjemmeprojekter
+invoiceindex=Hjem fakturaer
+hrmindex=Hjem fakturaer
 TicketsHome=Hjem billetter
+stockindex=Hjem aktier
+sendingindex=Hjemfragt
+receptionindex=Hjemmodtagelser
+activityindex=Hjemmeaktivitet
+proposalindex=Boligforslag
+ordersindex=Hjem ordrer
+orderssuppliersindex=Hjem ordrer leverandører
+contractindex=Hjem kontrakter
+interventionindex=Hjemlige indgreb
+suppliersproposalsindex=Forslag til boligleverandører
+donationindex=Hjem donationer
+specialexpensesindex=Udgifter til specialtilbud i hjemmet
+expensereportindex=Udgiftsrapport for hjemmet
+mailingindex=Hjemmepost
+opensurveyindex=Hjem åben undersøgelse
 AccountancyHome=Hjemregnskab
 ValidatedProjects=Validerede projekter
diff --git a/htdocs/langs/da_DK/ecm.lang b/htdocs/langs/da_DK/ecm.lang
index aadd50b447c..50d410f66e4 100644
--- a/htdocs/langs/da_DK/ecm.lang
+++ b/htdocs/langs/da_DK/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=DMS / ECM område
 ECMAreaDesc=DMS / ECM (Document Management System / Electronic Content Management) -området giver dig mulighed for at gemme, dele og søge hurtigt alle slags dokumenter i Dolibarr.
 ECMAreaDesc2a=* Manual mapper kan bruges til at gemme dokumenter, der ikke er knyttet til et bestemt element.
 ECMAreaDesc2b=* Automatiske mapper udfyldes automatisk, når du tilføjer dokumenter fra siden af et element.
-ECMAreaDesc3=* Medias mapper er filer i underbiblioteket <b> /medias </b> i dokumentbiblioteket, læsbare af alle uden behov for at blive logget og uden behov for at få filen delt eksplicit. Det bruges til at gemme billedfiler fra e-mail eller webstedsmodul.
+ECMAreaDesc3=* Medias mapper er filer i underbiblioteket <b> /medias </b> i dokumentbiblioteket, læsbare af alle uden behov for at blive logget og uden behov for at få filen delt eksplicit. Det bruges til at gemme billedfiler til for eksempel e-mail- eller hjemmesidemodulet.
 ECMSectionWasRemoved=<b>Directory %s</b> er blevet slettet.
 ECMSectionWasCreated=Katalog <b> %s </b> er blevet oprettet.
 ECMSearchByKeywords=Søg på nøgleord
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 1739bd8c8fe..6970140be26 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -262,6 +262,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Fejl, parameter <b> %s </b> skal a
 ErrorLoginDateValidity=Fejl, dette login er uden for gyldighedsdatointervallet
 ErrorValueLength=Feltets længde '<b> %s </b>' skal være højere end '<b> %s </b>'
 ErrorReservedKeyword=Ordet '<b> %s </b>' er et forbeholdt nøgleord
+ErrorFilenameReserved=Filnavnet <b> %s </b> kan ikke bruges, da det er en reserveret og beskyttet kommando.
 ErrorNotAvailableWithThisDistribution=Ikke tilgængelig med denne distribution
 ErrorPublicInterfaceNotEnabled=Offentlig grænseflade var ikke aktiveret
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Sprog for den nye side skal defineres, hvis det er indstillet som en oversættelse af en anden side
@@ -308,7 +309,7 @@ ErrorExistingPermission = Tilladelse <b> %s </b> for objekt <b> %s </b> findes a
 ErrorFieldExist=Værdien for <b> %s </b> findes allerede
 ErrorEqualModule=Modul ugyldigt i <b> %s </b>
 ErrorFieldValue=Værdien for <b> %s </b> er forkert
-ErrorCoherenceMenu= <b> %s </b> er påkrævet, når <b> % </b> er lig med VENSTRE
+ErrorCoherenceMenu= <b> %s </b> er påkrævet, når <b> %s a09a4b739f17left'0 er '
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) er højere end PHP-parameter post_max_size (%s). Dette er ikke en ensartet opsætning.
diff --git a/htdocs/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang
index 4784f2f4fe5..e18aa70ba87 100644
--- a/htdocs/langs/da_DK/interventions.lang
+++ b/htdocs/langs/da_DK/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Skjuler timer og minutter fra datofeltet for indgr
 InterventionStatistics=Statistikker af indgreb
 NbOfinterventions=Antal interventionskort
 NumberOfInterventionsByMonth=Antal interventionskort efter måned (dato for bekræftelse)
-AmountOfInteventionNotIncludedByDefault=Indgreb beløb er ikke medtaget som standard i overskud (i de fleste tilfælde benyttes tidsskemaer til at tælle tid). Tilføj valgmulighed PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT til 1 i home setup-andre for at inkludere dem.
+AmountOfInteventionNotIncludedByDefault=Interventionsbeløb er ikke som standard inkluderet i overskuddet (i de fleste tilfælde bruges timesedler til at tælle brugt tid). Du kan bruge PROJECT_ELEMENTS_FOR_ADD_MARGIN og PROJECT_ELEMENTS_FOR_MINUS_MARGIN valgmuligheden i home-setup-other for at fuldføre listen over elementer inkluderet i profit.
 InterId=Indgrebs id
 InterRef=Indgreb ref.
 InterDateCreation=Dato oprettelse for indgreb
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 990dd9266d7..81314c1e241 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=E-mails fra filen
 MailingModuleDescEmailsFromUser=Emails indlæst af brugeren
 MailingModuleDescDolibarrUsers=Brugere med e-mails
-MailingModuleDescThirdPartiesByCategories=Tredjeparter (efter kategorier)
+MailingModuleDescThirdPartiesByCategories=Tredje partier
 SendingFromWebInterfaceIsNotAllowed=Afsendelse fra webgrænseflade er ikke tilladt.
 EmailCollectorFilterDesc=Alle filtre skal matche for at en e-mail bliver indsamlet
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Post oprettet af Email Collector %s fra e-mail %s
 DefaultBlacklistMailingStatus=Standardværdi for feltet '%s' ved oprettelse af en ny kontaktperson
 DefaultStatusEmptyMandatory=Tom men obligatorisk
 WarningLimitSendByDay=ADVARSEL: Opsætningen eller kontrakten for din instans begrænser dit antal e-mails pr. dag til <b>%s</b>. Forsøg på at sende mere kan resultere i, at din instans bliver langsommere eller suspenderet. Kontakt venligst din support, hvis du har brug for en højere kvote.
+NoMoreRecipientToSendTo=Ikke flere modtagere at sende e-mailen til
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 5a33e5b69d0..d953a53564c 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -514,6 +514,7 @@ NotYetAvailable=Ikke tilgængelig endnu 
 NotAvailable=Ikke til rådighed
 Categories=Tags/kategorier
 Category=Tags/kategori
+SelectTheTagsToAssign=Vælg de tags/kategorier, der skal tildeles
 By=Ved
 From=Fra
 FromDate=Fra
@@ -1223,5 +1224,6 @@ AddToContacts=Tilføj adresse til mine kontakter
 LastAccess=Sidste adgang
 UploadAnImageToSeeAPhotoHere=Upload et billede fra fanen %s for at se et billede her
 LastPasswordChangeDate=Dato for sidste ændring af adgangskode
-PublicVirtualCardUrl=Virtuel visitkortside
+PublicVirtualCardUrl=Virtuelt visitkortside URL
+PublicVirtualCard=Virtuelt visitkort
 TreeView=Træ oversigt
diff --git a/htdocs/langs/da_DK/margins.lang b/htdocs/langs/da_DK/margins.lang
index 94e6a992cee..c4fc58bd086 100644
--- a/htdocs/langs/da_DK/margins.lang
+++ b/htdocs/langs/da_DK/margins.lang
@@ -6,6 +6,7 @@ TotalMargin=Total margen
 MarginOnProducts=Margen / Produkter
 MarginOnServices=Margin / Services
 MarginRate=Margen sats
+ModifyMarginRates=Rediger marginsatser
 MarkRate=Mark rate
 DisplayMarginRates=Vis margen satser
 DisplayMarkRates=Vis markeringsrenter
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index f9159214a1e..5afe331dcb9 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -4,6 +4,8 @@ MemberCard=Medlem kortet
 SubscriptionCard=Subscription kortet
 Member=Medlem
 Members=Medlemmer
+NoRecordedMembers=Ingen registrerede medlemmer
+NoRecordedMembersByType=Ingen registrerede medlemmer
 ShowMember=Vis medlemskort
 UserNotLinkedToMember=Brugeren ikke er knyttet til et medlem
 ThirdpartyNotLinkedToMember=Tredjepart, der ikke er knyttet til et medlem
@@ -233,3 +235,4 @@ CreateDolibarrThirdPartyDesc=En tredjepart er den juridiske enhed, der vil blive
 MemberFirstname=Medlemmets fornavn
 MemberLastname=Medlemmets efternavn
 MemberCodeDesc=Medlemskode, unik for alle medlemmer
+NoRecordedMembers=Ingen registrerede medlemmer
diff --git a/htdocs/langs/da_DK/mrp.lang b/htdocs/langs/da_DK/mrp.lang
index 22b926c5ef5..db7573d80a4 100644
--- a/htdocs/langs/da_DK/mrp.lang
+++ b/htdocs/langs/da_DK/mrp.lang
@@ -119,3 +119,6 @@ BomCantAddChildBom=Nomenklaturen %s er allerede til stede i træet, der fører t
 BOMNetNeeds = Stykliste nettobehov
 BOMProductsList=BOMs produkter
 BOMServicesList=BOMs ydelser
+Manufacturing=Fremstilling
+Disassemble=Skille ad
+ProducedBy=Produceret af
diff --git a/htdocs/langs/da_DK/partnership.lang b/htdocs/langs/da_DK/partnership.lang
index a45f85923a4..db38e31ed60 100644
--- a/htdocs/langs/da_DK/partnership.lang
+++ b/htdocs/langs/da_DK/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Partnerskab: Tjek henvisende backlink
 # Menu
 #
 NewPartnership=Nyt partnerskab
-NewPartnershipbyWeb= Dit partnerskab blev tilføjet med succes.
+NewPartnershipbyWeb=Din partnerskabsanmodning er blevet tilføjet. Vi kontakter dig muligvis snart...
 ListOfPartnerships=Liste over partnerskab
 
 #
diff --git a/htdocs/langs/da_DK/ticket.lang b/htdocs/langs/da_DK/ticket.lang
index 14f5fcde62b..d76b0d980e7 100644
--- a/htdocs/langs/da_DK/ticket.lang
+++ b/htdocs/langs/da_DK/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Lavet af
 NewTicket=Ny sag
 SubjectAnswerToTicket=Sags svar
 TicketTypeRequest=Anmodningstype
-TicketCategory=Sagskategorisering
+TicketCategory=Billetgruppe
 SeeTicket=Se sag
 TicketMarkedAsRead=Sagen er blevet markeret som læst
 TicketReadOn=Læs videre
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index eec8f32e6ee..cf46e719d05 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -173,9 +173,7 @@ Ref=Nummer
 RefSupplier=Lieferantennummer
 RefPayment=Zahlungs-Nr.
 ActionsToDo=Aktionen zur Erledigung
-ActionsToDoShort=Zu erledigen
 ActionRunningNotStarted=Nicht begonnen
-ActionRunningShort=In Bearbeitung
 LatestLinkedEvents=Die neuesten %s verknüpften Vorgänge
 CompanyFoundation=Firma / Organisation
 ContactsForCompany=Ansprechpartner/Adressen dieses Geschäftspartners
@@ -185,8 +183,6 @@ ActionsOnContact=Ereignisse zu diesem Kontakt
 ActionsOnContract=Ereignisse zu diesem Vertrag
 ActionsOnMember=Aktionen zu diesem Mitglied
 ActionsOnProduct=Vorgänge zu diesem Produkt
-ToDo=Zu erledigen
-Running=In Bearbeitung
 RequestAlreadyDone=Anfrage bereits bekannt
 Generate=Erstelle
 DolibarrStateBoard=Datenbankstatistiken
diff --git a/htdocs/langs/de_CH/ticket.lang b/htdocs/langs/de_CH/ticket.lang
index af534077747..953bd7d53ce 100644
--- a/htdocs/langs/de_CH/ticket.lang
+++ b/htdocs/langs/de_CH/ticket.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - ticket
 TypeContact_ticket_external_SUPPORTCLI=Kundenkontakt / Störfallverfolgung
 Read=Lesen
-InProgress=In Bearbeitung
 TicketCloseOn=Schliessungsdatum
 TicketAddIntervention=Einsatz erstellen
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 521161d3f8f..e204ee91b47 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Combo-Liste für Nebenkonto aktivieren (kann langsam s
 ACCOUNTING_DATE_START_BINDING=Definieren Sie ein Datum, an dem die Bindung und Übertragung in der Buchhaltung beginnen soll. Transaktionen vor diesem Datum werden nicht in die Buchhaltung übertragen.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Welcher Zeitraum ist beim Buchhaltungstransfer standardmäßig ausgewählt?
 
-ACCOUNTING_SELL_JOURNAL=Verkaufsjournal (Verkäufe und Retouren)
-ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal (Käufe und Retouren)
-ACCOUNTING_BANK_JOURNAL=Kassenbuch (Einnahmen und Ausgaben)
+ACCOUNTING_SELL_JOURNAL=Verkaufsjournal - Verkäufe und Retouren
+ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal - Käufe und Retouren
+ACCOUNTING_BANK_JOURNAL=Kassenbuch - Einnahmen und Ausgaben
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Spesen-Abrechnungs-Journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Sammeljournal
 ACCOUNTING_HAS_NEW_JOURNAL=Eröffnungsjournal
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Dadurch werden alle Buchungszeilen für das Jahr/den Monat und/
 ConfirmDeleteMvtPartial=Hierdurch wird die Transaktion aus der Buchhaltung gelöscht (alle Zeilen, die sich auf dieselbe Transaktion beziehen, werden gelöscht).
 FinanceJournal=Finanzjournal
 ExpenseReportsJournal=Spesenabrechnungsjournal
+InventoryJournal=Bestandsjournal
 DescFinanceJournal=Finanzjournal inklusive aller Arten von Zahlungen mit Bankkonto
 DescJournalOnlyBindedVisible=Dies ist eine Ansicht von Datensätzen, denen ein Buchungskonto zugeordnet ist und die in den Journalen und im Hauptbuch erfasst werden können.
 VATAccountNotDefined=Steuerkonto nicht definiert
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 9ebc81795f1..cc92cfc6c3c 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Maximale Zeilenanzahl in Widgets
 AllWidgetsWereEnabled=Alle verfügbaren Widgets sind bereits aktiviert.
+WidgetAvailable=Widget verfügbar
 PositionByDefault=Standardposition
 Position=Position
 MenusDesc=In der Menüverwaltung können Sie den Inhalt der beiden Menüleisten (Oben und Links) festlegen
@@ -374,7 +375,7 @@ DoTestSendHTML=Zum Testen HTML zusenden
 ErrorCantUseRazIfNoYearInMask=Fehler: die Option @ kann nicht benutzt werden, um den Zähler jährlich zurück zu setzen, wenn die Sequenz {yy} oder {yyyy} in der Maske fehlt.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fehler: Kann Option @ nicht verwenden, wenn Sequenz {mm}{yy} oder {mm}{yyyy} nicht im Schema verwendet werden.
 UMask=UMask-Parameter für neue Dateien auf Unix/Linux/BSD-Dateisystemen.
-UMaskExplanation=Über diesen Parameter können Sie die standardmäßigen Dateiberechtigungen für vom System erzeugte/verwaltete Inhalte festlegen. <br>Erforderlich ist ein Oktalwert (0666 bedeutet z.B. Lesen und Schreiben für alle). <br>Auf Windows-Umgebungen haben diese Einstellungen keinen Effekt.
+UMaskExplanation=Mit diesem Parameter können Sie Berechtigungen definieren, die standardmäßig für Dateien festgelegt werden, die von Dolibarr auf dem Server erstellt wurden (z. B. während des Hochladens). <br> Es muss ein Oktalwert sein (z. B. bedeutet 0666 Lesen und Schreiben für alle). Empfohlener Wert ist 0600 oder 0660 <br> Dieser Parameter ist auf einem Windows-Server nutzlos.
 SeeWikiForAllTeam=Werfen Sie einen Blick auf die Wiki-Seite für eine vollständige Liste aller Mitwirkenden und deren Organisationen
 UseACacheDelay= Verzögerung für den Export der Cache-Antwort in Sekunden (0 oder leer für kein Caching)
 DisableLinkToHelpCenter=Link "<b>Brauche Hilfe oder Support</b>" auf der Login-Seite ausblenden
@@ -663,9 +664,9 @@ Module2900Desc=GeoIP Maxmind Konvertierung
 Module3200Name=Unveränderliche Archive
 Module3200Desc=Aktivieren Sie ein unveränderliches Protokoll von Geschäftsereignissen. Ereignisse werden in Echtzeit archiviert. Das Protokoll ist eine schreibgeschützte Tabelle mit verketteten Ereignissen, die exportiert werden können. Dieses Modul kann für einige Länder zwingend erforderlich sein.
 Module3300Name=Module-Builder
-Module3200Desc=Aktivieren Sie ein unveränderliches Protokoll von Geschäftsereignissen. Ereignisse werden in Echtzeit archiviert. Das Protokoll ist eine schreibgeschützte Tabelle mit verketteten Ereignissen, die exportiert werden können. Dieses Modul kann für einige Länder zwingend erforderlich sein.
+Module3300Desc=Ein RAD-Tool (Rapid Application Development – Low-Code und No-Code), das Entwicklern oder fortgeschrittenen Benutzern hilft, ihre eigenen Module/Anwendungen zu erstellen.
 Module3400Name=Soziale Netzwerke
-Module3400Desc=Aktiviert Felder für soziale Netzwerke für Dritte und Adressen (Skype, Twitter, Facebook, ...).
+Module3400Desc=Aktiviert Felder für soziale Netzwerke für Geschäftspartner und Kontakte (Skype, Twitter, Facebook, ...).
 Module4000Name=Personal
 Module4000Desc=Personalverwaltung
 Module5000Name=Mandantenfähigkeit
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Verwenden Sie einen Low-Memory-Modus
 ExportUseLowMemoryModeHelp=Verwenden Sie den Low-Memory-Modus, um die Dump-Datei zu generieren (die Komprimierung erfolgt über eine Pipe statt in den PHP-Speicher). Mit dieser Methode kann nicht überprüft werden, ob die Datei vollständig ist, und es kann keine Fehlermeldung gemeldet werden, wenn der Vorgang fehlschlägt. Verwenden Sie diesen Modus, wenn Sie die Fehlermeldung "nicht genügend Speicher" erhalten.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Schnittstelle zum Abfangen von Dolibarr-Triggern und zum Senden an eine URL
+ModuleWebhookDesc = Schnittstelle zum Abfangen von Dolibarr-Triggern und Senden von Daten des Ereignisses an eine URL
 WebhookSetup = Webhook-Einrichtung
 Settings = Einstellungen
 WebhookSetupPage = Webhook-Einrichtungsseite
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Achtung: Das Modul %s hat einen
 WarningModuleHasChangedSecurityCsrfParameter=Warnung: Das Modul %s hat die CSRF-Sicherheit Ihrer Instanz deaktiviert. Diese Aktion ist verdächtig und Ihre Installation ist möglicherweise nicht mehr gesichert. Bitte wenden Sie sich zur Erläuterung an den Autor des Moduls.
 EMailsInGoingDesc=Eingehende E-Mails werden vom Modul %s verwaltet. Sie müssen es aktivieren und konfigurieren, wenn Sie eingehende E-Mails unterstützen müssen.
 MAIN_IMAP_USE_PHPIMAP=Verwenden Sie die PHP-IMAP-Bibliothek für IMAP anstelle von nativem PHP-IMAP. Dies ermöglicht auch die Verwendung einer OAuth2-Verbindung für IMAP (Modul OAuth muss ebenfalls aktiviert sein).
+MAIN_CHECKBOX_LEFT_COLUMN=Spalte für Feld- und Zeilenauswahl links anzeigen (standardmäßig rechts)
+
+CSSPage=CSS-Style
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 21627668e2e..ff43c0816ca 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -118,6 +118,27 @@ BoxCustomersOutstandingBillReached=Kunden mit erreichtem Aussenstände-Limit
 UsersHome=Start Benutzer und Gruppen
 MembersHome=Start Mitgliedschaft
 ThirdpartiesHome=Start Geschäftspartner
+productindex=Startseite Produkte und Leistungen
+mrpindex=Startseite MRP
+commercialindex=Startseite Einkauf | Vertrieb
+projectsindex=Startseite Projekte
+invoiceindex=Startseite Rechnungen
+hrmindex=Startseite Personalwesen
 TicketsHome=Start Tickets
+stockindex=Startseite Warenlager
+sendingindex=Startseite Lieferungen
+receptionindex=Startseite Wareneingänge
+activityindex=Startseite Aufgaben | Tätigkeiten
+proposalindex=Startseite Angebote
+ordersindex=Startseite Kundenaufträge
+orderssuppliersindex=Startseite Lieferantenbestellungen
+contractindex=Startseite Verträge
+interventionindex=Startseite Serviceaufträge
+suppliersproposalsindex=Startseite Lieferantenangebote
+donationindex=Startseite Spenden
+specialexpensesindex=Startseite Steuern | Sozialabgaben
+expensereportindex=Startseite Spesenabrechnungen
+mailingindex=Startseite E-Mail-Kampagnen
+opensurveyindex=Startseite Umfragen
 AccountancyHome=Start Buchhaltung
 ValidatedProjects=Validierte Projekte
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index f5a10c0deb2..54c6632e3df 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=DMS/ECM Bereich
 ECMAreaDesc=Der Bereich DMS/ECM (Document Management System / Electronic Content Management) ermöglicht Ihnen das schnelle Speichern, Teilen und Durchsuchen von Dokumenten aller Art in Dolibarr.
 ECMAreaDesc2a=* Manuelle Verzeichnisse können verwendet werden, um Dokumente zu speichern, die nicht mit einem bestimmten Element verknüpft sind.
 ECMAreaDesc2b=* Automatische Verzeichnisse werden automatisch gefüllt, wenn Dokumente von der Seite eines Elements hinzugefügt werden.
-ECMAreaDesc3=* Medienverzeichnis umfasst Dateien im Unterverzeichnis <b> /medias</b> des Dokumentenverzeichnisses, die von jedem gelesen werden können, ohne dass eine Anmeldung erforderlich ist und die Datei nicht explizit freigegeben werden muss. Es wird verwendet, um Bilddateien von E-Mail- oder Website-Modulen zu speichern.
+ECMAreaDesc3=* Medienverzeichnisse sind Dateien im Unterverzeichnis <b> /medias </b> des Dokumentenverzeichnisses, die von jedem gelesen werden können, ohne dass eine Anmeldung erforderlich ist und die Datei nicht explizit freigegeben werden muss. Darin werden beispielsweise Bilddateien für das E-Mail- oder Website-Modul gespeichert.
 ECMSectionWasRemoved=Verzeichnis <b>%s</b> wurde gelöscht.
 ECMSectionWasCreated=Verzeichnis <b>%s</b> wurde erstellt.
 ECMSearchByKeywords=Suche nach Stichwörtern
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 0f51b201082..b069d878900 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -262,6 +262,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Fehler, Parameter <b> %s </b> muss
 ErrorLoginDateValidity=Fehler, diese Anmeldung liegt außerhalb des Gültigkeitszeitraums
 ErrorValueLength=Die Länge des Feldes '<b> %s </b>' muss höher sein als '<b> %s </b>'.
 ErrorReservedKeyword=Das Wort '<b> %s </b>' ist ein reserviertes Schlüsselwort
+ErrorFilenameReserved=Der Dateiname <b>%s</b> kann nicht verwendet werden, da es sich um einen reservierten und geschützten Befehl handelt.
 ErrorNotAvailableWithThisDistribution=Nicht verfügbar mit dieser Version
 ErrorPublicInterfaceNotEnabled=Öffentliche Schnittstelle wurde nicht aktiviert
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Die Sprache der neuen Seite muss definiert werden, wenn sie als Übersetzung einer anderen Seite festgelegt ist
@@ -308,7 +309,7 @@ ErrorExistingPermission = Berechtigung <b>%s</b> für Objekt <b>%s</b> existiert
 ErrorFieldExist=Der Wert für <b>%s</b> existiert bereits
 ErrorEqualModule=Modul ungültig in <b>%s</b>
 ErrorFieldValue=Der Wert für <b>%s</b> ist falsch
-ErrorCoherenceMenu= <b>%s</b> ist erforderlich, wenn <b>%</b> LEFT ist
+ErrorCoherenceMenu= <b>%s</b> ist erforderlich, wenn <b>%s</b> 'left' ist
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 5a7e2d3142f..658581c66df 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Stunden- und Minutenfelder beim Datum von Einsatze
 InterventionStatistics=Statistik Serviceaufträge
 NbOfinterventions=Anzahl Dokumente für Serviceaufträge
 NumberOfInterventionsByMonth=Anzahl Dokumente für Serviceaufträge pro Monat (Freigabedatum)
-AmountOfInteventionNotIncludedByDefault=Der Beitrag der Einsätze ist normalerweise nicht im Umsatz enthalten. (In den meisten Fällen werden die Einsatzstunden separat erfasst). Die globale Option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT auf 1 setzen, damit diese berücksichtigt werden.
+AmountOfInteventionNotIncludedByDefault=Der Umsatz der Serviceaufträge wird standardmäßig nicht in den Gewinn einbezogen (in den meisten Fällen werden Stundenzettel verwendet, um die aufgewendete Zeit zu zählen). Sie können die Optionen PROJECT_ELEMENTS_FOR_ADD_MARGIN und PROJECT_ELEMENTS_FOR_MINUS_MARGIN in home-setup-other verwenden, um die Liste der in den Gewinn einbezogenen Elemente zu vervollständigen.
 InterId=Serviceauftrag ID
 InterRef=Serviceauftrag Ref.
 InterDateCreation=Erstellungszeitpunkt Serviceauftrag
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 7bce9acc096..081c24ed61c 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Kontakte nach Position
 MailingModuleDescEmailsFromFile=E-Mail-Adressen aus csv-Datei importieren
 MailingModuleDescEmailsFromUser=E-Mail-Adresse durch manuelle Eingabe hinzufügen
 MailingModuleDescDolibarrUsers=Benutzer mit E-Mail-Adresse
-MailingModuleDescThirdPartiesByCategories=Geschäftspartner (nach Kategorien)
+MailingModuleDescThirdPartiesByCategories=Geschäftspartner
 SendingFromWebInterfaceIsNotAllowed=Versand vom Webinterface ist nicht erlaubt
 EmailCollectorFilterDesc=Alle Filter müssen übereinstimmen, damit eine E-Mail erfasst wird
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Datensatz, der vom E-Mail-Sammler %s aus der E-Mai
 DefaultBlacklistMailingStatus=Standardwert für Feld '%s' beim Anlegen eines neuen Kontakts
 DefaultStatusEmptyMandatory=Leer aber erforderlich
 WarningLimitSendByDay=WARNUNG: Die Konfiguration oder der Vertrag Ihrer Instanz begrenzt Ihre Anzahl von E-Mails pro Tag auf <b> %s </b>. Der Versuch mehr zu senden kann dazu führen, dass Ihre Instanz langsamer wird oder ausgesetzt wird. Bitte wenden Sie sich an Ihren Support, wenn Sie ein höheres Kontingent benötigen.
+NoMoreRecipientToSendTo=Kein weiteren Empfänger, an die die E-Mail gesendet werden kann
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 56e9c337bfe..98e4591335e 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -472,13 +472,13 @@ CommercialProposalsShort=Angebote
 Comment=Kommentar
 Comments=Kommentare
 ActionsToDo=Aufgaben
-ActionsToDoShort=zu erledigen
+ActionsToDoShort=Zu erledigen
 ActionsDoneShort=Erledigt
 ActionNotApplicable=Nicht anwendbar
 ActionRunningNotStarted=zu beginnen
-ActionRunningShort=in Bearbeitung
+ActionRunningShort=In Bearbeitung
 ActionDoneShort=Abgeschlossen
-ActionUncomplete=Unvollständig
+ActionUncomplete=Offen
 LatestLinkedEvents=Zuletzt verknüpfte Ereignisse (maximal %s)
 CompanyFoundation=Firma oder Institution
 Accountant=Buchhalter
@@ -492,9 +492,9 @@ ActionsOnMember=Ereignisse zu diesem Mitglied
 ActionsOnProduct=Ereignisse zu diesem Produkt
 ActionsOnAsset=Ereignisse für dieses Anlagegut
 NActionsLate=%s verspätet
-ToDo=zu erledigen
+ToDo=Zu erledigen
 Completed=Abgeschlossen
-Running=in Bearbeitung
+Running=In Bearbeitung
 RequestAlreadyDone=Überweisungsauftrag ist bereits erstellt
 Filter=Filter
 FilterOnInto=Suchkriterium '<strong>%s</strong>'  ist in den Feldern %s
@@ -514,6 +514,7 @@ NotYetAvailable=Noch nicht verfügbar
 NotAvailable=Nicht verfügbar
 Categories=Kategorien
 Category=Suchwort/Kategorie
+SelectTheTagsToAssign=Wählen Sie die zuzuweisenden Kategorien/Schlagworte aus
 By=Durch
 From=Von
 FromDate=Von
@@ -1223,5 +1224,6 @@ AddToContacts=Adresse zu meinen Kontakten hinzufügen
 LastAccess=Letzter Zugriff
 UploadAnImageToSeeAPhotoHere=Laden Sie ein Bild auf der Registerkarte %s hoch, um hier ein Foto zu sehen
 LastPasswordChangeDate=Datum der letzten Passwortänderung
-PublicVirtualCardUrl=Virtuelle Visitenkartenseite
+PublicVirtualCardUrl=URL der virtuellen Visitenkartenseite
+PublicVirtualCard=Virtuelle Visitenkarte
 TreeView=Baumansicht
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index a03f864fecd..7bd49394a24 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -6,6 +6,7 @@ TotalMargin=Gewinnspanne gesamt
 MarginOnProducts=Gewinnspanne / Produkte
 MarginOnServices=Gewinnspanne / Leistungen
 MarginRate=Gewinnspannen-Rate
+ModifyMarginRates=Gewinnspannen ändern
 MarkRate=Gewinnspannen-Rate
 DisplayMarginRates=Zeige Gewinnspannen-Raten an
 DisplayMarkRates=Zeige Gewinnspannen-Raten an
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index 0c6595f5d04..64160bacd49 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -4,6 +4,8 @@ MemberCard=Mitglied – Übersicht
 SubscriptionCard=Mitgliedschaft – Übersicht
 Member=Mitglied
 Members=Mitglieder
+NoRecordedMembers=Keine registrierten Mitglieder
+NoRecordedMembersByType=Keine registrierten Mitglieder
 ShowMember=Zeige Mitgliedskarte
 UserNotLinkedToMember=Der Benutzer ist keinem Mitglied zugewiesen
 ThirdpartyNotLinkedToMember=Geschäftspartner hat keine Verknüpfung zu einem Mitglied
@@ -233,3 +235,4 @@ CreateDolibarrThirdPartyDesc=Der Geschäftspartner ist der Rechnungsempfänger,
 MemberFirstname=Vorname des Mitglieds
 MemberLastname=Nachname des Mitglieds
 MemberCodeDesc=Mitgliedsnummer, individuell für alle Mitglieder
+NoRecordedMembers=Keine registrierten Mitglieder
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index 339079761f1..37dc33a3423 100644
--- a/htdocs/langs/de_DE/mrp.lang
+++ b/htdocs/langs/de_DE/mrp.lang
@@ -119,3 +119,6 @@ BomCantAddChildBom=Die Nomenklatur %s ist bereits im Baum vorhanden, der zur Nom
 BOMNetNeeds = BOM-Nettobedarf
 BOMProductsList=BOM-Produkte
 BOMServicesList=BOM-Leistungen
+Manufacturing=Fertigung
+Disassemble=Demontage
+ProducedBy=Hergestellt von
diff --git a/htdocs/langs/de_DE/partnership.lang b/htdocs/langs/de_DE/partnership.lang
index de9ceb49567..0f008e1c83a 100644
--- a/htdocs/langs/de_DE/partnership.lang
+++ b/htdocs/langs/de_DE/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Partnerschaft: Überprüfen Sie den verweisenden Backli
 # Menu
 #
 NewPartnership=Neue Partnerschaft
-NewPartnershipbyWeb= Ihre Partnerschaft wurde erfolgreich hinzugefügt.
+NewPartnershipbyWeb=Ihre Partnerschaftsanfrage wurde erfolgreich hinzugefügt. Wir werden uns in Kürze mit Ihnen in Verbindung setzen...
 ListOfPartnerships=Liste der Partnerschaften
 
 #
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index 6360717dcc4..c719ea80a1e 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -67,7 +67,7 @@ ExportDataset_ticket_1=Tickets
 # Status
 Read=Gelesen
 Assigned=Zugewiesen
-InProgress=in Bearbeitung
+InProgress=In Bearbeitung
 NeedMoreInformation=Warten auf Feedback des Erstellers
 NeedMoreInformationShort=Warten auf Feedback
 Answered=Beantwortet
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 7aa219573b5..bbb759a6490 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Ενεργοποίηση σύνθετης λίστας
 ACCOUNTING_DATE_START_BINDING=Καθορίστε ημερομηνία έναρξης δεσμεύσεων & μεταφοράς στη λογιστική. Πριν από αυτή την ημερομηνία, οι συναλλαγές δεν θα μεταφερθούν στη λογιστική.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ποια είναι η προεπιλεγμένη περίοδος στη λογιστική μεταφορά;
 
-ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων (πωλήσεις και επιστροφές)
-ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγοράς (αγορές και επιστροφές)
-ACCOUNTING_BANK_JOURNAL=Ημερολόγιο μετρητών (εισπράξεις και εκταμιεύσεις)
+ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων - πωλήσεις και επιστροφές
+ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών - αγορές και επιστροφές
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Ημερολόγιο εξόδων
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Γενικό ημερολόγιο
 ACCOUNTING_HAS_NEW_JOURNAL=Έχει νέο περιοδικό
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Αυτό θα διαγράψει όλες τις γραμμές
 ConfirmDeleteMvtPartial=Αυτό θα διαγράψει τη συναλλαγή από τη λογιστική (όλες οι γραμμές που σχετίζονται με την ίδια συναλλαγή θα διαγραφούν)
 FinanceJournal=Ημερολόγιο χρηματοοικονομικών
 ExpenseReportsJournal=Ημερολόγιο αναφοράς εξόδων
+InventoryJournal=Ημερολόγιο απογραφής
 DescFinanceJournal=Ημερολόγιο χρηματοοικονομικών που περιλαμβάνει όλους τους τύπους πληρωμών μέσω τραπεζικού λογαριασμού
 DescJournalOnlyBindedVisible=Αυτή είναι μια προβολή αρχείων που είναι δεσμευμένα σε έναν λογιστικό λογαριασμό και μπορούν να καταγραφούν στα Ημερολόγια και στο Καθολικό.
 VATAccountNotDefined=Δεν έχει οριστεί λογαριασμός για ΦΠΑ
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 5dbf7939e27..328b5590aec 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -145,6 +145,7 @@ Box=Γραφικό στοιχείο
 Boxes=Γραφικά στοιχεία
 MaxNbOfLinesForBoxes=Μέγιστο πλήθος γραμμών για τα widgets
 AllWidgetsWereEnabled=Όλα τα διαθέσιμα γραφικά στοιχεία είναι ενεργοποιημένα
+WidgetAvailable=Διαθέσιμο γραφικό στοιχείο
 PositionByDefault=Προκαθορισμένη σειρά
 Position=Θέση
 MenusDesc=Οι διαχειριστές μενού ορίζουν το περιεχόμενο των δύο γραμμών μενού (οριζόντια και κάθετα).
@@ -374,7 +375,7 @@ DoTestSendHTML=Δοκιμή αποστολής HTML
 ErrorCantUseRazIfNoYearInMask=Σφάλμα, δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ για να μηδενίσετε το μετρητή για κάθε έτος, εάν η ακολουθία {yy} ή {yyyy} δεν είναι στη μάσκα.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ αν η ακολουθία {yy}{mm} ή {yyyy}{mm} δεν είναι στην μάσκα.
 UMask=Παράμετρος UMask για νέα αρχεία σε συστήματα αρχείων συστημάτων Unix/Linux/BSD/Mac.
-UMaskExplanation=Αυτή η παράμετρος σας επιτρέπει να ορίσετε προεπιλεγμένα δικαιώματα αρχείων για αρχεία που δημιουργεί το Dolibarr στον διακομιστή (κατά την διάρκεια μεταφόρτωσης π.χ.).<br>Πρέπει να είναι οκταδικής μορφής (για παράδειγμα, 0666 που σημαίνει εγγραφή και ανάγνωση για όλους).<br>Αυτή η παράμετρος είναι άχρηστη σε διακομιστές Windows.
+UMaskExplanation=Αυτή η παράμετρος σάς επιτρέπει να ορίσετε δικαιώματα που έχουν οριστεί από προεπιλογή σε αρχεία που δημιουργούνται από το Dolibarr στον διακομιστή (για παράδειγμα κατά τη μεταφόρτωση). <br> Πρέπει να είναι η οκταδική τιμή (για παράδειγμα, 0666 που σημαίνει ανάγνωση και εγγραφή για όλους.). Η συνιστώμενη τιμή είναι 0600 ή 0660 <br> Αυτή η παράμετρος αφορά διακομιστή Windows.
 SeeWikiForAllTeam=Δείτε στη σελίδα του Wiki τη λίστα με τους συντελεστές και τους οργανισμούς τους
 UseACacheDelay= Καθυστέρηση για την ανταπόκριση εξαγωγής προσωρινής μνήμης σε δευτερόλεπτα (0 ή κενό για μη χρήση προσωρινής μνήμης)
 DisableLinkToHelpCenter=Απόκρυψη του συνδέσμου " <b> Χρειάζεστε βοήθεια ή υποστήριξη </b> " στη σελίδα σύνδεσης
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Αναλλοίωτα αρχεία
 Module3200Desc=Ενεργοποιήστε ένα αναλλοίωτο αρχείο καταγραφής επιχειρηματικών εκδηλώσεων. Τα συμβάντα αρχειοθετούνται σε πραγματικό χρόνο. Το αρχείο καταγραφής είναι ένας πίνακας μόνο για ανάγνωση των αλυσιδωτών συμβάντων που μπορούν να εξαχθούν. Αυτή η ενότητα μπορεί να είναι υποχρεωτική για ορισμένες χώρες.
 Module3300Name=Module Builder
-Module3200Desc=Ενεργοποιήστε ένα αναλλοίωτο αρχείο καταγραφής επιχειρηματικών εκδηλώσεων. Τα συμβάντα αρχειοθετούνται σε πραγματικό χρόνο. Το αρχείο καταγραφής είναι ένας πίνακας μόνο για ανάγνωση των αλυσιδωτών συμβάντων που μπορούν να εξαχθούν. Αυτή η ενότητα μπορεί να είναι υποχρεωτική για ορισμένες χώρες.
+Module3300Desc=Ένα εργαλείο RAD (Rapid Application Development - low-code and no-code) εργαλείο που βοηθά τους προγραμματιστές ή προχωρημένους χρήστες να δημιουργήσουν τη δική τους ενότητα/εφαρμογή.
 Module3400Name=Κοινωνικά Δίκτυα
 Module3400Desc=Ενεργοποιήστε τα πεδία Κοινωνικών Δικτύων σε τρίτα μέρη και διευθύνσεις (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Χρησιμοποιήστε low memory mode
 ExportUseLowMemoryModeHelp=Χρησιμοποιήστε τη λειτουργία χαμηλής μνήμης για να δημιουργήσετε το αρχείου αντιγράφου ασφαλείας (η συμπίεση γίνεται μέσω pipe αντί της μνήμης PHP). Αυτή η μέθοδος δεν επιτρέπει τον έλεγχο ακεραιότητας του αρχείου και δεν μπορεί να αναφερθεί μήνυμα σφάλματος εάν αποτύχει. Χρησιμοποιήστε το εάν αντιμετωπίζετε αρκετά σφάλματα μνήμης.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Διεπαφή για αποστολή σε μια διεύθυνση URL ενεργειών του Dolibarr
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Ρύθμιση webhook
 Settings = Ρυθμίσεις
 WebhookSetupPage = Σελίδα ρύθμισης Webhook
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Προειδοποίηση: η
 WarningModuleHasChangedSecurityCsrfParameter=Προειδοποίηση: η ενότητα %s έχει απενεργοποιήσει την ασφάλεια CSRF της εγκατάστασης σας. Αυτή η ενέργεια είναι ύποπτη και η εγκατάστασή σας ενδέχεται να μην είναι πλέον ασφαλής. Επικοινωνήστε με τον δημιουργό της ενότητας για εξηγήσεις.
 EMailsInGoingDesc=Η διαχείριση των εισερχόμενων email γίνεται από τη ενότητα %s. Πρέπει να την ενεργοποιήσετε και να την διαμορφώσετε εάν χρειάζεται να υποστηρίζετε εισερχόμενα email.
 MAIN_IMAP_USE_PHPIMAP=Χρησιμοποιήστε τη βιβλιοθήκη PHP-IMAP για IMAP αντί για εγγενή PHP IMAP. Αυτό επιτρέπει επίσης τη χρήση μιας σύνδεσης OAuth2 για IMAP (η μονάδα OAuth πρέπει επίσης να είναι ενεργοποιημένη).
+MAIN_CHECKBOX_LEFT_COLUMN=Εμφάνιση της στήλης για την επιλογή πεδίου και γραμμής στα αριστερά (στα δεξιά από προεπιλογή)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index 03f769b4c26..fd1584adf2d 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -118,6 +118,27 @@ BoxCustomersOutstandingBillReached=Πελάτες που έχουν φτάσει
 UsersHome=Χρήστες και ομάδες
 MembersHome=Μέλη
 ThirdpartiesHome=Τρίτα μέρη
+productindex=Προϊόντα και υπηρεσίες
+mrpindex=MRP
+commercialindex=Εμπορικό
+projectsindex=Έργα
+invoiceindex=Τιμολόγια
+hrmindex=Τιμολόγια
 TicketsHome=Εισιτήρια
+stockindex=Αποθέματα
+sendingindex=Αποστολές
+receptionindex=Παραλαβές
+activityindex=Δραστηριότητα
+proposalindex=Home proposal
+ordersindex=Παραγγελίες
+orderssuppliersindex=Home orders suppliers
+contractindex=Home contracts
+interventionindex=Home interventions
+suppliersproposalsindex=Home suppliers proposals
+donationindex=Δωρεές
+specialexpensesindex=Home specials expenses
+expensereportindex=Home expensereport
+mailingindex=Home mailing
+opensurveyindex=Home opensurvey
 AccountancyHome=Λογιστική
 ValidatedProjects=Επικυρωμένα έργα
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index 872c78f4733..812492237fc 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=Περιοχή DMS / ECM
 ECMAreaDesc=Η περιοχή DMS / ECM (Συστήματα Διαχείρισης Εγγράφων / Ηλεκτρονική Διαχείριση Περιεχομένου) σας επιτρέπει να αποθηκεύετε, να μοιράζεστε και να αναζητάτε γρήγορα όλα τα είδη εγγράφων στο Dolibarr.
 ECMAreaDesc2a=* Οι μη αυτόματοι κατάλογοι μπορούν να χρησιμοποιηθούν για την αποθήκευση εγγράφων που δεν συνδέονται με ένα συγκεκριμένο στοιχείο.
 ECMAreaDesc2b=* Οι αυτόματοι κατάλογοι συμπληρώνονται αυτόματα κατά την προσθήκη εγγράφων από τη σελίδα ενός στοιχείου.
-ECMAreaDesc3=* Οι κατάλογοι πολυμέσων είναι φάκελοι στον υποκατάλογο <b> /medias </b> του καταλόγου εγγράφων, αναγνώσιμα από όλους χωρίς να χρειάζεται συνδεση. Χρησιμοποιούνται για την αποθήκευση αρχείων εικόνας από ηλεκτρονική αλληλογραφία ή κάποια ενότητα του  ιστότοπου.
+ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=Ο κατάλογος <b> %s </b> έχει διαγραφεί.
 ECMSectionWasCreated=Ο κατάλογος <b>%s</b> έχει δημιουργηθεί.
 ECMSearchByKeywords=Αναζήτηση με λέξεις-κλειδιά
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 05e04990296..543000ad11c 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -262,6 +262,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Σφάλμα, η παράμετρ
 ErrorLoginDateValidity=Σφάλμα, αυτή η σύνδεση είναι εκτός του εύρους ημερομηνιών εγκυρότητας
 ErrorValueLength=Το μήκος του πεδίου ' <b> %s </b> ' πρέπει να είναι μεγαλύτερο από το ' <b> %s </b>'
 ErrorReservedKeyword=Η λέξη "<b> %s </b>" είναι μια δεσμευμένη λέξη-κλειδί
+ErrorFilenameReserved=Το όνομα αρχείου <b> %s </b> δεν μπορεί να χρησιμοποιηθεί καθώς είναι μια δεσμευμένη και προστατευμένη εντολή.
 ErrorNotAvailableWithThisDistribution=Δεν διατίθεται με αυτήν τη διανομή
 ErrorPublicInterfaceNotEnabled=Η δημόσια διεπαφή δεν ενεργοποιήθηκε
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Η γλώσσα της νέας σελίδας πρέπει να οριστεί εάν είναι μετάφραση άλλης σελίδας
@@ -308,7 +309,7 @@ ErrorExistingPermission = Η άδεια <b> %s </b> για το αντικείμ
 ErrorFieldExist=Η τιμή για <b> %s </b> υπάρχει ήδη
 ErrorEqualModule=Μη έγκυρη ενότητα στο <b> %s </b>
 ErrorFieldValue=Η τιμή για <b> %s </b> είναι λανθασμένη
-ErrorCoherenceMenu= <b> %s </b> απαιτείται όταν <b> % </b> ισούται με LEFT
+ErrorCoherenceMenu= <b> %s </b> απαιτείται όταν το <b> %s </b> είναι 'αριστερά'
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτή δεν είναι μια συνεπής ρύθμιση.
diff --git a/htdocs/langs/el_GR/hrm.lang b/htdocs/langs/el_GR/hrm.lang
index 0721140f6e8..ebe2aa29762 100644
--- a/htdocs/langs/el_GR/hrm.lang
+++ b/htdocs/langs/el_GR/hrm.lang
@@ -26,8 +26,8 @@ HRM_DEFAULT_SKILL_DESCRIPTION=Προεπιλεγμένη περιγραφή τω
 deplacement=Ωράριο
 DateEval=Ημερομηνία αξιολόγησης
 JobCard=Καρτέλα θέσεων εργασίας
-JobPosition=Περιγραφή εργασίας
-JobsPosition=Περιγραφές εργασιών
+JobProfile=Περιγραφή εργασίας
+JobsProfiles=Περιγραφές εργασιών
 NewSkill=Νέα Δεξιότητα
 SkillType=Τύπος δεξιότητας
 Skilldets=Λίστα βαθμών για αυτήν την δεξιότητα
@@ -46,14 +46,14 @@ NewEval=Νέα αξιολόγηση
 ValidateEvaluation=Επικύρωση αξιολόγησης
 ConfirmValidateEvaluation=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την αξιολόγηση με αναφορά <b> %s </b>;
 EvaluationCard=Καρτέλα αξιολόγησης
-RequiredRank=Απαιτούμενη κατάταξη για αυτή τη θέση εργασίας
+RequiredRank=Required rank for the job profile
 EmployeeRank=Κατάταξη υπαλλήλου για αυτήν την δεξιότητα
 EmployeePosition=Θέση υπαλλήλου
 EmployeePositions=Θέσεις υπαλλήλων
 EmployeesInThisPosition=Υπάλληλοι σε αυτή τη θέση
 group1ToCompare=Ομάδα χρηστών για ανάλυση
 group2ToCompare=Δεύτερη ομάδα χρηστών για σύγκριση
-OrJobToCompare=Σύγκριση βάση των απαραίτητων εργασιακών δεξιοτήτων
+OrJobToCompare=Συγκρίνετε με τις απαιτήσεις δεξιοτήτων ενός προφίλ εργασίας
 difference=Διαφορά
 CompetenceAcquiredByOneOrMore=Ικανότητα που αποκτήθηκε από έναν ή περισσότερους χρήστες αλλά δεν ζητήθηκε από τον δεύτερο αξιολογητή
 MaxlevelGreaterThan=Μέγιστο επίπεδο μεγαλύτερο από το ζητούμενο
diff --git a/htdocs/langs/el_GR/interventions.lang b/htdocs/langs/el_GR/interventions.lang
index a88e3346568..d309057d3d6 100644
--- a/htdocs/langs/el_GR/interventions.lang
+++ b/htdocs/langs/el_GR/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Απόκρυψη ωρών και λεπτών το
 InterventionStatistics=Στατιστικά παρεμβάσεων
 NbOfinterventions=Αριθ. Καρτών παρέμβασης
 NumberOfInterventionsByMonth=Αριθμός καρτών παρέμβασης ανά μήνα (ημερομηνία επικύρωσης)
-AmountOfInteventionNotIncludedByDefault=Το ποσό της παρέμβασης δεν περιλαμβάνεται εξ ορισμού στο κέρδος (στις περισσότερες περιπτώσεις, τα φύλλα καταγραφής χρόνου χρησιμοποιούνται για τον υπολογισμό του χρόνου που δαπανάται). Προσθέστε την επιλογή PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT στο 1 στο Αρχική-Ρυθμίσεις-Άλλες Ρυθμίσεις για να τις συμπεριλάβετε.
+AmountOfInteventionNotIncludedByDefault=Το ποσό της παρέμβασης δεν περιλαμβάνεται εξ ορισμού στο κέρδος (στις περισσότερες περιπτώσεις, τα φύλλα χρόνου χρησιμοποιούνται για τον υπολογισμό του χρόνου που δαπανάται). Μπορείτε να χρησιμοποιήσετε τις επιλογές PROJECT_ELEMENTS_FOR_ADD_MARGIN και PROJECT_ELEMENTS_FOR_MINUS_MARGIN από το μενού Αρχική-Ρυθμίσεις-Άλλες ρυθμίσεις για να συμπληρώσετε τη λίστα των στοιχείων που περιλαμβάνονται στο κέρδος.
 InterId=Αναγνωριστικό παρέμβασης
 InterRef=Αναφ παρέμβασης
 InterDateCreation=Ημερομηνία δημιουργίας παρέμβασης
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 9965724bf0f..99793dd8a22 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -7,14 +7,14 @@ MailCard=Κάρτελα email
 MailRecipients=Παραλήπτες
 MailRecipient=Παραλήπτης
 MailTitle=Περιγραφή
-MailFrom=Αποστολέας
+MailFrom=Από
 MailErrorsTo=Σφάλματα σε
 MailReply=Απάντηση σε
-MailTo=Παραλήπτης(ες)
+MailTo=Προς
 MailToUsers=Προς
 MailCC=Κοινοποίηση σε
 MailToCCUsers=Κοινοποίηση σε χρήστη(ες)
-MailCCC=Cached copy to
+MailCCC=Αποθηκευμένο αντίγραφο σε
 MailTopic=Θέμα Email
 MailText=Μήνυμα
 MailFile=Επισυναπτόμενα Αρχεία
@@ -43,7 +43,7 @@ MailSuccessfulySent=Το email (από %s προς %s) απεστάλη επιτ
 MailingSuccessfullyValidated=Το email επικυρώθηκε με επιτυχία
 MailUnsubcribe=Κατάργηση εγγραφής
 MailingStatusNotContact=Να μην χρησιμοποιείται
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=Διαβάστε και καταργήστε την εγγραφή σας στην λίστα email
 ErrorMailRecipientIsEmpty=Το πεδίο παραλήπτη του email είναι κενό
 WarningNoEMailsAdded=Δεν υπάρχει νέο email για προσθήκη στη λίστα παραληπτών.
 ConfirmValidMailing=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτό το email;
@@ -79,19 +79,19 @@ GroupEmails=Ομαδικά email
 OneEmailPerRecipient=Ένα email ανά παραλήπτη (από προεπιλογή, επιλεγμένο ένα email ανά εγγραφή)
 WarningIfYouCheckOneRecipientPerEmail=Προειδοποίηση, εάν επιλέξετε αυτό το πλαίσιο, σημαίνει ότι θα σταλεί μόνο ένα email για πολλές διαφορετικές επιλεγμένες εγγραφές, επομένως, εάν το μήνυμά σας περιέχει μεταβλητές αντικατάστασης που αναφέρονται σε δεδομένα μιας εγγραφής, δεν θα είναι δυνατή η αντικατάστασή τους.
 ResultOfMailSending=Αποτέλεσμα μαζικής αποστολής email
-NbSelected=Ο αριθμός είναι επιλεγμένος
+NbSelected=Επιλέχθηκε ο αριθμός
 NbIgnored=Ο αριθμός αγνοήθηκε
-NbSent=Ο αριθμός αποστέλλεται
+NbSent=Ο αριθμός εστάλη
 SentXXXmessages=%s μήνυμα(τα) στάλθηκαν.
-ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
-MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
-MailingModuleDescContactsByCompanyCategory=Επαφές ανά κατηγορία τρίτων
+ConfirmUnvalidateEmailing=Είστε σίγουροι ότι θέλετε να αλλάξετε το email <b> %s </b> σε κατάσταση προσχεδίου;
+MailingModuleDescContactsWithThirdpartyFilter=Επαφή με φίλτρα πελατών
+MailingModuleDescContactsByCompanyCategory=Επαφές ανά κατηγορία τρίτων μερών
 MailingModuleDescContactsByCategory=Επαφές ανά κατηγορία
 MailingModuleDescContactsByFunction=Επαφές ανά θέση
-MailingModuleDescEmailsFromFile=Τα μηνύματα ηλεκτρονικού ταχυδρομείου από το αρχείο
-MailingModuleDescEmailsFromUser=Εισαγωγή μηνυμάτων ηλεκτρονικού ταχυδρομείου από το χρήστη
-MailingModuleDescDolibarrUsers=Χρήστες με μηνύματα ηλεκτρονικού ταχυδρομείου
-MailingModuleDescThirdPartiesByCategories=Τρίτα μέρη (κατά κατηγορίες)
+MailingModuleDescEmailsFromFile=Email από το αρχείο
+MailingModuleDescEmailsFromUser=Email από τον χρήστη
+MailingModuleDescDolibarrUsers=Χρήστες με email
+MailingModuleDescThirdPartiesByCategories=Τρίτα μέρη
 SendingFromWebInterfaceIsNotAllowed=Η αποστολή από τη διεπαφή ιστού δεν επιτρέπεται.
 EmailCollectorFilterDesc=Όλα τα φίλτρα πρέπει να ταιριάζουν για να συλλεχθεί ένα email
 
@@ -99,9 +99,9 @@ EmailCollectorFilterDesc=Όλα τα φίλτρα πρέπει να ταιριά
 LineInFile=Γραμμή %s στο αρχείο
 RecipientSelectionModules=Ορίζονται αιτήματα για την επιλογή του παραλήπτη
 MailSelectedRecipients=Επιλεγμένοι αποδέκτες
-MailingArea=Emailings περιοχή
+MailingArea=Τομεας Emailings
 LastMailings=Τελευταία %s email
-TargetsStatistics=Στατιστικά στοχων
+TargetsStatistics=Στατιστικά στόχων
 NbOfCompaniesContacts=Μοναδικές επαφές/διευθύνσεις
 MailNoChangePossible=Παραλήπτες με επικυρωμένες ηλεκτρονικές διευθύνσεις δεν μπορούν να αλλάξουν
 SearchAMailing=Αναζήτηση αλληλογραφίας
@@ -116,10 +116,10 @@ ToClearAllRecipientsClickHere=Κάντε κλικ εδώ για να διαγρ
 ToAddRecipientsChooseHere=Προσθέστε παραλήπτες επιλέγοντας από τις λίστες
 NbOfEMailingsReceived=Μαζικές αποστολές έλαβαν
 NbOfEMailingsSend=Μαζική αλληλογραφία αποστέλλεται
-IdRecord=ID record
-DeliveryReceipt=Delivery Ack.
+IdRecord=ID εγγραφής
+DeliveryReceipt=Αναφορά παράδοσης
 YouCanUseCommaSeparatorForSeveralRecipients=Μπορείτε να χρησιμοποιήσετε το <b>κόμμα</b> σαν διαχωριστή για να καθορίσετε πολλούς παραλήπτες.
-TagCheckMail=Παρακολούθηση άνοιγμα της αλληλογραφίας
+TagCheckMail=Παρακολούθηση ανοίγματος email
 TagUnsubscribe=Σύνδεσμος απεγγραφής
 TagSignature=Υπογραφή του χρήστη αποστολής
 EMailRecipient=Email παραλήπτη
@@ -137,22 +137,22 @@ ListOfNotificationsDone=Λίστα όλων των αυτόματων ειδοπ
 MailSendSetupIs=Διαμόρφωση αποστολή email έχει ρυθμιστεί σε '%s'. Αυτή η λειτουργία δεν μπορεί να χρησιμοποιηθεί για να σταλθούν μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs2=Θα πρέπει πρώτα να πάτε, με έναν λογαριασμό διαχειριστή, στο μενού %s Αρχική - Ρύθμιση - Emails %s για να αλλάξετε την παράμετρο <strong>'%s'</strong> για να χρησιμοποιήσετε τη λειτουργία '%s'. Με αυτόν τον τρόπο, μπορείτε να μεταβείτε στις ρυθμίσεις του διακομιστή SMTP παρέχεται από τον Internet Service Provider και να χρησιμοποιήσετε τη Μαζική αποστολή ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs3=Αν έχετε οποιαδήποτε απορία σχετικά με το πώς να ρυθμίσετε το διακομιστή SMTP σας, μπορείτε να ζητήσετε στο %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+YouCanAlsoUseSupervisorKeyword=Μπορείτε επίσης να προσθέσετε τη λέξη-κλειδί <strong> __SUPERVISOREMAIL__ </strong> για την αποστολή email στον επόπτη του χρήστη (λειτουργεί μόνο εάν έχει οριστεί ένα email για αυτόν τον επόπτη)
 NbOfTargetedContacts=Τρέχων αριθμός των στοχευμένων ηλεκτρονικών μηνυμάτων της επαφής
-UseFormatFileEmailToTarget=Imported file must have format <strong>email;name;firstname;other</strong>
-UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstname;other</strong>
+UseFormatFileEmailToTarget=Το εισαγόμενο αρχείο πρέπει να έχει τη μορφή <strong> email;name;firstname;other </strong>
+UseFormatInputEmailToTarget=Εισάγετε μια συμβολοσειρά με μορφή <strong> email;name;firstname;other </strong>
 MailAdvTargetRecipients=Παραλήπτες (προχωρημένη επιλογή)
 AdvTgtTitle=Συμπληρώστε τα πεδία εισαγωγής για να επιλέξετε εκ των προτέρων τα τρίτα μέρη ή τις επαφές / διευθύνσεις που θέλετε να στοχεύσετε
-AdvTgtSearchTextHelp=Χρησιμοποιήστε το  ως χαρακτήρες μπαλαντέρ. Για παράδειγμα, για να βρείτε όλα τα στοιχεία όπως <b> jean, joe, jim </b> , μπορείτε να πληκτρολογήσετε %%<b>, μπορείτε επίσης να χρησιμοποιήσετε το σύμβολο ; ως διαχωριστικό για την τιμη και να χρησιμοποιήσετε το σύμβολο ! για να εξαιρέσετε κάποιες τιμές από την αναζήτηση. Για παράδειγμα η αναζήτηση<b> jean;joe;jim%%;!jimo;!jima%% </b> θα στοχεύει σε όλες τις τιμές που περιέχουν  jean και joe, σε αυτές που ξεκινούν με jim αλλά όχι με jimo και σε καμιά που ξεκινάει με jima
+AdvTgtSearchTextHelp=Χρησιμοποιήστε τα  %% ως χαρακτήρες μπαλαντέρ. Για παράδειγμα, για να βρείτε όλα τα στοιχεία όπως <b> jean, joe, jim </b> , μπορείτε να πληκτρολογήσετε <b>j%%</b>, μπορείτε επίσης να χρησιμοποιήσετε το σύμβολο ; ως διαχωριστικό για την τιμή και να χρησιμοποιήσετε το σύμβολο ! για να εξαιρέσετε κάποιες τιμές από την αναζήτηση. Για παράδειγμα η αναζήτηση<b> jean;joe;jim%%;!jimo;!jima%% </b> θα στοχεύσει όλες τις τιμές που περιέχουν  jean και joe, σε αυτές που ξεκινούν με jim αλλά όχι με jimo και σε καμιά που ξεκινάει με jima
 AdvTgtSearchIntHelp=Χρησιμοποιήστε το διάστημα για να επιλέξετε τιμή int ή float
 AdvTgtMinVal=Ελάχιστη τιμή
 AdvTgtMaxVal=Μέγιστη τιμή
-AdvTgtSearchDtHelp=Use interval to select date value
-AdvTgtStartDt=Start dt.
-AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Στόχευση ηλεκτρονικού ταχυδρομείου τρίτου μέρους και ηλεκτρονικού ταχυδρομείου της επαφής τρίτου μέρους, ή απλώς ηλεκτρονικού ταχυδρομείου τρίτου μέρους ή απλά ηλεκτρονικού ταχυδρομείου επικοινωνίας
+AdvTgtSearchDtHelp=Χρησιμοποιήστε το διάστημα για να επιλέξετε την τιμή ημερομηνίας
+AdvTgtStartDt=Ημερ. Έναρξης
+AdvTgtEndDt=Ημερ. Λήξης
+AdvTgtTypeOfIncudeHelp=Εmail τρίτου μέρους και email επαφής τρίτου μέρους ή απλώς email τρίτου μέρους ή απλώς email επαφής
 AdvTgtTypeOfIncude=Τύπος στοχευμένου email
-AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
+AdvTgtContactHelp=Χρησιμοποιήστε μόνο εάν στοχεύετε επαφή σε "Τύπος στοχευμένου email"
 AddAll=Προσθήκη όλων
 RemoveAll=Αφαίρεση όλων
 ItemsCount=Αντικείμενο(α)
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Εγγραφή που δημιουργήθηκε 
 DefaultBlacklistMailingStatus=Προεπιλεγμένη τιμή για το πεδίο '%s' κατά τη δημιουργία μιας νέας επαφής
 DefaultStatusEmptyMandatory=Κενό αλλά υποχρεωτικό
 WarningLimitSendByDay=ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η ρύθμιση ή η σύμβαση της εγκατάστασης σας περιορίζει τον αριθμό των email σας ανά ημέρα σε <b> %s </b> . Η προσπάθεια αποστολής περισσότερων ενδέχεται να έχει ως αποτέλεσμα την επιβράδυνση ή την αναστολή της εγκατάστασης σας. Επικοινωνήστε με την υποστήριξή σας εάν χρειάζεστε υψηλότερο όριο.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang
index 48dd84e4e9c..ba60d016dd2 100644
--- a/htdocs/langs/el_GR/margins.lang
+++ b/htdocs/langs/el_GR/margins.lang
@@ -6,6 +6,7 @@ TotalMargin=Συνολικό Περιθώριο
 MarginOnProducts=Περιθώριο / Προϊόντα
 MarginOnServices=Περιθώριο / Υπηρεσίες
 MarginRate=Ποσοστό περιθωρίου επί της %%
+ModifyMarginRates=Τροποποίηση ποσοστών περιθωρίου
 MarkRate=Ποσοστό Κέρδους
 DisplayMarginRates=Εμφάνιση ποσοστών περιθωρίου
 DisplayMarkRates=Εμφάνιση ποσοστών κέρδους
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index a710eed77ef..44423555b45 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -4,6 +4,8 @@ MemberCard=Καρτέλα μελών
 SubscriptionCard=Καρτέλα συνδρομής
 Member=Μέλος
 Members=Μέλη
+NoRecordedMembers=Δεν υπάρχουν εγγεγραμμένα μέλη
+NoRecordedMembersByType=Δεν υπάρχουν εγγεγραμμένα μέλη
 ShowMember=Εμφάνιση καρτέλας μέλους
 UserNotLinkedToMember=Ο χρήστης δεν συνδέετε με κάποιο μέλος
 ThirdpartyNotLinkedToMember=Το τρίτο μέρος δεν συνδέεται με κάποιο μέλος
@@ -233,3 +235,4 @@ CreateDolibarrThirdPartyDesc=Ένα τρίτο μέρος είναι η νομι
 MemberFirstname=Όνομα μέλους
 MemberLastname=Επώνυμο μέλους
 MemberCodeDesc=Κωδικός μέλους, μοναδικός για όλα τα μέλη
+NoRecordedMembers=Δεν υπάρχουν εγγεγραμμένα μέλη
diff --git a/htdocs/langs/el_GR/partnership.lang b/htdocs/langs/el_GR/partnership.lang
index 305cba8f54b..38542c95eeb 100644
--- a/htdocs/langs/el_GR/partnership.lang
+++ b/htdocs/langs/el_GR/partnership.lang
@@ -20,6 +20,7 @@ ModulePartnershipName=Διαχείριση συνεργασιών
 PartnershipDescription=Ενότητα Διαχείριση Συνεργασιών
 PartnershipDescriptionLong= Ενότητα Διαχείριση Συνεργασιών
 Partnership=Συνεργασία
+Partnerships=Συνεργασίες
 AddPartnership=Προσθήκη συνεργασίας
 CancelPartnershipForExpiredMembers=Συνεργασία: Ακύρωση συνεργασίας μελών με συνδρομές που έχουν λήξει
 PartnershipCheckBacklink=Συνεργασία: Ελέγξτε την παραπομπή backlink
@@ -28,6 +29,7 @@ PartnershipCheckBacklink=Συνεργασία: Ελέγξτε την παραπ
 # Menu
 #
 NewPartnership=Νέα Συνεργασία
+NewPartnershipbyWeb=Το αίτημα συνεργασίας σας προστέθηκε με επιτυχία. Θα επικοινωνήσουμε μαζί σας σύντομα...
 ListOfPartnerships=Λίστα συνεργασιών
 
 #
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index 399e7de949b..69ca78e5a47 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Δημιουργήθηκε από
 NewTicket=Νέο ticket
 SubjectAnswerToTicket=Απάντηση σε ticket
 TicketTypeRequest=Τύπος αιτήματος
-TicketCategory=Κατηγοριοποίηση ticket
+TicketCategory=Κατηγορία ticket
 SeeTicket=Δείτε το ticket
 TicketMarkedAsRead=Το ticket έχει επισημανθεί ως αναγνωσμένο
 TicketReadOn=Συνέχισε να διαβάζεις
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0c74aaa13b6..babdb350bda 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -375,7 +375,7 @@ DoTestSendHTML=Test sending HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -2373,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 0414854a3f4..f04ee17575c 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -176,7 +176,7 @@ Answered=Answered
 IsNotAnAnswer=Is not answer (initial email)
 IsAnAnswer=Is an answer of an initial email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
-DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact 
+DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
-NoMoreRecipientToSendTo=No more recipient to send the email to
\ No newline at end of file
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/es_CO/mails.lang b/htdocs/langs/es_CO/mails.lang
index 6c419c6cb77..8267c6f906c 100644
--- a/htdocs/langs/es_CO/mails.lang
+++ b/htdocs/langs/es_CO/mails.lang
@@ -5,7 +5,6 @@ EMailings=e-mailing
 AllEMailings=Todos los e-mailings
 MailCard=Tarjeta de e-mailing
 MailRecipient=Recipiente
-MailFrom=De
 MailTo=A
 MailToUsers=Para usuario(s)
 MailCC=Copiar a
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index c4411ff9984..7c5b09a8e40 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Habilite la lista combinada para la cuenta subsidiaria
 ACCOUNTING_DATE_START_BINDING=Defina una fecha para comenzar a vincular y transferir en contabilidad. Por debajo de esta fecha, las transacciones no se transferirán a contabilidad.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En la transferencia de contabilidad, ¿cuál es el período seleccionado por defecto?
 
-ACCOUNTING_SELL_JOURNAL=Diario de ventas (ventas y devoluciones)
-ACCOUNTING_PURCHASE_JOURNAL=Diario de compras (compras y devoluciones)
-ACCOUNTING_BANK_JOURNAL=Libro de caja (recibos y desembolsos)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Informe de gastos diario
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario general
 ACCOUNTING_HAS_NEW_JOURNAL=Tiene un nuevo diario
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Esto eliminará todas las líneas de contabilidad para el año/
 ConfirmDeleteMvtPartial=Esto eliminará la transacción de la contabilidad (se eliminarán todas las líneas relacionadas con la misma transacción)
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
+InventoryJournal=Diario de inventario
 DescFinanceJournal=El diario financiero incluye todos los tipos de pagos por cuenta bancaria
 DescJournalOnlyBindedVisible=Esta es una vista de registro que está vinculada a una cuenta de contabilidad y se puede registrar en Diarios y Libro mayor.
 VATAccountNotDefined=Cuenta contable para IVA no definida
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 6867b574d01..450d4e6462f 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -145,6 +145,7 @@ Box=Panel
 Boxes=Paneles
 MaxNbOfLinesForBoxes=Número máximo de líneas para paneles
 AllWidgetsWereEnabled=Todos los widgets disponibles están habilitados
+WidgetAvailable=Widget available
 PositionByDefault=Posición por defecto
 Position=Posición
 MenusDesc=Los gestores de menús definen el contenido de las dos barras de menú (horizontal y vertical)
@@ -374,7 +375,7 @@ DoTestSendHTML=Probar envío HTML
 ErrorCantUseRazIfNoYearInMask=Error: no puede utilizar la opción @ para reiniciar el contador cada año si la secuencia {yy} o {yyyy} no se encuentra en la máscara.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, no se puede usar la opción @ si la secuencia {yy}{mm} o {yyyy}{mm} no se encuentra en la máscara.
 UMask=Parámetro UMask de nuevos archivos en Unix/Linux/BSD.
-UMaskExplanation=Este parámetro determina los derechos de los archivos creados en el servidor Dolibarr (durante la subida, por ejemplo).<br>Este debe ser el valor octal (por ejemplo, 0666 significa lectura / escritura para todos).<br>Este parámetro no tiene ningún efecto sobre un servidor Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Vea el wiki para más detalles de todos los contribuidores y de su organización
 UseACacheDelay= Demora en caché de la exportación en segundos (0 o vacio sin caché)
 DisableLinkToHelpCenter=Ocultar el enlace "<b>Necesita ayuda o soporte</b>" en la página de acceso a la aplicación
@@ -663,7 +664,7 @@ Module2900Desc=Capacidades de conversión GeoIP Maxmind
 Module3200Name=Archivos inalterables
 Module3200Desc=Activar el registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de sucesos encadenados que se pueden leer y exportar. Este módulo puede ser obligatorio en algunos países.
 Module3300Name=Constructor de módulos
-Module3200Desc=Activar el registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de sucesos encadenados que se pueden leer y exportar. Este módulo puede ser obligatorio en algunos países.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Redes sociales
 Module3400Desc=Habilita campos de Redes Sociales en terceros y direcciones (skype, twitter, facebook...).
 Module4000Name=RRHH
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Usar un modo de poca memoria
 ExportUseLowMemoryModeHelp=Use el modo de memoria baja para generar el archivo de volcado (la compresión se realiza a través de una canalización en lugar de en la memoria PHP). Este método no permite verificar que el archivo esté completo y no se puede informar un mensaje de error si falla. Úselo si no experimenta suficientes errores de memoria.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interfaz para capturar disparadores de dolibarr y enviarlo a una URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Configuración de webhook
 Settings = Configuraciones
 WebhookSetupPage = Página de configuración del webhook
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index 3109afd00fc..2f798780be7 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -118,6 +118,27 @@ BoxCustomersOutstandingBillReached=Clientes con límite pendiente alcanzado
 UsersHome=Usuarios y grupos internos
 MembersHome=Afiliados internos
 ThirdpartiesHome=Terceros internos
+productindex=Inicio productos y servicios
+mrpindex=Inicio MRP
+commercialindex=Inicio comercial
+projectsindex=Home projects
+invoiceindex=Home invoices
+hrmindex=Home invoices
 TicketsHome=Tickets internos
+stockindex=Home stocks
+sendingindex=Home shippings
+receptionindex=Home receivings
+activityindex=Home activity
+proposalindex=Home proposal
+ordersindex=Home orders
+orderssuppliersindex=Home orders suppliers
+contractindex=Home contracts
+interventionindex=Home interventions
+suppliersproposalsindex=Home suppliers proposals
+donationindex=Home donations
+specialexpensesindex=Home specials expenses
+expensereportindex=Home expensereport
+mailingindex=Home mailing
+opensurveyindex=Home opensurvey
 AccountancyHome=Contabilidad interna
 ValidatedProjects=Proyectos validados
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index aef8d8e9a39..826b85da74e 100644
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=Área SGD/GED
 ECMAreaDesc=El área SGD/GED (Sistema Gestión Documental / Gestión Electrónica de Documentos) le permite guardar, compartir y buscar rápidamente todo tipo de documentos en Dolibarr.
 ECMAreaDesc2a=* Los directorios manuales se pueden utilizar para guardar documentos no vinculados a un elemento en particular.
 ECMAreaDesc2b=* Los directorios automáticos se llenan automáticamente al agregar documentos desde la página de un elemento.
-ECMAreaDesc3=* Los directorios de medios son archivos en el subdirectorio <b> /medias </b> del directorio de documentos, que todos pueden leer sin necesidad de iniciar sesión y sin necesidad de compartir el archivo explícitamente. Se utiliza para almacenar archivos de imagen del módulo de correo electrónico o sitio web.
+ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=El directorio <b>%s</b> ha sido eliminado
 ECMSectionWasCreated=El directorio <b> %s </b> ha sido creado.
 ECMSearchByKeywords=Buscar por palabras clave
diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
index d0348e7112c..600158c7349 100644
--- a/htdocs/langs/es_ES/interventions.lang
+++ b/htdocs/langs/es_ES/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Oculta horas y minutos fuera del campo de fecha pa
 InterventionStatistics=Estadísticas de intervenciones
 NbOfinterventions=Nº de fichas de intervención
 NumberOfInterventionsByMonth=Nº de fichas de intervención por mes (fecha de validación)
-AmountOfInteventionNotIncludedByDefault=Las cantidades de la intervención no se incluye por defecto en los beneficios (en la mayoría de los casos, las hojas de tiempo se utilizan para contar el tiempo invertido). Añada la opción PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT con valor 1 en Inicio-Configuración-Varios para incluirlos.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Id. intervención
 InterRef=Ref. intervención
 InterDateCreation=Fecha creación intervención
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index d79f9eeeea8..848b68a43f5 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -7,10 +7,10 @@ MailCard=Ficha E-Mailing
 MailRecipients=Destinatarios
 MailRecipient=Destinatario
 MailTitle=Descripción
-MailFrom=Remitente
+MailFrom=De
 MailErrorsTo=Errores a
 MailReply=Responder a
-MailTo=Destinatario(s)
+MailTo=Enviar a
 MailToUsers=A usuario(s)
 MailCC=Copia a
 MailToCCUsers=Copia a usuario(s)
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contactos por posición
 MailingModuleDescEmailsFromFile=E-mails de archivo
 MailingModuleDescEmailsFromUser=E-mails enviados por usuario
 MailingModuleDescDolibarrUsers=Usuarios con e-mails
-MailingModuleDescThirdPartiesByCategories=Terceros (por categoría)
+MailingModuleDescThirdPartiesByCategories=Terceros
 SendingFromWebInterfaceIsNotAllowed=El envío desde la interfaz web no está permitido.
 EmailCollectorFilterDesc=Todos los filtros deben coincidir para que se recopile un e-mail
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Registro creado por el Recopilador de E-Mails %s d
 DefaultBlacklistMailingStatus=Valor predeterminado para el campo '%s' al crear un nuevo contacto
 DefaultStatusEmptyMandatory=Vacío pero obligatorio
 WarningLimitSendByDay=ADVERTENCIA: La configuración o el contrato de su instancia limita su número de correos electrónicos por día a <b> %s </b>. Intentar enviar más puede provocar que su instancia se ralentice o se suspenda. Póngase en contacto con su soporte si necesita una cuota más alta.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/es_ES/partnership.lang b/htdocs/langs/es_ES/partnership.lang
index ba961ddcc42..63cb40d2dfe 100644
--- a/htdocs/langs/es_ES/partnership.lang
+++ b/htdocs/langs/es_ES/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Asociación: compruebe el vínculo de retroceso de refe
 # Menu
 #
 NewPartnership=Nueva Asociación
-NewPartnershipbyWeb= Su asociación se agregó con éxito.
+NewPartnershipbyWeb=Your partnership request has been added successfully. We may contact you soon...
 ListOfPartnerships=Listado de Asociaciones
 
 #
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index 9b731c8f1bd..ae24742c532 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Creado por
 NewTicket=Nuevo ticket
 SubjectAnswerToTicket=Respuesta
 TicketTypeRequest=Tipo de solicitud
-TicketCategory=Categorización de tickets
+TicketCategory=Ticket group
 SeeTicket=Ver ticket
 TicketMarkedAsRead=El ticket ha sido marcado como leído
 TicketReadOn=Leído el
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index ae48821de9c..6cbe6855f5e 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -145,6 +145,7 @@ Box=Vidin
 Boxes=Vidinad
 MaxNbOfLinesForBoxes=Vidinate maksimaalne ridade arv
 AllWidgetsWereEnabled=Kõik saadaval vidinad on lubatud
+WidgetAvailable=Widget available
 PositionByDefault=Vaikimisi järjestus
 Position=Ametikoht
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
@@ -374,7 +375,7 @@ DoTestSendHTML=Testi HTMLi saatmist
 ErrorCantUseRazIfNoYearInMask=Viga: ei saa kasutada seadet @ iga aasta alguses loenduri nullimiseks kui jada {yy} or {yyyy} ei sisaldu maskis.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Viga: ei saa kasutada võimalust @, kui maskis ei sisaldu jada {yy} {mm} või {yyyy} {mm}.
 UMask=Umask parameeter uute failide loomiseks Unix/Linux/BSD/Mac failisüsteemidel.
-UMaskExplanation=See parameeter võimaldab määratleda Dolibarri poolt loodud failide vaikimise õigused (näiteks üleslaadimise ajal)<br> See peab olema kaheksandsüsteemi väärtus (nt 0666 tähendab lubada kõigile lugemise ja kirjutamise õigused)<br>Windows serveris seda parameetrit ei kasutata.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Vaadake Wiki lehekülge, kus on nimekiri osalejatest ja nende organisatsioonist
 UseACacheDelay= Eksportimise vastuse vahemällu salvestamise viivitus (0 või tühi vahemälu mitte kasutamiseks)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind konverteerimise võimekus
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
 Module3300Name=Module Builder
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Sotsiaalvõrgud
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=Personalihaldus
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Seaded
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index 431457df254..f2d5d0f39b3 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Kolmandad isikud
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 9cb64178dbc..66542015c3d 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -145,6 +145,7 @@ Box=وسیله
 Boxes=وسایل
 MaxNbOfLinesForBoxes=حداکثر سطور وسایل
 AllWidgetsWereEnabled=همۀ وسیله‌های موجود فعال هستند
+WidgetAvailable=Widget available
 PositionByDefault=ترتیب پیش‌فرض
 Position=مکان
 MenusDesc=اداره‌کننده‌های فهرست‌ها محتوای دو نوار فهرست را تعیین می‌کنند (افقی و عمودی).
@@ -374,7 +375,7 @@ DoTestSendHTML=آزمایش ارسال HTML
 ErrorCantUseRazIfNoYearInMask=خطا، در صورتی  {yy} یا  {yyyy}  در ترتیب شمارنده نباشد، امکان استفاده از گزینۀ @ برای بازسازی شمارنده در هر سال وجود ندارد.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خطا، در صورتی {yy}{mm} یا  {yyyy}{mm} در ترتیب شمارنده نباشد، امکان استفاده از گزینۀ @ برای بازسازی شمارنده در هر سال وجود ندارد.
 UMask=مقدار UMask برای فایل‌های جدید در سامانه‌های فایل Unix/Linux/BSD/Mac
-UMaskExplanation=این مقدار به شما امکان تعیین مجوزهای پیش‌فرض فایل‌ها که توسط Dolibarr روی سرور (مثلا در هنگام بالاگذاری فایل) ساخته شده می‌دهد. <br>این باید یک مقدار هشت‌هشتی باشد (برای مثال، 0666 به معنای امکان خواندن و نوشتن برای همه است). <br> این مقدار در یک سرور ویندوزی بی‌معنی است.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=برای مطالعۀ فهرست مشارکت کنندگان و موسسات آن‌ها به صفحات ویکی مراجعه فرمائید.
 UseACacheDelay= تاخیر برای میان‌گیری-Caching واکنش به صادرات در واحد ثانیه (0 یا خالی برای عدم ایجاد میان‌گیری)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=قابلیت‌های تبدیل GeoIP Maxmind
 Module3200Name=بایگانی‌های تغییرناپذیر
 Module3200Desc=فعال کردن یک گزارش کاری غیرقابل تغییر. رخدادها به صورت بلادرنگ بایگانی خواهند شد. گزارش به صورت یک جدول فقط‌خواندنی از رخدادهای زنجیره‌ای در آمده که قابلیت صادرات دارند. برای بعضی از کشورها این واحد، اجباری است.
 Module3300Name=Module Builder
-Module3200Desc=فعال کردن یک گزارش کاری غیرقابل تغییر. رخدادها به صورت بلادرنگ بایگانی خواهند شد. گزارش به صورت یک جدول فقط‌خواندنی از رخدادهای زنجیره‌ای در آمده که قابلیت صادرات دارند. برای بعضی از کشورها این واحد، اجباری است.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=شبکه‌های اجتماعی
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=مدیریت منابع انسانی
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = تنظیمات
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang
index 546306f476a..1ff599bd852 100644
--- a/htdocs/langs/fa_IR/interventions.lang
+++ b/htdocs/langs/fa_IR/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=ساعت و دقیقۀ مربوط به بخش تا
 InterventionStatistics=آمار پادرمیانی‌ها
 NbOfinterventions=تعداد کارت‌های پادرمیانی
 NumberOfInterventionsByMonth=تعداد کارت‌های پادرمیانی بر حسب ما (تاریخ تائید اعتبار)
-AmountOfInteventionNotIncludedByDefault=به طور پیش‌فرض مبلغ پادرمیانی در سود محاسبه نمی‌شود (در اکثر موارد، برگه‌های زمان برای محاسبۀ زمان صرف شده استفاده می‌شوند). برای شامل کردن سود آن‌ها گزینۀ PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT را در خانه-برپاسازی-سایر به 1 تغییر دهید.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=شناسۀ پادرمیانی
 InterRef=ش.ارجاع پادرمیانی
 InterDateCreation=تاریخ ساخت پادرمیانی
@@ -66,3 +66,7 @@ RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
 GenerateInter=Generate intervention
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 8d416379d9f..a7eb5b1c117 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=طرف‌های تماس با سمت‌ها
 MailingModuleDescEmailsFromFile=رایانامه‌ها از فایل
 MailingModuleDescEmailsFromUser=ورودی رایانامه کاربر
 MailingModuleDescDolibarrUsers=کاربران دارای رایانامه
-MailingModuleDescThirdPartiesByCategories=شخص‌سوم‌ها (بر حسب دسته‌بندی)
+MailingModuleDescThirdPartiesByCategories=شخص‌سوم‌ها
 SendingFromWebInterfaceIsNotAllowed=ارسال از رابط وب مجاز نیست.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index a3375fde153..33a7c90b0a4 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgetit
 MaxNbOfLinesForBoxes=Maksimi rivimäärä Widgeteille
 AllWidgetsWereEnabled=Kaikki saatavilla olevat Widgetit on aktivoitu
+WidgetAvailable=Widget available
 PositionByDefault=Oletusjärjestys
 Position=Sijainti
 MenusDesc=Valikkohallinnasta asetetaan kahden valikkorivin (vaaka- ja pystysuora) sisältö.
@@ -374,7 +375,7 @@ DoTestSendHTML=Testaa HTML:n lähettäminen
 ErrorCantUseRazIfNoYearInMask=Virhe, ei voi käyttää vaihtoehtoa @ laskurin nollaamiseen vuosittain, jos jaksoa {yy} tai {yyyy} ei ole maskissa.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Virhe ei voi käyttäjä vaihtoehto @ jos SEQUENCE (yy) (mm) tai (vvvv) (mm) ei mask.
 UMask=UMask parametri uusia tiedostoja Unix / Linux / BSD-tiedostojärjestelmää.
-UMaskExplanation=Tämän parametrin avulla voit määrittää käyttöoikeudet asettaa oletuksena tiedostoja luotu Dolibarr palvelimelle (aikana ladata esimerkiksi). <br> Se on oktaali-arvo (esim. 0666 tarkoittaa, lukea ja kirjoittaa kaikki). <br> Ce paramtre ne Sert pas sous un serveur Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= Viive cashing vienti vastehuippu sekuntia (0 tai tyhjä ei välimuisti)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind tulokset valmiuksia
 Module3200Name=Muuttamattomat arkistot
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
 Module3300Name=Module Builder
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Sosiaaliset verkostot
 Module3400Desc=Ota sosiaalisten verkostojen kentät käyttöön kolmansille osapuolille ja osoitteille (skype, twitter, facebook, ...).
 Module4000Name=Henkilöstöhallinta
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Asetukset
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index accdb253f9b..0277a1b2a95 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Sidosryhmät
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 345342421fb..89b76f7ab9c 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -167,14 +167,14 @@ ACCOUNTANCY_COMBO_FOR_AUX=Activer la liste déroulante pour les comptes auxiliai
 ACCOUNTING_DATE_START_BINDING=Définissez une date pour commencer la liaison et le transfert en comptabilité. En dessous de cette date, les transactions ne seront jamais transférées à la comptabilité.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Sur virement comptable, quelle est la période sélectionnée par défaut
 
-ACCOUNTING_SELL_JOURNAL=Journal des ventes
-ACCOUNTING_PURCHASE_JOURNAL=Journal des achats
-ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Journal des notes de frais
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des opérations diverses
-ACCOUNTING_HAS_NEW_JOURNAL=Journal des A-nouveaux
-ACCOUNTING_INVENTORY_JOURNAL=Journal d'inventaire
-ACCOUNTING_SOCIAL_JOURNAL=Journal de paie
+ACCOUNTING_SELL_JOURNAL=Ventes
+ACCOUNTING_PURCHASE_JOURNAL=Achats
+ACCOUNTING_BANK_JOURNAL=Banque
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Notes de frais
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Opérations diverses
+ACCOUNTING_HAS_NEW_JOURNAL=A-nouveaux
+ACCOUNTING_INVENTORY_JOURNAL=Inventaire
+ACCOUNTING_SOCIAL_JOURNAL=Paie
 
 ACCOUNTING_RESULT_PROFIT=Compte de résultat (Profit)
 ACCOUNTING_RESULT_LOSS=Compte de résultat (perte)
@@ -272,7 +272,7 @@ Pcgtype=Groupe de comptes comptables
 PcgtypeDesc=Les groupes de comptes sont utilisés comme critères de filtre et de regroupement prédéfinis pour certains rapports de comptabilité. Par exemple, «INCOME» ou «EXPENSE» sont utilisés en tant que groupes pour la comptabilité afin de générer le rapport dépenses / revenus.
 AccountingCategoriesDesc=Un groupe de comptes personnalisé peut être utilisé pour regrouper les comptes comptables en un seul nom afin de faciliter l'utilisation du filtre ou la création de rapports personnalisés.
 
-Reconcilable=Rapprochable
+Reconcilable=Lettrable
 
 TotalVente=Total chiffre affaires hors taxe
 TotalMarge=Total marge
@@ -300,7 +300,7 @@ DescValidateMovements=Toute modification ou suppression d'écriture, de lettrage
 
 ValidateHistory=Lier automatiquement
 AutomaticBindingDone=Liaisons automatiques effectuées (%s) - Liaison automatique impossible pour certains enregistrements (%s)
-DoManualBindingForFailedRecord=Vous devez réaliser un rapprochement manuel pour la/les %s ligne·s non rapproché·es automatiquement.
+DoManualBindingForFailedRecord=Vous devez réaliser un lettrage manuel pour la/les %s ligne·s non lettré·es automatiquement.
 
 ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas supprimer ou désactiver ce compte comptable car il est utilisé
 MvtNotCorrectlyBalanced=Mouvement non équilibré. Débit = %s & Crédit = %s
@@ -314,7 +314,7 @@ ChangeBinding=Changer les liens
 Accounted=En comptabilité
 NotYetAccounted=Pas encore transféré en comptabilité
 ShowTutorial=Afficher le tutoriel
-NotReconciled=Non rapproché
+NotReconciled=Non lettré
 WarningRecordWithoutSubledgerAreExcluded=Attention, toutes les lignes sans compte auxiliaire défini sont filtrées et exclues de cette vue
 AccountRemovedFromCurrentChartOfAccount=Compte comptable qui n'existe pas dans le plan comptable actuel
 
@@ -416,22 +416,22 @@ Calculated=Calculé
 Formula=Formule
 
 ## Reconcile
-LetteringAuto=Rapprocher automatiquement
-LetteringManual=Rapprocher manuel
-Unlettering=Annuler le rapprochement
-UnletteringAuto=Annuler le rapprochement automatique
-UnletteringManual=Annuler rapprochement manuel
-AccountancyNoLetteringModified=Pas de rapprochement modifié
-AccountancyOneLetteringModifiedSuccessfully=Un rapprochement modifié avec succès
-AccountancyLetteringModifiedSuccessfully=%s rapprochements modifiés avec succès
-AccountancyNoUnletteringModified=Aucune annulation de rapprochement modifiée
-AccountancyOneUnletteringModifiedSuccessfully=Une annulation de rapprochement modifiée avec succès
-AccountancyUnletteringModifiedSuccessfully=%s annulations de rapprochement modifiées avec succès
+LetteringAuto=Lettrage automatique
+LetteringManual=Lettrage manuel
+Unlettering=Annuler le lettrage
+UnletteringAuto=Annuler le lettrage automatique
+UnletteringManual=Annuler lettrage manuel
+AccountancyNoLetteringModified=Pas de lettrage modifié
+AccountancyOneLetteringModifiedSuccessfully=Un lettrage modifié avec succès
+AccountancyLetteringModifiedSuccessfully=%s lettrages modifiés avec succès
+AccountancyNoUnletteringModified=Aucune annulation de lettrage modifiée
+AccountancyOneUnletteringModifiedSuccessfully=Une annulation de lettrage modifiée avec succès
+AccountancyUnletteringModifiedSuccessfully=%s annulations de lettrage modifiées avec succès
 
 ## Confirm box
-ConfirmMassUnletteringAuto=Confirmation d'annulation de rapprochement automatique
-ConfirmMassUnletteringManual=Confirmation de dé-rapprochement manuel
-ConfirmMassUnletteringQuestion=Voulez-vous vraiment annuler le rapprochement des %s enregistrements sélectionnés ?
+ConfirmMassUnletteringAuto=Confirmation de l'annulation du lettrage automatique
+ConfirmMassUnletteringManual=Confirmation de l'annulation du lettrage manuel
+ConfirmMassUnletteringQuestion=Voulez-vous vraiment annuler le lettrage des %s enregistrements sélectionnés ?
 ConfirmMassDeleteBookkeepingWriting=Confirmation de suppression en masse
 ConfirmMassDeleteBookkeepingWritingQuestion=Cela supprimera la transaction de la comptabilité (toutes les lignes liées à la même transaction seront supprimées). Êtes-vous sûr de vouloir supprimer le(s) %s enregistrement(s) sélectionné(s) ?
 
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 83488e787c3..87bda927e14 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -145,7 +145,7 @@ Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Nombre maximum de lignes dans les widgets
 AllWidgetsWereEnabled=Tous les widgets disponibles ont été activés
-WidgetAvailable=Widget available
+WidgetAvailable=Widget disponible
 PositionByDefault=Position par défaut
 Position=Position
 MenusDesc=Les gestionnaires de menu définissent le contenu des deux barres de menus (la barre horizontale et la barre verticale). Il est possible de mettre un gestionnaire différent selon que l'utilisateur est interne ou externe.
@@ -375,7 +375,7 @@ DoTestSendHTML=Tester envoi HTML
 ErrorCantUseRazIfNoYearInMask=Erreur, ne peut utiliser l'option @ pour remettre à zéro en début d'année si la séquence {yy} ou {yyyy} n'est pas dans le masque.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erreur, ne peut utiliser l'option @ si la séquence {yy}{mm} ou {yyyy}{mm} n'est pas dans le masque.
 UMask=Masque des nouveaux fichiers sous Unix/Linux/BSD/Mac.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
+UMaskExplanation=Ce paramètre permet de définir les permissions définies par défaut sur les fichiers créés par Dolibarr sur le serveur (lors d'un upload par exemple).<br> Il s'agit de la valeur octale (par exemple, 0666 signifie lecture et écriture pour tous.). La valeur recommandée est 0600 ou 0660.<br> Ce paramètre est inutile sur un serveur Windows.
 SeeWikiForAllTeam=Voir le wiki pour le détail de tous les contributeurs et leur organisation
 UseACacheDelay= Délai de mise en cache de l'export en secondes (0 ou vide pour aucun cache)
 DisableLinkToHelpCenter=Cacher le lien «<b>Besoin d'aide ou assistance</b>» sur la page de connexion
@@ -2300,7 +2300,7 @@ ExportUseLowMemoryMode=Utiliser un mode mémoire faible
 ExportUseLowMemoryModeHelp=Utilisez le mode mémoire faible pour générer le fichier dump (la compression se fait via un pipe plutôt que dans la mémoire PHP). Cette méthode ne permet pas de vérifier que le fichier est complet et le message d'erreur ne peut pas être signalé en cas d'échec. Utilisez ce mode si vous avez des erreurs dues à un manque de mémoire.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
+ModuleWebhookDesc = Interface permettant de définir les événements déclenchables de dolibarr et d'envoyer les données de l'événement via une URL
 WebhookSetup = Configuration du webhook
 Settings = Paramètres
 WebhookSetupPage = Page de configuration du webhook
@@ -2375,4 +2375,4 @@ EMailsInGoingDesc=La réception des e-mails est gérée par le module %s. Vous d
 MAIN_IMAP_USE_PHPIMAP=Utiliser la librairie PHP-IMAP pour la prise en charge IMAP, à la place du support IMAP natif de PHP. Ceci permet également l'utilisation d'une connexion OAuth2 pour IMAP (le module OAuth doit aussi être activé).
 MAIN_CHECKBOX_LEFT_COLUMN=Afficher la colonne de sélection de champ et de ligne à gauche (à droite par défaut)
 
-CSSPage=CSS Style
+CSSPage=Style CSS
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index 52275ead14b..eb48519c735 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Activar a listaxe combinada para a conta subsidiaria (
 ACCOUNTING_DATE_START_BINDING=Define unha data para comezar a ligar e transferir na contabilidade. Por debaixo desta data, as transaccións non se transferirán á contabilidade.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Na transferencia de contabilidade, cal é o período seleccionado por defecto
 
-ACCOUNTING_SELL_JOURNAL=Diario de vendas (vendas e devolucións)
-ACCOUNTING_PURCHASE_JOURNAL=Diario de compras (compras e devolucións)
-ACCOUNTING_BANK_JOURNAL=Diario de caixa (recibos e desembolsos)
+ACCOUNTING_SELL_JOURNAL=Diario de vendas - vendas e devolucións
+ACCOUNTING_PURCHASE_JOURNAL=Diario de compras: compra e devolucións
+ACCOUNTING_BANK_JOURNAL=Diario de caixa - recibos e desembolsos
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Informe de gastos diario
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Xornal xeral
 ACCOUNTING_HAS_NEW_JOURNAL=Ten un novo diario
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Isto eliminará todas as liñas da contabilidade do ano/mes e/o
 ConfirmDeleteMvtPartial=Isto eliminará a transacción da contabilidade (eliminaranse todas as liñas relacionadas coa mesma transacción)
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
+InventoryJournal=Diario de inventario
 DescFinanceJournal=O diario financiero inclúe todos os tipos de pagos por conta bancaria
 DescJournalOnlyBindedVisible=Ista é una vista do rexistro ligada a unha conta contable e que pode ser rexistrada nos diarios e Libro Maior.
 VATAccountNotDefined=Conta contable para IVE non definida
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index 90180ce3ae1..0bcc53194c7 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -145,6 +145,7 @@ Box=Panel
 Boxes=Paneis
 MaxNbOfLinesForBoxes=Número máximo de liñas para paneis
 AllWidgetsWereEnabled=Todos os widgets dispoñibles están activados
+WidgetAvailable=Panel dispoñible
 PositionByDefault=Posición por defecto
 Position=Posición
 MenusDesc=Os xestores de menús definen o contido das dúas barras de menú (horizontal e vertical)
@@ -374,7 +375,7 @@ DoTestSendHTML=Probar envío HTML
 ErrorCantUseRazIfNoYearInMask=Erro: non pode utilizar a opción @ para reiniciar o contador cada ano se a secuencia {yy} o {yyyy} non atópase na máscara.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, non pode usar a opción @ se a secuencia {yy}{mm} o {yyyy}{mm} non atópase na máscara.
 UMask=Parámetro UMask de novos ficheiros en Unix/Linux/BSD.
-UMaskExplanation=Este parámetro determina os dereitos dos ficheiros creados no servidor Dolibarr (durante a subida, por exemplo).<br>Este debe ser o valor octal (por exemplo, 0666 significa leitura / escritura para todos).<br>Este parámetro non ten ningún efecto sobre un servidor Windows.
+UMaskExplanation=Este parámetro permítelle definir permisos por defecto dos ficheiros creados por Dolibarr no servidor (durante a carga, por exemplo). <br> Este debe ser o valor octal (por exemplo, 0666 significa ler/escribir para todos). O valor recomendado é 0600 ou 0660 <br> Este parámetro non ten ningún efecto sobre un servidor Windows.
 SeeWikiForAllTeam=Vexa o wiki para mais detalles de todos os actores e da súa organización
 UseACacheDelay= Demora en caché da exportación en segundos (0 o vacio sen caché)
 DisableLinkToHelpCenter=Agocha a ligazón "<b>Precisa axuda ou soporte</b>" na páxina de inicio de sesión 
@@ -663,7 +664,7 @@ Module2900Desc=Capacidades de conversión GeoIP Maxmind
 Module3200Name=Ficheiros inalterables
 Module3200Desc=Activar o rexistro inalterable de eventos empresarais. Os eventos arquívanse en tempo real. O rexistro é unha taboa de sucesos encadeados que poden lerse e exportar. Este módulo pode ser obrigatorio nalgúns países.
 Module3300Name=Diseñador de módulos
-Module3200Desc=Activar o rexistro inalterable de eventos empresarais. Os eventos arquívanse en tempo real. O rexistro é unha taboa de sucesos encadeados que poden lerse e exportar. Este módulo pode ser obrigatorio nalgúns países.
+Module3300Desc=Unha RAD (Desenvolvemento Rápido de Aplicacións: código baixo e sen código) ferramenta para axudar aos desenvolvedores ou usuarios avanzados a construír o seu propio módulo/aplicación.
 Module3400Name=Redes sociais
 Module3400Desc=Active os campos das redes sociais en terceiros e enderezos (skype, twitter, facebook, ...).
 Module4000Name=RRHH
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use un modo de memoria baixa
 ExportUseLowMemoryModeHelp=Use o modo de memoria baixa para xerar o ficheiro de volcado (a compresión realízase a través dun tubo en lugar de na memoria PHP). Este método non permite comprobar que o ficheiro está completo e non se pode informar da mensaxe de erro se falla. Utilíceo se non experimenta erros de memoria suficientes.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface para capturar os disparadores (triggers) dolibarr e envialos a un URL
+ModuleWebhookDesc = Interface para capturar os disparadores (triggers) dolibarr e enviar datos do evento a unha URL
 WebhookSetup = Configuración de webhook
 Settings = Configuracións
 WebhookSetupPage = Páxina de configuración de webhook
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Aviso: o módulo %s estableceu
 WarningModuleHasChangedSecurityCsrfParameter=Aviso: o módulo %s desactivou a seguridade CSRF da súa instancia. Esta acción é sospeitosa e é posible que a súa instalación non estea xa protexida. Póñase en contacto co autor do módulo para obter explicacións.
 EMailsInGoingDesc=Os correos electrónicos entrantes son xestionados polo módulo %s. Debe activalo e configuralo se precisa admitir correos electrónicos entrantes.
 MAIN_IMAP_USE_PHPIMAP=Use a biblioteca PHP-IMAP para IMAP en lugar da nitivae PHP IMAP. Isto tamén permite o uso dunha conexión OAuth2 para IMAP (o módulo OAuth tamén debe estar activado).
+MAIN_CHECKBOX_LEFT_COLUMN=Amosa a columna para a selección de campo e liña á esquerda (á dereita por defecto)
+
+CSSPage=Estilo CSS
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index 31a4f631c89..618d97d71d0 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -118,6 +118,27 @@ BoxCustomersOutstandingBillReached=Alcanzáronse os clientes cun límite pendent
 UsersHome=Usuarios e grupos internos
 MembersHome=Membros internos
 ThirdpartiesHome=Terceiros internos
+productindex=Produtos e servizos internos
+mrpindex=Inicio MRP 
+commercialindex=Inicio comercial
+projectsindex=Inicio proxectos
+invoiceindex=Inicio facturas
+hrmindex=Inicio facturas
 TicketsHome=Tickets internos
+stockindex=Inicio existencias
+sendingindex=Inicio envíos
+receptionindex=Inicio recepcións
+activityindex=Inicio actividade
+proposalindex=Inicio orzamentos
+ordersindex=Inicio pedimentos
+orderssuppliersindex=Inicip pedimentos a provedores
+contractindex=Inicio contratos
+interventionindex=Inicio intervencións
+suppliersproposalsindex=Inicio orzamentos de provedor
+donationindex=Inicio doacións/subvencións
+specialexpensesindex=Inicio gastos especiais
+expensereportindex=Inicio informe de gastos
+mailingindex=Inicio correo electrónico
+opensurveyindex=Inicio enquisa aberta
 AccountancyHome=Contabilidade interna
 ValidatedProjects=Proxectos validados
diff --git a/htdocs/langs/gl_ES/ecm.lang b/htdocs/langs/gl_ES/ecm.lang
index f47440871fe..00abe7259e3 100644
--- a/htdocs/langs/gl_ES/ecm.lang
+++ b/htdocs/langs/gl_ES/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=Área MS/ECM
 ECMAreaDesc=O área DMS / ECM (Document Management System / Electronic Content Management) permítelle gardar, compartir e buscar rapidamente todo tipo de documentos en Dolibarr.
 ECMAreaDesc2a=* Os directorios manuais pódense usar para gardar documentos non ligados a un elemento en particular.
 ECMAreaDesc2b=* Os directorios automáticos énchense automaticamente ao engadir documentos desde a páxina dun elemento.
-ECMAreaDesc3=* Os directorios de medios son ficheiros do subdirectorio <b> /medias </b> do directorio de documentos, lexibles por todos sen necesidade de rexistrarse e sen necesidade de compartir o ficheiro de forma explícita. Utilízase para almacenar ficheiros de imaxe do módulo de correo electrónico ou sitio web.
+ECMAreaDesc3=* Os directorios de medios son ficheiros do subdirectorio <b> /medias </b> do directorio de documentos, lexibles por todos sen necesidade de rexistrarse e sen necesidade de compartir o ficheiro de forma explícita. Utilízase, por exemplo,  para almacenar ficheiros de imaxe para o módulo de correo electrónico ou sitio web.
 ECMSectionWasRemoved=O directorio <b>%s</b> foi eliminado
 ECMSectionWasCreated=O directorio <b> %s </b> foi creado.
 ECMSearchByKeywords=Buscar por palabras clave
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index 3a54b10294d..99ab2408dec 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -262,6 +262,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Erro, o parámetro <b>%s</b>1debe
 ErrorLoginDateValidity=Erro, este inicio de sesión está fóra do intervalo de datas validas
 ErrorValueLength=A lonxitude do campo "<b>%s</b>" debe ser superior a "<b>%s</b>"
 ErrorReservedKeyword=A palabra '<b>%s</b>' é unha palabra chave reservada
+ErrorFilenameReserved=O nome de ficheiro <b> %s </b> non se pode usar xa que é un comando reservado e protexido.
 ErrorNotAvailableWithThisDistribution=Non dispoñible con esta distribución
 ErrorPublicInterfaceNotEnabled=Interfaz pública non activada
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=O idioma da nova páxina debe definirse se se define como tradución doutra páxina
@@ -308,7 +309,7 @@ ErrorExistingPermission = Permiso <b> %s </b> para o obxecto <b> %s </b>
 ErrorFieldExist=O valor de <b> %s </b> xa existe
 ErrorEqualModule=Módulo non válido en <b> %s </b>
 ErrorFieldValue=O valor para <b> %s </b> é incorrecto
-ErrorCoherenceMenu= <b> %s </b> é preciso cando <b> % </b> é igual á ESQUERDA
+ErrorCoherenceMenu= <b> %s </b> é preciso cando <b> %s </b> é 'esquerda'
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=O seu parámetro PHP upload_max_filesize (%s) é superior ao parámetro PHP post_max_size (%s). Esta non é unha configuración consistente.
diff --git a/htdocs/langs/gl_ES/interventions.lang b/htdocs/langs/gl_ES/interventions.lang
index cf20ab11dfa..9566d38de98 100644
--- a/htdocs/langs/gl_ES/interventions.lang
+++ b/htdocs/langs/gl_ES/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Oculta horas e minutos fora do campo de data para
 InterventionStatistics=Estatísticas de intervencións
 NbOfinterventions=Nº de fichas de intervención
 NumberOfInterventionsByMonth=Nº de fichas de intervención por mes (data de validación)
-AmountOfInteventionNotIncludedByDefault=A cantidade de intervención non se inclúe por defecto no beneficio (na maioría dos casos, as follas de traballo úsanse para contar o tempo empregado). Engade a opción PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT a 1 en home-setup-other para incluílas.
+AmountOfInteventionNotIncludedByDefault=A cantidade de intervención non se inclúe por defecto no beneficio (na maioría dos casos, as follas de horas de traballo utilízanse para contar o tempo empregado). Pode usar a opción PROJECT_ELEMENTS_FOR_ADD_MARGIN e PROJECT_ELEMENTS_FOR_MINUS_MARGIN en inicio-configuración-outro para completar a listaxe de elementos incluídos no beneficio.
 InterId=Id. intervención
 InterRef=Ref. intervención
 InterDateCreation=Data creación intervención
diff --git a/htdocs/langs/gl_ES/mails.lang b/htdocs/langs/gl_ES/mails.lang
index 54ee641b24a..2db0fd1cff1 100644
--- a/htdocs/langs/gl_ES/mails.lang
+++ b/htdocs/langs/gl_ES/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contactos por posición
 MailingModuleDescEmailsFromFile=Mails de ficheiros
 MailingModuleDescEmailsFromUser=Mails enviados por usuario
 MailingModuleDescDolibarrUsers=Usuarios con mails
-MailingModuleDescThirdPartiesByCategories=Terceiros (por categoría)
+MailingModuleDescThirdPartiesByCategories=Terceiros
 SendingFromWebInterfaceIsNotAllowed=O envío dende a interfaz web non está permitido.
 EmailCollectorFilterDesc=Todos os filtros deben coincidir para recibir un correo electrónico
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Rexistro creado polo receptor de correo electróni
 DefaultBlacklistMailingStatus=Valor predeterminado para o campo '%s' ao crear un novo contacto 
 DefaultStatusEmptyMandatory=Baleiro pero obrigatorio
 WarningLimitSendByDay=ADVERTENCIA: a configuración ou o contrato da súa instancia limita o seu número de correos electrónicos ao día a <b> %s </b> . Se tenta enviar máis, pode que a súa instancia se ralentice ou se suspenda. Poñase en contacto co seu servizo de asistencia se precisa unha cota máis alta.
+NoMoreRecipientToSendTo=Non hai máis destinatarios aos que enviar o correo electrónico
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index bd87e4f9635..59cd9d433ff 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/main.lang
@@ -514,6 +514,7 @@ NotYetAvailable=Aínda non dispoñible
 NotAvailable=Non dispoñible
 Categories=Etiquetas/categorías
 Category=Etiqueta/categoría
+SelectTheTagsToAssign=Seleccione as etiquetas/categorías para asignar
 By=Por
 From=De
 FromDate=De
@@ -1223,5 +1224,6 @@ AddToContacts=Engadir enderezo aos meus contactos
 LastAccess=Último acceso
 UploadAnImageToSeeAPhotoHere=Cargue unha imaxe da pestana %s para ver unha foto aquí
 LastPasswordChangeDate=Última data de modificación de contrasinal
-PublicVirtualCardUrl=Páxina virtual de tarxetas de visita
+PublicVirtualCardUrl=URL da páxina de tarxeta virtual da empresa
+PublicVirtualCard=Tarxeta virtual da empresa
 TreeView=Vista en árbore
diff --git a/htdocs/langs/gl_ES/margins.lang b/htdocs/langs/gl_ES/margins.lang
index b9b73c49de7..916f1bd4c76 100644
--- a/htdocs/langs/gl_ES/margins.lang
+++ b/htdocs/langs/gl_ES/margins.lang
@@ -6,6 +6,7 @@ TotalMargin=Marxe total
 MarginOnProducts=Marxe / Produtos
 MarginOnServices=Marxe / Servizos
 MarginRate=Marxe sobre coste
+ModifyMarginRates=Modificar a narxe sobre custos
 MarkRate=Marxe sobre venda
 DisplayMarginRates=Amosar a marxe sobre costes
 DisplayMarkRates=Amosar a marxe sobre ventas
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
index 1e46997f4cc..7243d10b377 100644
--- a/htdocs/langs/gl_ES/members.lang
+++ b/htdocs/langs/gl_ES/members.lang
@@ -4,6 +4,8 @@ MemberCard=Ficha membro
 SubscriptionCard=Ficha cotización
 Member=Membro
 Members=Membros
+NoRecordedMembers=Ningún membro rexistrado
+NoRecordedMembersByType=Ningún membro rexistrado
 ShowMember=Amosar ficha membro
 UserNotLinkedToMember=Usuario non ligado a un membro
 ThirdpartyNotLinkedToMember=Terceiro non ligado a ningún membro
@@ -233,3 +235,4 @@ CreateDolibarrThirdPartyDesc=Un terceiro é a persoa xurídica que se usará na
 MemberFirstname=Nome do membro
 MemberLastname=Apelido do membro
 MemberCodeDesc=Código de membro, único para todos os membros
+NoRecordedMembers=Ningún membro rexistrado
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index 71c2483e2aa..a838cf327e6 100644
--- a/htdocs/langs/gl_ES/mrp.lang
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -119,3 +119,6 @@ BomCantAddChildBom=A nomenclatura %s xa está presente na árbore que conduce á
 BOMNetNeeds = Necesidades netas de BOM
 BOMProductsList=Produtos de BOM
 BOMServicesList=Servizos de BOM
+Manufacturing=Fabricación
+Disassemble=Desmontar
+ProducedBy=Producido por
diff --git a/htdocs/langs/gl_ES/partnership.lang b/htdocs/langs/gl_ES/partnership.lang
index e1fffab3d16..41323b68dce 100644
--- a/htdocs/langs/gl_ES/partnership.lang
+++ b/htdocs/langs/gl_ES/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Asociación: comprobe a ligazón de retroceso referente
 # Menu
 #
 NewPartnership=Nova Asociación
-NewPartnershipbyWeb= A súa asociación engadiuse correctamente.
+NewPartnershipbyWeb=A súa solicitude de asociación engadiuse correctamente. Podemos contactar con vostede en breve...
 ListOfPartnerships=Listaxe de Asociacións
 
 #
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
index 85e093b9f1d..0b9f8a63817 100644
--- a/htdocs/langs/gl_ES/ticket.lang
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Creado por
 NewTicket=Novo ticket
 SubjectAnswerToTicket=Resposta
 TicketTypeRequest=Tipo de solicitude
-TicketCategory=Categorización de tickets
+TicketCategory=Grupo de tickets
 SeeTicket=Ver ticket
 TicketMarkedAsRead=O ticket foi marcado como lido
 TicketReadOn=Lido o
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 26f39363219..20f49a36223 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max. number of lines for widgets
 AllWidgetsWereEnabled=All available widgets are enabled
+WidgetAvailable=Widget available
 PositionByDefault=ברירת המחדל של סדר
 Position=Position
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
@@ -374,7 +375,7 @@ DoTestSendHTML=בדוק שליחת HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=שגיאה, לא ניתן להשתמש באפשרות @ אם רצף {yy} {מ&quot;מ} או {yyyy} {מ&quot;מ} אינו מסכה.
 UMask=UMask פרמטר עבור קבצים חדשים על יוניקס / לינוקס / BSD מערכת הקבצים.
-UMaskExplanation=פרמטר זה מאפשר לך להגדיר הרשאות כברירת מחדל על קבצים שנוצרו על ידי Dolibarr בשרת (במהלך הטעינה למשל). <br> זה חייב להיות ערך אוקטלי (לדוגמה, 0666 אמצעי קריאה וכתיבה לכולם). <br> פרמטר זה הוא חסר תועלת על שרת Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= עיכוב במטמון בתגובה יצוא שניות (0 או ריק מטמון לא)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind המרות יכולות
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
 Module3300Name=Module Builder
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Social Networks
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index bd56bac15f8..b64067385e6 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -7,10 +7,10 @@ MailCard=EMailing card
 MailRecipients=Recipients
 MailRecipient=Recipient
 MailTitle=תאור
-MailFrom=Sender
+MailFrom=From
 MailErrorsTo=Errors to
 MailReply=Reply to
-MailTo=Receiver(s)
+MailTo=To
 MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=צדדים שלישיים
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -178,3 +178,5 @@ IsAnAnswer=Is an answer of an initial email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index cb9c3a3ba18..31d250ee63c 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -145,6 +145,7 @@ Box=Dodatak
 Boxes=Dodaci
 MaxNbOfLinesForBoxes=Maksimalni broj linija u dodatku
 AllWidgetsWereEnabled=Svi dostupni widgeti su omogućeni
+WidgetAvailable=Widget available
 PositionByDefault=Predefiniran redosljed
 Position=Pozicija
 MenusDesc=Upravitelji izbornicima postavljaju sadržaj za dva izbornika ( horizontalni i vertikalni).
@@ -374,7 +375,7 @@ DoTestSendHTML=Slanje HTML testa
 ErrorCantUseRazIfNoYearInMask=Pogreška, ne može se koristiti opcija @ za poništavanje brojača svake godine ako sekvenca {yy} ili {yyyy} nije u maski.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Greška, ne možete koristiti opciju @ ako sekvence {yy}{mm} ili {yyyy}{mm} nisu u predlošku.
 UMask=Umask parametar za nove datoteke na Unix/Linux/BSD/Mac sistemu.
-UMaskExplanation=Ovaj parametar vam omogućuje da definirate dopuštenja postavljena prema zadanim postavkama za datoteke koje je Dolibarr stvorio na poslužitelju (na primjer, tijekom prijenosa). <br> Mora biti oktalna vrijednost (na primjer, 0666 znači čitanje i pisanje za svakoga). <br> Ovaj parametar je beskoristan na Windows poslužitelju.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Pogledajte Wiki stranicu za popis suradnika i njihovu organizaciju
 UseACacheDelay= Kašnjenje za predmemoriranje izvoznog odgovora u sekundama (0 ili prazno ako nema predmemorije)
 DisableLinkToHelpCenter=Sakrij vezu " <b> Trebate pomoć ili podršku </b> " na stranici za prijavu
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind mogućnosti konverzije
 Module3200Name=Nepromjenjivi arhivi
 Module3200Desc=Omogućite nepromjenjivi zapisnik poslovnih događaja. Događaji se arhiviraju u stvarnom vremenu. Dnevnik je tablica samo za čitanje vezanih događaja koji se mogu izvesti. Ovaj modul može biti obavezan za neke zemlje.
 Module3300Name=Module Builder
-Module3200Desc=Omogućite nepromjenjivi zapisnik poslovnih događaja. Događaji se arhiviraju u stvarnom vremenu. Dnevnik je tablica samo za čitanje vezanih događaja koji se mogu izvesti. Ovaj modul može biti obavezan za neke zemlje.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Društvene mreže
 Module3400Desc=Omogućite polja društvenih mreža trećim stranama i adresama (skype, twitter, facebook, ...).
 Module4000Name=Djelatnici
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Koristite način rada s malo memorije
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Postavke
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index eb885a097de..a65d8f59324 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Treće osobe
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Zapis kreiran od strane sakupljača e-pošte %s iz
 DefaultBlacklistMailingStatus=Zadana vrijednost za polje '%s' prilikom stvaranja novog kontakta
 DefaultStatusEmptyMandatory=Prazan, ali obavezan
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/hr_HR/ticket.lang b/htdocs/langs/hr_HR/ticket.lang
index 235ce683650..2c8f6a3d2a2 100644
--- a/htdocs/langs/hr_HR/ticket.lang
+++ b/htdocs/langs/hr_HR/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Izradio
 NewTicket=Novi tiket
 SubjectAnswerToTicket=Odgovor na tiket
 TicketTypeRequest=Vrsta zahtjeva
-TicketCategory=Kategorizacija tiketa
+TicketCategory=Ticket group
 SeeTicket=Vidi tiket
 TicketMarkedAsRead=Tiket je označen kao pročitan
 TicketReadOn=Pročitano
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 9b9ccc2575c..ea8c67f273c 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Kombinációs lista engedélyezése az alszámlához (
 ACCOUNTING_DATE_START_BINDING=Határozzon meg egy dátumot a könyvelésbe történő bekötés és átutalás megkezdéséhez. Ezen időpont alatt a tranzakciók nem kerülnek át a könyvelésbe.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=A könyvelési átutalásnál mi az alapértelmezetten kiválasztott időszak
 
-ACCOUNTING_SELL_JOURNAL=Értékesítési napló (eladások és visszaküldések)
-ACCOUNTING_PURCHASE_JOURNAL=Vásárlási napló (vásárlás és visszaküldés)
-ACCOUNTING_BANK_JOURNAL=Pénztári napló (bevételek és kifizetések)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Költségjelentési napló
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Általános napló
 ACCOUNTING_HAS_NEW_JOURNAL=Új naplója van
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Ez törli a könyvelés összes műveletsorát az év/hónap é
 ConfirmDeleteMvtPartial=Ez törli a tranzakciót a számvitelből (az ugyanahhoz a tranzakcióhoz kapcsolódó összes műveletsor törlődik)
 FinanceJournal=Pénzügyi napló
 ExpenseReportsJournal=Költségjelentési napló
+InventoryJournal=Leltári napló
 DescFinanceJournal=Pénzügyi napló, amely tartalmazza a bankszámlánkénti fizetések összes típusát
 DescJournalOnlyBindedVisible=Ez egy számvitelii számlához kötött rekord nézet, amely rögzíthető a naplókban és a főkönyvben.
 VATAccountNotDefined=Nincs megadva az áfa-számla
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index e6d8637e617..877294d65d0 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgetek
 MaxNbOfLinesForBoxes=A modul számára elérhető sorok száma
 AllWidgetsWereEnabled=Az összes elérhető modul engedélyezve van
+WidgetAvailable=Widget available
 PositionByDefault=Alapértelmezett sorrend
 Position=Pozíció
 MenusDesc=A menükezelők a két menüsor (vízszintes és függőleges) tartalmát állítják be.
@@ -374,7 +375,7 @@ DoTestSendHTML=HTML küldés tesztelése
 ErrorCantUseRazIfNoYearInMask=Hiba, nem használható a @ opció az éves számláló nullázására, ha a (z) {yy} vagy (yyyy} sorozat nincs maszkban.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Hiba, nem tudja használni, ha az opció @ {sorozat} {nn mm ÉÉÉÉ} vagy {} {} mm nincs maszk.
 UMask=Umask paramétert az új fájlok a Unix / Linux / BSD fájlrendszer.
-UMaskExplanation=Ez a paraméter lehetővé teszi, hogy meghatározza jogosultságok beállítása alapértelmezés szerint létrehozott fájlok Dolibarr a szerver (feltöltés közben például). <br> Ennek kell lennie az oktális érték (például 0666 segítségével írni és olvasni mindenki számára). <br> Ez a paraméter haszontalan egy Windows szerverre.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Vessen egy pillantást a Wiki oldalra a közreműködők és szervezeteik listájára
 UseACacheDelay= Késleltetése caching export válasz másodpercben (0 vagy üres cache nélkül)
 DisableLinkToHelpCenter=A bejelentkezési oldalon rejtse el a „<b>Segítségre vagy támogatásra van szüksége</b>” hivatkozást
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP MaxMind konverziók képességek
 Module3200Name=Megváltoztathatatlan archívumok
 Module3200Desc=Az üzleti események megváltoztathatatlan naplójának engedélyezése. Az események valós időben archiválódnak. A napló a láncolt események csak olvasható táblázata, amely exportálható. Ez a modul bizonyos országokban kötelező lehet.
 Module3300Name=Modul Készítő
-Module3200Desc=Az üzleti események megváltoztathatatlan naplójának engedélyezése. Az események valós időben archiválódnak. A napló a láncolt események csak olvasható táblázata, amely exportálható. Ez a modul bizonyos országokban kötelező lehet.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Közösségi hálózatok
 Module3400Desc=Engedélyezze a közösségi hálózatok mezőit harmadik felek és címek számára (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Használjon alacsony memória módot
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interfész a dolibarr triggerek elkapásához és egy URL-re küldéséhez
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook beállítása
 Settings = Beállítások
 WebhookSetupPage = Webhook beállítási oldal
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang
index 572564db6ff..18d43cdf6be 100644
--- a/htdocs/langs/hu_HU/interventions.lang
+++ b/htdocs/langs/hu_HU/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Elrejti az órákat és perceket a dátummezőtől
 InterventionStatistics=A beavatkozások statisztikái
 NbOfinterventions=A beavatkozási kártyák száma
 NumberOfInterventionsByMonth=A beavatkozási kártyák száma hónaponként (érvényesítés dátuma)
-AmountOfInteventionNotIncludedByDefault=A beavatkozás összege alapértelmezés szerint nem számít bele a profitba (a legtöbb esetben munkaidő-nyilvántartást használnak az eltöltött idő számlálására). Adja hozzá a PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT opciót az 1-hez a home-setup-other részhez, hogy felvegye őket.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Beavatkozási azonosító
 InterRef=Beavatkozási hiv.
 InterDateCreation=Dátum létrehozási beavatkozás
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index b9fa26c7dec..aa83eaa5704 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Kapcsolattartók pozíció szerint
 MailingModuleDescEmailsFromFile=E-mailek fájlból
 MailingModuleDescEmailsFromUser=E-mailek a felhasználó által
 MailingModuleDescDolibarrUsers=E-mailekkel rendelkező felhasználók
-MailingModuleDescThirdPartiesByCategories=Harmadik felek (kategóriák szerint)
+MailingModuleDescThirdPartiesByCategories=Harmadik felek
 SendingFromWebInterfaceIsNotAllowed=A webes felületről történő küldés nem megengedett.
 EmailCollectorFilterDesc=Minden szűrőnek meg kell egyeznie ahhoz, hogy e-mailt gyűjtsön
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=A(z) %s e-mail gyűjtő által létrehozott rekord
 DefaultBlacklistMailingStatus=A '%s' mező alapértelmezett értéke új névjegy létrehozásakor
 DefaultStatusEmptyMandatory=Üres, de kötelező
 WarningLimitSendByDay=FIGYELMEZTETÉS: A példány beállítása vagy szerződése a napi e-mailek számát <b> %s </b> értékre korlátozza. Ha többet próbál küldeni, előfordulhat, hogy a példány lelassul vagy felfüggeszthető. Ha magasabb kvótára van szüksége, forduljon ügyfélszolgálatához.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/hu_HU/partnership.lang b/htdocs/langs/hu_HU/partnership.lang
index e8ac719fe79..07c0d2abb33 100644
--- a/htdocs/langs/hu_HU/partnership.lang
+++ b/htdocs/langs/hu_HU/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Partnerség: Ellenőrizze a hivatkozási hivatkozást
 # Menu
 #
 NewPartnership=Új partnerség
-NewPartnershipbyWeb= Az Ön partnersége sikeresen hozzáadva.
+NewPartnershipbyWeb=Your partnership request has been added successfully. We may contact you soon...
 ListOfPartnerships=A partnerségek listája
 
 #
diff --git a/htdocs/langs/hu_HU/ticket.lang b/htdocs/langs/hu_HU/ticket.lang
index e398527a5a8..c01e929ec95 100644
--- a/htdocs/langs/hu_HU/ticket.lang
+++ b/htdocs/langs/hu_HU/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Létrehozta
 NewTicket=Új jegy
 SubjectAnswerToTicket=Jegy válasz
 TicketTypeRequest=Kérés típusa
-TicketCategory=Jegyek kategorizálása
+TicketCategory=Ticket group
 SeeTicket=Lásd a jegyet
 TicketMarkedAsRead=A jegy olvasottként meg lett jelölve
 TicketReadOn=Olvass tovább
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 269995a4027..1f71ef1aec4 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widget
 MaxNbOfLinesForBoxes=Maks. jumlah baris untuk widget
 AllWidgetsWereEnabled=Semua widget yang tersedia diaktifkan
+WidgetAvailable=Widget available
 PositionByDefault=Pesanan Standar
 Position=Posisi
 MenusDesc=Manajer menu mengatur konten dari dua bilah menu (horizontal dan vertikal).
@@ -374,7 +375,7 @@ DoTestSendHTML=Mencoba Mengirim HTML
 ErrorCantUseRazIfNoYearInMask=Kesalahan, tidak dapat menggunakan opsi @ untuk mengatur ulang penghitung setiap tahun jika urutan {yy} atau {yyyy} tidak ada di mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Kesalahan, tidak dapat menggunakan opsi @ jika urutan {yy} {mm} atau {yyyy} {mm} tidak ada di mask.
 UMask=Parameter UMask untuk file baru di sistem file Unix / Linux / BSD / Mac.
-UMaskExplanation=Parameter ini memungkinkan Anda untuk menetapkan izin yang ditetapkan secara default pada file yang dibuat oleh Dolibarr di server (misalnya saat mengunggah). <br> Itu harus nilai oktal (misalnya, 0666 berarti membaca dan menulis untuk semua orang). <br> Parameter ini tidak berguna di server Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Lihatlah halaman Wiki untuk daftar kontributor dan organisasi mereka
 UseACacheDelay= Keterlambatan untuk caching respons ekspor dalam detik (0 atau kosong tanpa cache)
 DisableLinkToHelpCenter=Sembunyikan tautan " <b> Butuh bantuan atau dukungan </b> " di halaman login
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind kemampuan konversi
 Module3200Name=Arsip yang Tidak Dapat Diubah
 Module3200Desc=Aktifkan log peristiwa bisnis yang tidak dapat diubah. Perihal diarsipkan secara waktu nyata. Log adalah tabel read-only peristiwa dirantai yang dapat diekspor. Modul ini mungkin wajib untuk beberapa negara.
 Module3300Name=Module Builder
-Module3200Desc=Aktifkan log peristiwa bisnis yang tidak dapat diubah. Perihal diarsipkan secara waktu nyata. Log adalah tabel read-only peristiwa dirantai yang dapat diekspor. Modul ini mungkin wajib untuk beberapa negara.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Jaringan sosial
 Module3400Desc=Aktifkan bidang Jaringan Sosial ke pihak ketiga dan alamat (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Pengaturan
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/id_ID/interventions.lang b/htdocs/langs/id_ID/interventions.lang
index 8446a7d2078..7097f577dbf 100644
--- a/htdocs/langs/id_ID/interventions.lang
+++ b/htdocs/langs/id_ID/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Menyembunyikan jam dan menit dari bidang tanggal u
 InterventionStatistics=Statistik intervensi
 NbOfinterventions=Jumlah kartu intervensi
 NumberOfInterventionsByMonth=Jumlah kartu intervensi berdasarkan bulan (tanggal validasi)
-AmountOfInteventionNotIncludedByDefault=Jumlah intervensi tidak dimasukkan secara default ke dalam laba (dalam kebanyakan kasus, timesheets digunakan untuk menghitung waktu yang dihabiskan). Tambahkan opsi PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT ke 1 ke pengaturan rumah-lainnya untuk memasukkannya.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=ID intervensi
 InterRef=Intervensi ref.
 InterDateCreation=Intervensi pembuatan tanggal
@@ -66,3 +66,7 @@ RepeatableIntervention=Template intervensi
 ToCreateAPredefinedIntervention=Untuk membuat intervensi yang telah ditetapkan atau berulang, buat intervensi umum dan ubah menjadi template intervensi
 ConfirmReopenIntervention=Apakah Anda yakin ingin membuka kembali intervensi <b> %s </b> ?
 GenerateInter=Menghasilkan intervensi
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 0066881e19e..1a3bc04c3e7 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Kontak berdasarkan posisi
 MailingModuleDescEmailsFromFile=Email dari file
 MailingModuleDescEmailsFromUser=Masukan input email oleh pengguna
 MailingModuleDescDolibarrUsers=Pengguna dengan Email
-MailingModuleDescThirdPartiesByCategories=Pihak ketiga (berdasarkan kategori)
+MailingModuleDescThirdPartiesByCategories=Pihak Ketiga
 SendingFromWebInterfaceIsNotAllowed=Mengirim dari antarmuka web tidak diizinkan.
 EmailCollectorFilterDesc=Semua filter harus cocok agar email dikumpulkan
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Catatan dibuat oleh Kolektor Email %s dari email %
 DefaultBlacklistMailingStatus=Nilai default untuk bidang '%s' saat membuat kontak baru
 DefaultStatusEmptyMandatory=Kosong tapi wajib
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/id_ID/ticket.lang b/htdocs/langs/id_ID/ticket.lang
index 332177bc765..51c64a41a33 100644
--- a/htdocs/langs/id_ID/ticket.lang
+++ b/htdocs/langs/id_ID/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Ubah tiket
 Permission56003=Hapus tiket
 Permission56004=Kelola tiket
 Permission56005=Lihat tiket dari semua pihak ketiga (tidak berlaku untuk pengguna eksternal, selalu terbatas pada pihak ketiga yang mereka andalkan)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=Tiket - Jenis
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Kontributor eksternal
 OriginEmail=Email Reporter
 Notify_TICKET_SENTBYMAIL=Kirim pesan tiket melalui email
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Baca
 Assigned=Ditugaskan
@@ -183,7 +186,7 @@ CreatedBy=Dibuat oleh
 NewTicket=Tiket Baru
 SubjectAnswerToTicket=Jawaban tiket
 TicketTypeRequest=Jenis permintaan
-TicketCategory=Kategorisasi tiket
+TicketCategory=Ticket group
 SeeTicket=Lihat tiket
 TicketMarkedAsRead=Tiket telah ditandai sebagai sudah dibaca
 TicketReadOn=Baca terus
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 1255f40be09..fb06d4d0833 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max. number of lines for widgets
 AllWidgetsWereEnabled=All available widgets are enabled
+WidgetAvailable=Widget available
 PositionByDefault=Sjálfgefin röð
 Position=Staða
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
@@ -374,7 +375,7 @@ DoTestSendHTML=Próf senda HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Villa, get ekki notað valkost @ ef röð (YY) (mm) eða (áááá) (mm) er ekki í maska.
 UMask=UMask breytu fyrir nýja skrá á Unix / Linux / BSD skrá kerfi.
-UMaskExplanation=Þessi stika gerir þér kleift að tilgreina heimildir sjálfgefið á skrá skapa við Dolibarr á miðlara (á senda til dæmis). <br> Það hlýtur að vera octal gildi (til dæmis, 0666 þýðir að lesa og skrifa fyrir alla). <br> Þessi stika er gagnslaus á Gluggakista framreiðslumaður.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= Töf á flýtiminni útflutningur svar í sekúndum (0 eða tómt fyrir ekkert skyndiminni)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind viðskipti viðbúnað
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
 Module3300Name=Module Builder
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Social Networks
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index f941da9fa45..6575fb20116 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Í þriðja aðila
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 6426a252743..8708d3c28a4 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Abilita l'elenco combinato per l'account sussidiario (
 ACCOUNTING_DATE_START_BINDING=Definisci una data per iniziare il consolidamento e il trasferimento in contabilità. Al di sotto di tale data, i movimenti non saranno trasferiti in contabilità.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Al momento del trasferimento contabile, qual è il periodo selezionato di default
 
-ACCOUNTING_SELL_JOURNAL=Giornale vendite (vendite e resi)
-ACCOUNTING_PURCHASE_JOURNAL=Giornale acquisti (acquisti e resi)
-ACCOUNTING_BANK_JOURNAL=Giornale di cassa (incassi ed esborsi)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Giornale Note Spese
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Giornale generale
 ACCOUNTING_HAS_NEW_JOURNAL=Ha un nuovo giornale
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Ciò cancellerà tutte le righe contabili per l'anno/mese e/o p
 ConfirmDeleteMvtPartial=Questo cancellerà la transazione dalla contabilità (tutte le righe relative alla stessa transazione verranno eliminate)
 FinanceJournal=Giornale delle finanze
 ExpenseReportsJournal=Rapporto spese
+InventoryJournal=Giornale inventario
 DescFinanceJournal=Giornale finanziario che include tutti i tipi di pagamenti per conto bancario
 DescJournalOnlyBindedVisible=Questa è una vista di registrazione che è vincolata a un conto contabile e può essere registrata nei giornali e nel libro mastro.
 VATAccountNotDefined=Conto per IVA non definito
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index da2bd4092f3..f173fb609df 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Massimo numero di righe per widget
 AllWidgetsWereEnabled=Tutti i widget disponibili sono abilitati
+WidgetAvailable=Widget available
 PositionByDefault=Per impostazione predefinita
 Position=Posizione
 MenusDesc=Gestione del contenuto delle 2 barre dei menu (barra orizzontale e barra verticale).
@@ -374,7 +375,7 @@ DoTestSendHTML=Prova inviando HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Errore, non si può usare l'opzione @ se non c'è una sequenza {yy}{mm} o {yyyy}{mm} nello schema.
 UMask=Parametro umask per i nuovi file su Unix/Linux/BSD.
-UMaskExplanation=Questo parametro consente di definire i permessi impostati di default per i file creati da Dolibarr sul server (per esempio durante il caricamento).<br/>Il valore deve essere ottale (per esempio, 0.666 indica il permesso di lettura e scrittura per tutti).<br/>Questo parametro non si usa sui server Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= Ritardo per il caching di esportazione (0 o vuoto per disabilitare la cache)
 DisableLinkToHelpCenter=Nascondi il link " <b> Hai bisogno di aiuto o supporto </b> " nella pagina di accesso
@@ -663,7 +664,7 @@ Module2900Desc=Localizzazione degli accessi tramite GeoIP Maxmind
 Module3200Name=Archivi inalterabili
 Module3200Desc=Abilita un registro inalterabile degli eventi aziendali. Gli eventi sono archiviati in tempo reale. Il registro è una tabella di sola lettura degli eventi concatenati che possono essere esportati. Questo modulo potrebbe essere obbligatorio per alcuni paesi.
 Module3300Name=Costruttore di moduli
-Module3200Desc=Abilita un registro inalterabile degli eventi aziendali. Gli eventi sono archiviati in tempo reale. Il registro è una tabella di sola lettura degli eventi concatenati che possono essere esportati. Questo modulo potrebbe essere obbligatorio per alcuni paesi.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Social Networks
 Module3400Desc=Abilita i campi Social Network in terze parti e indirizzi (skype, twitter, facebook, ...).
 Module4000Name=Risorse umane
@@ -1910,7 +1911,7 @@ TestGeoIPResult=Test di conversione indirizzo IP -> nazione
 ProjectsNumberingModules=Modulo numerazione progetti
 ProjectsSetup=Impostazioni modulo progetti
 ProjectsModelModule=Modelli dei rapporti dei progetti
-TasksNumberingModules=Tasks numbering module
+TasksNumberingModules=Modulo numerazione compiti
 TaskModelModule=Tasks reports document model
 UseSearchToSelectProject=Wait until a key is pressed before loading content of Project combo list.<br>This may improve performance if you have a large number of projects, but it is less convenient.
 ##### ECM (GED) #####
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Utilizzare una modalità di memoria insufficiente
 ExportUseLowMemoryModeHelp=Utilizzare la modalità di memoria minima per generare il file di dump (la compressione viene eseguita tramite una pipe anziché nella memoria PHP). Questo metodo non consente di verificare che il file sia completo e il messaggio di errore non può essere segnalato se fallisce. Usalo se riscontri errori di memoria insufficienti.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interfaccia per catturare i trigger di dolibarr e inviarlo a un URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Configurazione del webhook
 Settings = Impostazioni
 WebhookSetupPage = Pagina di configurazione del webhook
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang
index 4033a46086a..21b79048492 100644
--- a/htdocs/langs/it_IT/interventions.lang
+++ b/htdocs/langs/it_IT/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Hides hours and minutes off the date field for int
 InterventionStatistics=Statistiche degli interventi
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
-AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). Add option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT to 1 into home-setup-other to include them.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=ID intervento
 InterRef=Rif. intervento
 InterDateCreation=Data di creazione intervento
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 5074f48e307..460c49b4b4d 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -7,10 +7,10 @@ MailCard=Scheda email
 MailRecipients=Destinatari
 MailRecipient=Destinatario
 MailTitle=Titolo
-MailFrom=Mittente
+MailFrom=Da
 MailErrorsTo=Errors to
 MailReply=Rispondi a
-MailTo=Destinatario(i)
+MailTo=a
 MailToUsers=To user(s)
 MailCC=Copia carbone (CC)
 MailToCCUsers=In copia gli utenti
@@ -53,7 +53,7 @@ NbOfUniqueEMails=No. of unique emails
 NbOfEMails=Numero di email
 TotalNbOfDistinctRecipients=Numero di singoli destinatari
 NoTargetYet=Nessun destinatario ancora definito (Vai alla scheda 'destinatari')
-NoRecipientEmail=No recipient email for %s
+NoRecipientEmail=Nessuna email destinataria per %s
 RemoveRecipient=Rimuovi destinatario
 YouCanAddYourOwnPredefindedListHere=Per creare le liste di email predefinite leggi htdocs/core/modules/mail/README.
 EMailTestSubstitutionReplacedByGenericValues=Quando si utilizza la modalità di prova le variabili vengono sostituite con valori generici
@@ -73,15 +73,15 @@ ActivateCheckReadKey=Chiave utilizzata per crittografare l'URL utilizzato per la
 EMailSentToNRecipients=Email sent to %s recipients.
 EMailSentForNElements=Email sent for %s elements.
 XTargetsAdded=<b>%s</b> destinatari aggiunti alla lista di invio
-OnlyPDFattachmentSupported=If the PDF documents were already generated for the objects to send, they will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachments in mass sending in this version).
-AllRecipientSelected=The recipients of the %s record selected (if their email is known).
-GroupEmails=Group emails
+OnlyPDFattachmentSupported=Se i documenti PDF sono già stata generati per gli oggetti da spedire verranno allegati all'email. Altrimenti, l'email non verrà inviata. (solo i documenti PDF sono supportati come allegato all'email in questa versione).
+AllRecipientSelected=I destinatari dei %s record selezionati (se le loro email sono corrette).
+GroupEmails=Raggruppa emails
 OneEmailPerRecipient=Una e-mail per destinatario (per impostazione predefinita, una e-mail per record selezionato)
-WarningIfYouCheckOneRecipientPerEmail=Warning, if you check this box, it means only one email will be sent for several different record selected, so, if your message contains substitution variables that refers to data of a record, it becomes not possible to replace them.
-ResultOfMailSending=Result of mass Email sending
-NbSelected=Number selected
-NbIgnored=Number ignored
-NbSent=Number sent
+WarningIfYouCheckOneRecipientPerEmail=Attenzione, se selezioni questi checkbox, verrà inviata una sola email per vari records selezionati dello stesso soggetto terzo, così se il tuo testo contiene parole chiave da sostituire diventerà impossibile la sostituzione puntuale.
+ResultOfMailSending=Risultato dell'invio massivo email
+NbSelected=Numero selezionate
+NbIgnored=Numero ignorate
+NbSent=Numero inviate
 SentXXXmessages=%s message(s) sent.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Soggetti terzi (per categoria)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=Tutti i filtri devono corrispondere affinché venga raccolta un'e-mail
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record creato da Email Collector %s dall'email %s
 DefaultBlacklistMailingStatus=Valore predefinito per il campo '%s' durante la creazione di un nuovo contatto
 DefaultStatusEmptyMandatory=Vuoto ma obbligatorio
 WarningLimitSendByDay=ATTENZIONE: la configurazione o il contratto della tua istanza limita il numero di email al giorno a <b> %s </b> . Il tentativo di inviarne di più potrebbe comportare un rallentamento o la sospensione dell'istanza. Contatta il tuo supporto se hai bisogno di una quota più alta.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/it_IT/ticket.lang b/htdocs/langs/it_IT/ticket.lang
index ea1df7ffb82..e08f2a68075 100644
--- a/htdocs/langs/it_IT/ticket.lang
+++ b/htdocs/langs/it_IT/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Modifica tickets
 Permission56003=Cancella tickets
 Permission56004=Manage tickets
 Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=Ticket - Tipologie
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=External contributor
 OriginEmail=Email giornalista
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Da leggere
 Assigned=Assegnato
@@ -183,7 +186,7 @@ CreatedBy=Creato da
 NewTicket=Nuovo Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Classificazione dei biglietti
+TicketCategory=Ticket group
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 58b090cb9a0..47ba07a9b93 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=子会社アカウントのコンボリストを有効
 ACCOUNTING_DATE_START_BINDING=会計で結合と転記を開始する日付を定義する。この日付を下回ると、取引は会計に転記されない。
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=会計転送では、デフォルトで選択される期間は何か
 
-ACCOUNTING_SELL_JOURNAL=販売仕訳帳 (販売と返品)
-ACCOUNTING_PURCHASE_JOURNAL=購買仕訳帳(購入と返品)
-ACCOUNTING_BANK_JOURNAL=現金仕訳帳（入出金）
+ACCOUNTING_SELL_JOURNAL=販売仕訳帳 - 販売と返品
+ACCOUNTING_PURCHASE_JOURNAL=仕訳帳 - 購入と返品
+ACCOUNTING_BANK_JOURNAL=現金仕訳帳 - 入出金
 ACCOUNTING_EXPENSEREPORT_JOURNAL=経費報告仕訳帳
 ACCOUNTING_MISCELLANEOUS_JOURNAL=一般仕訳帳
 ACCOUNTING_HAS_NEW_JOURNAL=新規仕訳帳がある
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=これにより、年/月および/または特定の仕訳の
 ConfirmDeleteMvtPartial=これにより、トランザクションが会計から削除される（同じトランザクションに関連する全行が削除される）
 FinanceJournal=財務仕訳帳
 ExpenseReportsJournal=経費報告仕訳帳
+InventoryJournal=在庫仕訳帳
 DescFinanceJournal=銀行口座による全種別の支払を含む財務仕訳帳
 DescJournalOnlyBindedVisible=これは、勘定科目に結合され、仕訳帳と元帳に記録できるレコードのビュー。
 VATAccountNotDefined=VATの科目が定義されていない
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index a29776436ca..bc562de5cb1 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -145,6 +145,7 @@ Box=ウィジェット
 Boxes=ウィジェット
 MaxNbOfLinesForBoxes=ウィジェットsの最大行数
 AllWidgetsWereEnabled=使用可能な全ウィジェットsが有効
+WidgetAvailable=利用可能なウィジェット
 PositionByDefault=デフォルト順
 Position=位置
 MenusDesc=メニューマネージャは、2つのメニューバー ( 水平および垂直 ) のコンテンツを設定する。
@@ -374,7 +375,7 @@ DoTestSendHTML=HTMLを送信するテスト
 ErrorCantUseRazIfNoYearInMask=エラー。シーケンス{yy}または{yyyy}がマスクされていない場合、オプション@を使用して毎年カウンターをリセットすることはできない。
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=エラー、シーケンス場合は、@オプションを使用することはできない{YY} {ミリメートル}または{探す} {mmは}マスクではない。
 UMask=のUnix / Linux / BSDのファイルシステム上に新規ファイルのumaskパラメータ。
-UMaskExplanation=このパラメータは、 ( たとえば、アップロード中に ) 、サーバー上でDolibarrによって作成されたファイルは、デフォルトで設定されているアクセス許可を定義することができる。 <br>それは、8進値 ( 例えば、0666が意味するのは全員に対して読取および書込 ) である必要がある。 <br>このパラメータは、Windowsサーバー上では役に立たない。
+UMaskExplanation=このパラメーターを使用すると、サーバー上で Dolibarr によって作成されたファイルにデフォルトで設定されるアクセス許可を定義できる (アップロード中など)。 <br> 8 進数値であること (たとえば、0666 は全員の読み書きを意味する)。推奨値は 0600 または 0660 <br> 。このパラメーターは、Windows サーバーでは使われない。
 SeeWikiForAllTeam=寄稿者とその組織のリストについては、Wikiページを見ること。
 UseACacheDelay= 秒単位でをエクスポート応答をキャッシュするための遅延 ( 0またはキャッシュなしの空の ) 
 DisableLinkToHelpCenter=ログインページのリンク「<b>ヘルプまたはサポートが必要</b>」を非表示にする
@@ -663,7 +664,7 @@ Module2900Desc=のGeoIP Maxmindの変換機能
 Module3200Name=変更不可能なアーカイブ
 Module3200Desc=ビジネスイベントの変更不可能なログを有効化。イベントはリアルタイムでアーカイブされる。ログは、エクスポート可能な連鎖イベントの読取り専用テーブル。このモジュールは、国によっては必須の場合がある。
 Module3300Name=モジュールビルダー
-Module3200Desc=ビジネスイベントの変更不可能なログを有効化。イベントはリアルタイムでアーカイブされる。ログは、エクスポート可能な連鎖イベントの読取り専用テーブル。このモジュールは、国によっては必須の場合がある。
+Module3300Desc=開発者または上級ユーザーが独自のモジュール/アプリケーションを構築するのに役立つ RAD (Rapid Application Development - ローコードおよびノーコード) ツール。
 Module3400Name=ソーシャルネットワーク
 Module3400Desc=ソーシャルネットワークフィールドを取引先とアドレス（skype、twitter、facebookなど）に対して有効化する。
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=低メモリモードを使用する
 ExportUseLowMemoryModeHelp=低メモリ モードを使用してダンプ ファイルを生成する (圧縮は、PHP メモリではなく、パイプを介して行われます)。このメソッドでは、ファイルが完全であることを確認できず、失敗した場合にエラー メッセージを報告できない。メモリ不足エラーが発生した場合に使用する。
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = dolibarrトリガーをキャッチしてURLに送信するためのインターフェース
+ModuleWebhookDesc = dolibarr トリガーをキャッチし、イベントのデータを URL に送信するためのインターフェイス
 WebhookSetup = Webhookのセットアップ
 Settings = 設定
 WebhookSetupPage = Webhookセットアップページ
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=警告: モジュール %s は
 WarningModuleHasChangedSecurityCsrfParameter=警告: モジュール %s はインスタンスの CSRF セキュリティを無効にしました。このアクションは疑わしいものであり、インストールが保護されていない可能性がある。説明については、モジュールの作成者に連絡すること。
 EMailsInGoingDesc=受信メールはモジュール %s によって管理される。受信メールをサポートする必要がある場合は、有効にして構成する必要がある。
 MAIN_IMAP_USE_PHPIMAP=ネイティブ PHP IMAP の代わりに、IMAP 用の PHP-IMAP ライブラリを使用する。これにより、IMAP に OAuth2 接続を使用することもできる (モジュール OAuth も有効にする必要がある)。
+MAIN_CHECKBOX_LEFT_COLUMN=フィールドと行を選択するための列を左側に表示します (デフォルトでは右側)。
+
+CSSPage=CSS スタイル
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index 096c0447144..ef35860c467 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -118,6 +118,27 @@ BoxCustomersOutstandingBillReached=上限に達した顧客
 UsersHome=ユーザとグループ
 MembersHome=ホーム成員資格
 ThirdpartiesHome=取引先
+productindex=ホーム 製品とサービス
+mrpindex=ホーム MRP
+commercialindex=ホーム 商取引
+projectsindex=ホーム プロジェクト
+invoiceindex=ホーム インボイス
+hrmindex=ホーム インボイス
 TicketsHome=チケット
+stockindex=ホーム 在庫
+sendingindex=ホーム 配送
+receptionindex=ホーム 受領
+activityindex=ホーム アクティビティ
+proposalindex=ホーム 提案
+ordersindex=ホーム 注文
+orderssuppliersindex=ホーム 仕入先注文
+contractindex=ホーム 契約
+interventionindex=ホーム 出張
+suppliersproposalsindex=ホーム 仕入先提案
+donationindex=ホーム 寄付
+specialexpensesindex=ホーム 特別費用
+expensereportindex=ホーム 経費報告書
+mailingindex=ホーム 郵送
+opensurveyindex=ホーム 公開アンケート
 AccountancyHome=会計
 ValidatedProjects=検証済プロジェクト
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index a204e318a84..986ef4448d7 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=DMS / ECMエリア
 ECMAreaDesc=DMS / ECM(ドキュメント管理システム/電子コンテンツ管理)エリアでは、Dolibarr内のあらゆる種類のドキュメントをすばやく保存、共有、検索できる。
 ECMAreaDesc2a=* 手動ディレクトリは、特定の要素にリンクされていないドキュメントを保存するために使用できる。
 ECMAreaDesc2b=* 要素のページからドキュメントを追加すると、自動ディレクトリが自動的に入力される。
-ECMAreaDesc3=* Medias ディレクトリは、documents ディレクトリのサブディレクトリ <b> /medias </b> にあるファイルであり、ログに記録する必要も、ファイルを明示的に共有する必要もなく、誰でも読み取ることができる。電子メールまたは ウェブサイト モジュールからの画像ファイルを保存するために使用される。
+ECMAreaDesc3=* Medias ディレクトリは、documents ディレクトリのサブディレクトリ <b> /medias </b> にあるファイルであり、ログに記録する必要もファイルを明示的に共有する必要もなく、誰でも読み取り可能。たとえば、電子メールやウェブサイト モジュールなどの画像ファイルを保存するために使用される。
 ECMSectionWasRemoved=ディレクトリの<b>%sが</b>削除されている。
 ECMSectionWasCreated=ディレクトリ<b>%s</b>が作成された。
 ECMSearchByKeywords=キーワードで検索
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 4f05d480d7e..9cc95c1640c 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -262,6 +262,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=エラー、パラメータ <b> %s
 ErrorLoginDateValidity=エラー、このログインは有効期間外だ
 ErrorValueLength=フィールドの長さ '<b> %s </b>'は '<b> %s</b>'より大きくなければならない
 ErrorReservedKeyword=「<b>%s</b>」という単語は予約語 
+ErrorFilenameReserved=ファイル名 <b> %s </b> は、予約および保護されたコマンドであるため使用不可。
 ErrorNotAvailableWithThisDistribution=このディストリビューションでは利用できない
 ErrorPublicInterfaceNotEnabled=公開インターフェイスが有効になっていない
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=別のページの翻訳として設定されている場合は、新しいページの言語を定義する必要がある
@@ -308,7 +309,7 @@ ErrorExistingPermission = オブジェクト <b> %s </b> に対する権限 <b>
 ErrorFieldExist=<b> %s </b> の値は既に存在する
 ErrorEqualModule=<b> %s </b> で無効なモジュール
 ErrorFieldValue=<b> %s </b> の値が正しくない
-ErrorCoherenceMenu= <b> %s </b> は、<b> % </b> が LEFT と等しい場合に必要です。
+ErrorCoherenceMenu= <b> %s </b> は、<b> %s </b> が「左」の場合に必要。
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize(%s)は、PHPパラメータ post_max_size(%s)よりも大きくなっている。これは一貫した設定ではない。
diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang
index 8ecd381fd0f..cca5ba8fe01 100644
--- a/htdocs/langs/ja_JP/interventions.lang
+++ b/htdocs/langs/ja_JP/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=出張レコードの日付フィールドから
 InterventionStatistics=出張の統計
 NbOfinterventions=出張カードの数
 NumberOfInterventionsByMonth=月ごとの出張カードの数(検証日)
-AmountOfInteventionNotIncludedByDefault=出張の量はデフォルトでは利益に含まれていない(ほとんどの場合、タイムシートは費やされた時間カウント のために使用される)。それらを含めるには、ホーム - 設定 - その他 にて、オプションPROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFITを1で追加。
+AmountOfInteventionNotIncludedByDefault=デフォルトでは、出張総額は利益に含まれない (ほとんどの場合、タイムシートは費やされた時間をカウントするために使用される)。 PROJECT_ELEMENTS_FOR_ADD_MARGIN および PROJECT_ELEMENTS_FOR_MINUS_MARGIN オプションを home-setup-other に使用し、利益に含まれる要素のリストとして完結させることができる。
 InterId=出張ID
 InterRef=出張参照。
 InterDateCreation=日付作成出張
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index d3b4be716b5..adbda32c39b 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -7,10 +7,10 @@ MailCard=カードをメールで送信
 MailRecipients=受取人
 MailRecipient=受信者
 MailTitle=説明
-MailFrom=送信者
+MailFrom=期初
 MailErrorsTo=エラーへ
 MailReply=に返信
-MailTo=受信者(単数または複数)
+MailTo=期末
 MailToUsers=ユーザ(s)へ
 MailCC=にコピー
 MailToCCUsers=ユーザs(s)にコピーする
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=位置別の連絡先
 MailingModuleDescEmailsFromFile=ファイルからのメール
 MailingModuleDescEmailsFromUser=ユーザが入力したメール
 MailingModuleDescDolibarrUsers=メールを持っているユーザ
-MailingModuleDescThirdPartiesByCategories=取引先(カテゴリ別)
+MailingModuleDescThirdPartiesByCategories=取引先
 SendingFromWebInterfaceIsNotAllowed=Webインターフェイスからの送信は許可されていない。
 EmailCollectorFilterDesc=メールを取得するには、全フィルタが適合している必要がある
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=電子メールコレクター%sによって電子
 DefaultBlacklistMailingStatus=新しい連絡先を作成するときのフィールド「%s」のデフォルト値
 DefaultStatusEmptyMandatory=空だが必須
 WarningLimitSendByDay=警告：インスタンスのセットアップまたはコントラクトにより、1日あたりのメール数が<b>%s</b>に制限される。さらに送信しようとすると、インスタンスの速度が低下したり、停止したりする可能性があります。より高い割り当てが必要な場合は、サポートに連絡すること。
+NoMoreRecipientToSendTo=メールを送信する受信者がもういない
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index e1c475456b0..90dad9a5433 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -514,6 +514,7 @@ NotYetAvailable=まだ利用できず
 NotAvailable=利用できず
 Categories=タグs/カテゴリs
 Category=タグ/カテゴリ
+SelectTheTagsToAssign=割り当てるタグ/カテゴリを選択する
 By=によって
 From=から
 FromDate=から
@@ -1223,5 +1224,6 @@ AddToContacts=連絡先にアドレスを追加
 LastAccess=最終アクセス
 UploadAnImageToSeeAPhotoHere=タブ %s から画像をアップロードし、ここに写真を表示する
 LastPasswordChangeDate=パスワードの最終変更日
-PublicVirtualCardUrl=仮想名刺ページ
+PublicVirtualCardUrl=仮想名刺ページのURL
+PublicVirtualCard=仮想名刺
 TreeView=ツリー表示
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index 2e7139ed039..244fc4f5ee4 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -6,6 +6,7 @@ TotalMargin=総利益
 MarginOnProducts=利益/製品
 MarginOnServices=利益/サービス
 MarginRate=利益率
+ModifyMarginRates=証拠金率の変更
 MarkRate=マーク率
 DisplayMarginRates=利益率を表示する
 DisplayMarkRates=マーク率を表示する
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index dbb2bb36501..433a5718482 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -4,6 +4,8 @@ MemberCard=構成員カード
 SubscriptionCard=サブスクリプション·カード
 Member=構成員
 Members=構成員
+NoRecordedMembers=登録メンバーなし
+NoRecordedMembersByType=登録メンバーなし
 ShowMember=構成員カードを表示
 UserNotLinkedToMember=構成員にリンクされていないユーザ
 ThirdpartyNotLinkedToMember=構成員にリンクされていない取引先
@@ -233,3 +235,4 @@ CreateDolibarrThirdPartyDesc=取引先とは法人であり、拠出金ごとに
 MemberFirstname=メンバの名
 MemberLastname=メンバの姓
 MemberCodeDesc=すべてのメンバーに固有のメンバーコード
+NoRecordedMembers=登録メンバーなし
diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang
index c27c4161eb4..8af5c00fc26 100644
--- a/htdocs/langs/ja_JP/mrp.lang
+++ b/htdocs/langs/ja_JP/mrp.lang
@@ -119,3 +119,6 @@ BomCantAddChildBom=命名法 %s は、命名法 %s につながるツリーに
 BOMNetNeeds = BOM 正味必要量
 BOMProductsList=BOMの製品
 BOMServicesList=BOMのサービス
+Manufacturing=製造業
+Disassemble=分解する
+ProducedBy=によって生産
diff --git a/htdocs/langs/ja_JP/partnership.lang b/htdocs/langs/ja_JP/partnership.lang
index adb099cec5e..a2f24c4b4c6 100644
--- a/htdocs/langs/ja_JP/partnership.lang
+++ b/htdocs/langs/ja_JP/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=パートナーシップ: 参照元のバックリン
 # Menu
 #
 NewPartnership=新規パートナーシップ
-NewPartnershipbyWeb= パートナーシップが正常に追加された。
+NewPartnershipbyWeb=パートナーシップ リクエストが正常に追加された。近日中にご連絡するやも...
 ListOfPartnerships=パートナーシップのリスト
 
 #
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index e7ae49dac9f..654b5ebe4ae 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=によって作成された
 NewTicket=新規チケット
 SubjectAnswerToTicket=チケットの回答
 TicketTypeRequest=要求の種類
-TicketCategory=チケット分類
+TicketCategory=チケットグループ
 SeeTicket=チケットを見る
 TicketMarkedAsRead=チケットは既読としてマークされている
 TicketReadOn=読む
diff --git a/htdocs/langs/kk_KZ/admin.lang b/htdocs/langs/kk_KZ/admin.lang
index f26426e6e64..2bc0f272b34 100644
--- a/htdocs/langs/kk_KZ/admin.lang
+++ b/htdocs/langs/kk_KZ/admin.lang
@@ -145,6 +145,7 @@ Box=Виджет
 Boxes=Виджеттер
 MaxNbOfLinesForBoxes=Максимум виджеттерге арналған жолдар саны
 AllWidgetsWereEnabled=Барлық қол жетімді виджеттер қосылған
+WidgetAvailable=Widget available
 PositionByDefault=Әдепкі тапсырыс
 Position=Позиция
 MenusDesc=Мәзір менеджерлері екі мәзір жолағының мазмұнын орнатады (көлденең және тік).
@@ -374,7 +375,7 @@ DoTestSendHTML=HTML жіберуді тексеру
 ErrorCantUseRazIfNoYearInMask=Қате, {yy} немесе {yyyy} реттілігі маскада болмаса, есептегішті жыл сайын қалпына келтіру үшін @ опциясын қолдана алмайсыз.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Қате, егер {yy} {mm} немесе {yyyy} {mm} реттілігі маскада болмаса, @ опциясын қолдануға болмайды.
 UMask=Unix/Linux/BSD/Mac файлдық жүйесіндегі жаңа файлдар үшін UMask параметрі.
-UMaskExplanation=Бұл параметр серверде Dolibarr жасаған файлдарға әдепкі бойынша орнатылған рұқсаттарды анықтауға мүмкіндік береді (мысалы, жүктеу кезінде). <br> Ол сегіздік мән болуы керек (мысалы, 0666 барлығына оқу мен жазуды білдіреді). <br> Бұл параметр Windows серверінде пайдасыз.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Қатысушылардың тізімі мен оларды ұйымдастыру үшін Wiki бетін қараңыз
 UseACacheDelay= Экспорттық жауапты секундтарда кэштеуді кешіктіру (0 немесе кэшсіз бос)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind түрлендіру мүмкіндіктері
 Module3200Name=Өзгермейтін мұрағаттар
 Module3200Desc=Іскерлік оқиғалардың өзгермейтін журналын қосыңыз. Оқиғалар нақты уақыт режимінде мұрағатталады. Журнал-экспорттауға болатын тізбектелген оқиғалардың тек оқуға арналған кестесі. Бұл модуль кейбір елдер үшін міндетті болуы мүмкін.
 Module3300Name=Module Builder
-Module3200Desc=Іскерлік оқиғалардың өзгермейтін журналын қосыңыз. Оқиғалар нақты уақыт режимінде мұрағатталады. Журнал-экспорттауға болатын тізбектелген оқиғалардың тек оқуға арналған кестесі. Бұл модуль кейбір елдер үшін міндетті болуы мүмкін.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Әлеуметтік желілер
 Module3400Desc=Әлеуметтік желілер өрістерін үшінші тараптар мен мекенжайларға қосыңыз (скайп, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/kk_KZ/interventions.lang b/htdocs/langs/kk_KZ/interventions.lang
index 15c32b13981..19e2063ae18 100644
--- a/htdocs/langs/kk_KZ/interventions.lang
+++ b/htdocs/langs/kk_KZ/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Интервенциялық жазбалар үш
 InterventionStatistics=Интервенциялар статистикасы
 NbOfinterventions=Интервенциялық карталардың саны
 NumberOfInterventionsByMonth=Айлар бойынша араласу карталарының саны (жарамдылық күні)
-AmountOfInteventionNotIncludedByDefault=Интервенция сомасы пайдаға әдепкі бойынша кірмейді (көп жағдайда уақыт кестесі жұмсалған уақытты есептеу үшін қолданылады). Оларды қосу үшін PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT опциясын 1-ге қосыңыз.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Интервенция идентификаторы
 InterRef=Интервенция реф.
 InterDateCreation=Күнді құруға араласу
@@ -66,3 +66,7 @@ RepeatableIntervention=Интервенция үлгісі
 ToCreateAPredefinedIntervention=Алдын ала анықталған немесе қайталанатын араласуды жасау үшін жалпы араласуды жасаңыз және оны араласу үлгісіне айналдырыңыз
 ConfirmReopenIntervention=<b> %s </b> араласуды қайтарғыңыз келетініне сенімдісіз бе?
 GenerateInter=Интервенцияны жасаңыз
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/kk_KZ/mails.lang b/htdocs/langs/kk_KZ/mails.lang
index 4b995dfb0eb..2029a055ca9 100644
--- a/htdocs/langs/kk_KZ/mails.lang
+++ b/htdocs/langs/kk_KZ/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Байланыстар лауазымы бо
 MailingModuleDescEmailsFromFile=Файлдан келген хаттар
 MailingModuleDescEmailsFromUser=Пайдаланушының электрондық поштаны енгізуі
 MailingModuleDescDolibarrUsers=Электрондық поштасы бар пайдаланушылар
-MailingModuleDescThirdPartiesByCategories=Үшінші тұлғалар (категориялар бойынша)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=Веб -интерфейстен жіберуге рұқсат жоқ.
 EmailCollectorFilterDesc=Электрондық поштаның жиналуы үшін барлық сүзгілер сәйкес келуі керек
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=%s электрондық пошта жинауш
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Бос, бірақ міндетті
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/kk_KZ/ticket.lang b/htdocs/langs/kk_KZ/ticket.lang
index 4a7f38b7f5d..ca9b0a10973 100644
--- a/htdocs/langs/kk_KZ/ticket.lang
+++ b/htdocs/langs/kk_KZ/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Билеттерді өзгерту
 Permission56003=Билеттерді жою
 Permission56004=Билеттерді басқару
 Permission56005=Барлық үшінші тараптардың билеттерін қараңыз (сыртқы пайдаланушылар үшін тиімді емес, әрқашан олар тәуелді үшінші жақпен шектеледі)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=Билет - түрлері
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Сыртқы қатысушы
 OriginEmail=Репортердің электрондық поштасы
 Notify_TICKET_SENTBYMAIL=Билет хабарламасын электрондық пошта арқылы жіберіңіз
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Оқыңыз
 Assigned=Тағайындалған
@@ -183,7 +186,7 @@ CreatedBy=Жасалған
 NewTicket=Жаңа билет
 SubjectAnswerToTicket=Билет жауабы
 TicketTypeRequest=Сұраныс түрі
-TicketCategory=Билеттердің жіктелуі
+TicketCategory=Ticket group
 SeeTicket=Билетті қараңыз
 TicketMarkedAsRead=Билет оқылды деп белгіленді
 TicketReadOn=Оқыңыз
diff --git a/htdocs/langs/km_KH/mails.lang b/htdocs/langs/km_KH/mails.lang
index 52c4d4dbf69..f04ee17575c 100644
--- a/htdocs/langs/km_KH/mails.lang
+++ b/htdocs/langs/km_KH/mails.lang
@@ -7,10 +7,10 @@ MailCard=EMailing card
 MailRecipients=Recipients
 MailRecipient=Recipient
 MailTitle=Description
-MailFrom=Sender
+MailFrom=From
 MailErrorsTo=Errors to
 MailReply=Reply to
-MailTo=Receiver(s)
+MailTo=To
 MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -178,3 +178,5 @@ IsAnAnswer=Is an answer of an initial email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 52c4d4dbf69..d94546ba22f 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -7,10 +7,10 @@ MailCard=EMailing card
 MailRecipients=Recipients
 MailRecipient=Recipient
 MailTitle=Description
-MailFrom=Sender
+MailFrom=From
 MailErrorsTo=Errors to
 MailReply=Reply to
-MailTo=Receiver(s)
+MailTo=To
 MailToUsers=To user(s)
 MailCC=Copy to
 MailToCCUsers=Copy to users(s)
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=ಮೂರನೇ ಪಕ್ಷಗಳು
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -178,3 +178,5 @@ IsAnAnswer=Is an answer of an initial email
 RecordCreatedByEmailCollector=Record created by the Email Collector %s from email %s
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
+WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index 9ab5f2a9af4..59c60b9bd85 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=협력업체
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index e63ddd1ff26..299d8a82caf 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -145,6 +145,7 @@ Box=ວິດເຈັດ
 Boxes=ວິດເຈັດ
 MaxNbOfLinesForBoxes=ສູງສຸດ ຈໍານວນແຖວສໍາລັບເຄື່ອງມື
 AllWidgetsWereEnabled=ວິດເຈັດທີ່ມີທັງົດຖືກເປີດ ນຳ ໃຊ້
+WidgetAvailable=Widget available
 PositionByDefault=ຄໍາສັ່ງເລີ່ມຕົ້ນ
 Position=ຕຳ ແໜ່ງ
 MenusDesc=ຜູ້ຈັດການເມນູກໍານົດເນື້ອໃນຂອງສອງແຖບເມນູ (ລວງນອນແລະລວງຕັ້ງ).
@@ -374,7 +375,7 @@ DoTestSendHTML=ທົດສອບການສົ່ງ HTML
 ErrorCantUseRazIfNoYearInMask=ຜິດພາດ, ບໍ່ສາມາດໃຊ້ຕົວເລືອກ @ ເພື່ອຣີເຊັດຕົວນັບແຕ່ລະປີໄດ້ຖ້າລໍາດັບ {yy} ຫຼື {yyyy} ບໍ່ຢູ່ໃນ ໜ້າ ກາກ.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=ຜິດພາດ, ບໍ່ສາມາດໃຊ້ຕົວເລືອກ @ if sequence {yy} {mm} ຫຼື {yyyy} {mm} ບໍ່ຢູ່ໃນ ໜ້າ ກາກ.
 UMask=ພາຣາມິເຕີ UMask ສໍາລັບໄຟລ new ໃon່ຢູ່ໃນລະບົບໄຟລ Un Unix/Linux/BSD/Mac.
-UMaskExplanation=ຕົວກໍານົດການນີ້ອະນຸຍາດໃຫ້ເຈົ້າກໍານົດການອະນຸຍາດທີ່ຕັ້ງໄວ້ໂດຍຄ່າເລີ່ມຕົ້ນໃນໄຟລ created ທີ່ສ້າງໂດຍ Dolibarr ຢູ່ໃນເຊີບເວີ (ຕົວຢ່າງໃນລະຫວ່າງການອັບໂຫຼດ). <br> ມັນຈະຕ້ອງເປັນຄ່າເລກຖານແປດ (ຕົວຢ່າງ, 0666 meansາຍເຖິງການອ່ານແລະຂຽນ ສຳ ລັບທຸກຄົນ). <br> ພາຣາມິເຕີນີ້ບໍ່ມີປະໂຫຍດຕໍ່ກັບເຊີບເວີ Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=ເບິ່ງທີ່ ໜ້າ ວິກິພີເດຍສໍາລັບລາຍຊື່ຜູ້ປະກອບສ່ວນແລະການຈັດຕັ້ງຂອງເຂົາເຈົ້າ
 UseACacheDelay= ຊັກຊ້າ ສຳ ລັບການຕອບກັບການສົ່ງອອກແຄດເປັນວິນາທີ (0 ຫຼືຫວ່າງເປົ່າໂດຍບໍ່ມີແຄດ)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=ຄວາມສາມາດໃນການແປງ GeoIP Maxmind
 Module3200Name=ເອກະສານທີ່ບໍ່ສາມາດປ່ຽນແປງໄດ້
 Module3200Desc=ເປີດໃຊ້ບັນທຶກເຫດການທາງທຸລະກິດທີ່ບໍ່ສາມາດປ່ຽນແປງໄດ້. ເຫດການຖືກເກັບໄວ້ໃນເວລາຈິງ. ໄມ້ທ່ອນເປັນຕາຕະລາງອ່ານຂອງເຫດການທີ່ມີລະບົບຕ່ອງໂສ້ເທົ່ານັ້ນທີ່ສາມາດສົ່ງອອກໄດ້. ໂມດູນນີ້ອາດຈະເປັນຂໍ້ບັງຄັບສໍາລັບບາງປະເທດ.
 Module3300Name=Module Builder
-Module3200Desc=ເປີດໃຊ້ບັນທຶກເຫດການທາງທຸລະກິດທີ່ບໍ່ສາມາດປ່ຽນແປງໄດ້. ເຫດການຖືກເກັບໄວ້ໃນເວລາຈິງ. ໄມ້ທ່ອນເປັນຕາຕະລາງອ່ານຂອງເຫດການທີ່ມີລະບົບຕ່ອງໂສ້ເທົ່ານັ້ນທີ່ສາມາດສົ່ງອອກໄດ້. ໂມດູນນີ້ອາດຈະເປັນຂໍ້ບັງຄັບສໍາລັບບາງປະເທດ.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=ເຄືອຂ່າຍສັງຄົມ
 Module3400Desc=ເປີດໃຊ້ງານເຄືອຂ່າຍສັງຄົມເຂົ້າໄປໃນພາກສ່ວນທີສາມແລະທີ່ຢູ່ (skype, twitter, facebook, ... ).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/lo_LA/interventions.lang b/htdocs/langs/lo_LA/interventions.lang
index 4c7b4c715dd..2fa236a76b2 100644
--- a/htdocs/langs/lo_LA/interventions.lang
+++ b/htdocs/langs/lo_LA/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=ເຊື່ອງຊົ່ວໂມງແລະ
 InterventionStatistics=ສະຖິຕິການແຊກແຊງ
 NbOfinterventions=ຈຳ ນວນຂອງບັດການແຊກແຊງ
 NumberOfInterventionsByMonth=ຈຳ ນວນຂອງບັດແຊກແຊງຕາມເດືອນ (ວັນທີຂອງການກວດສອບ)
-AmountOfInteventionNotIncludedByDefault=ຈໍານວນຂອງການແຊກແຊງແມ່ນບໍ່ລວມເຂົ້າໄປໃນກໍາໄລ (ໃນກໍລະນີຫຼາຍທີ່ສຸດ, timesheets ແມ່ນໃຊ້ເພື່ອນັບເວລາທີ່ໃຊ້ໄປ). ເພີ່ມຕົວເລືອກ PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT ໃສ່ 1 ເຂົ້າໄປໃນ home-setup-other ເພື່ອລວມເອົາພວກມັນເຂົ້າ.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=id ການແຊກແຊງ
 InterRef=ການແຊກແຊງເອກະສານ
 InterDateCreation=ການແຊກແຊງການສ້າງວັນທີ
@@ -66,3 +66,7 @@ RepeatableIntervention=ແມ່ແບບຂອງການແຊກແຊງ
 ToCreateAPredefinedIntervention=ເພື່ອສ້າງການແຊກແຊງທີ່ ກຳ ນົດໄວ້ລ່ວງ ໜ້າ ຫຼືເກີດຂຶ້ນຊ້ ຳ,, ສ້າງການແຊກແຊງທົ່ວໄປແລະປ່ຽນມັນເປັນແມ່ແບບການແຊກແຊງ
 ConfirmReopenIntervention=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການເປີດການແຊກແຊງ <b> %s </b>?
 GenerateInter=ສ້າງການແຊກແຊງ
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 3d040de3564..4bd90598db5 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=ຕິດຕໍ່ພົວພັນໂດ
 MailingModuleDescEmailsFromFile=ອີເມວຈາກໄຟລ
 MailingModuleDescEmailsFromUser=ການປ້ອນຂໍ້ມູນອີເມວໂດຍຜູ້ໃຊ້
 MailingModuleDescDolibarrUsers=ຜູ້ໃຊ້ທີ່ມີອີເມລ
-MailingModuleDescThirdPartiesByCategories=ພາກສ່ວນທີສາມ (ຕາມcategoriesວດູ່)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=ການສົ່ງຈາກອິນເຕີເຟດເວັບແມ່ນບໍ່ອະນຸຍາດ.
 EmailCollectorFilterDesc=ຕົວກັ່ນຕອງທັງmustົດຕ້ອງກົງກັນເພື່ອຈະໄດ້ເກັບ ກຳ ອີເມວ
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=ບັນທຶກທີ່ສ້າງໂດຍ
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=ຫວ່າງແຕ່ບັງຄັບ
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/lo_LA/ticket.lang b/htdocs/langs/lo_LA/ticket.lang
index cc096e494b5..ecb307245ca 100644
--- a/htdocs/langs/lo_LA/ticket.lang
+++ b/htdocs/langs/lo_LA/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=ແກ້ໄຂປີ້
 Permission56003=ລຶບປີ້
 Permission56004=ຈັດການປີ້
 Permission56005=ເບິ່ງປີ້ຂອງພາກສ່ວນທີສາມທັງ(ົດ (ບໍ່ມີປະສິດທິພາບສໍາລັບຜູ້ໃຊ້ພາຍນອກ, ຈໍາກັດສະເພາະກັບບຸກຄົນທີສາມທີ່ພວກເຂົາຂຶ້ນກັບ)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=ປີ້ - ປະເພດ
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=ຜູ້ປະກອບສ່ວນພ
 OriginEmail=ອີເມລ orter ຂອງນັກຂ່າວ
 Notify_TICKET_SENTBYMAIL=ສົ່ງຂໍ້ຄວາມປີ້ທາງອີເມລ
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=ອ່ານ
 Assigned=ມອບາຍ
@@ -183,7 +186,7 @@ CreatedBy=ສ້າງ​ໂດຍ
 NewTicket=ປີ້ໃ່
 SubjectAnswerToTicket=ຄຳ ຕອບປີ້
 TicketTypeRequest=ປະເພດການຮ້ອງຂໍ
-TicketCategory=ການຈັດປະເພດປີ້
+TicketCategory=Ticket group
 SeeTicket=ເບິ່ງປີ້
 TicketMarkedAsRead=ປີ້ຖືກmarkedາຍວ່າອ່ານແລ້ວ
 TicketReadOn=ອ່ານສຸດ
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index dd4c00857a8..26cd7014950 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max. number of lines for widgets
 AllWidgetsWereEnabled=All available widgets are enabled
+WidgetAvailable=Widget available
 PositionByDefault=Numatytoji paraiška
 Position=Pozicija
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
@@ -374,7 +375,7 @@ DoTestSendHTML=Testo siuntimas HTML
 ErrorCantUseRazIfNoYearInMask=Klaida, negalima naudoti opcijos @ vėl nustatyti (reset) skaitiklį kiekvienais metais, jei seka {yy} arba {yyyy} nėra uždangoje (mask).
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Klaida, negalima naudoti opcijos @ jei sekos {yy}{mm} arba {yyyy}{mm} nėra uždangoje (mask).
 UMask=UMask parametras naujiems failams Unix/Linux/BSD/Mac tipo sistemoms.
-UMaskExplanation=Šis parametras leidžia nustatyti leidimų rinkinį pagal nutylėjimą failams Dolibarr sukurtiems serveryje (pvz.: atliekant duomenų rinkinio siuntimą (upload)).<br> Jis turi būti aštuntainis (pvz., 0666 reiškia skaityti ir įrašyti visiems).<br> Šis parametras yra nenaudojamas Windows serveryje.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= Tarpinės atminties (cache) eksporto reakcijos vėlinimas sekundėmis (0 arba tuščia, kai nėra tarpinės atminties)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP MaxMind konvertavimo galimybes
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
 Module3300Name=Module Builder
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Social Networks
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=Žmogiškųjų išteklių valdymas (HRM)
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index b19b7e977e4..fa4ce048ddb 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Trečiosios šalys
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index cdc2fef581a..5610942b86f 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Iespējot kombinēto sarakstu meitas kontam (tas var b
 ACCOUNTING_DATE_START_BINDING=Definējiet datumu, lai sāktu iesiešanu un pārskaitīšanu grāmatvedībā. Zem šī datuma darījumi netiks pārnesti uz grāmatvedību.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Kāds ir grāmatvedības pārskaitījuma periods, kas atlasīts pēc noklusējuma
 
-ACCOUNTING_SELL_JOURNAL=Pārdošanas žurnāls (pārdošana un atgriešana)
-ACCOUNTING_PURCHASE_JOURNAL=Pirkumu žurnāls (pirkšana un atgriešana)
-ACCOUNTING_BANK_JOURNAL=Kases žurnāls (kvītis un izmaksas)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Izdevumu atskaites žurnāls
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Vispārējais žurnāls
 ACCOUNTING_HAS_NEW_JOURNAL=Vai jauns Vēstnesis?
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Tādējādi tiks dzēstas visas gada/mēneša un/vai konkrēta
 ConfirmDeleteMvtPartial=Tādējādi darījums tiks dzēsts no uzskaites (tiks dzēstas visas ar to pašu darījumu saistītās rindas)
 FinanceJournal=Finanšu žurnāls
 ExpenseReportsJournal=Izdevumu pārskatu žurnāls
+InventoryJournal=Inventory journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=Šis ir ieraksta skats, kas ir saistīts ar grāmatvedības kontu un kuru var ierakstīt žurnālos un virsgrāmatā.
 VATAccountNotDefined=PVN konts nav definēts
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 83041a00ee4..104c16aa966 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -145,6 +145,7 @@ Box=Logrīks
 Boxes=Logrīki
 MaxNbOfLinesForBoxes=Maks. logrīku līniju skaits
 AllWidgetsWereEnabled=Ir iespējoti visi pieejamie logrīki
+WidgetAvailable=Widget available
 PositionByDefault=Noklusējuma secība
 Position=Pozīcija
 MenusDesc=Izvēlnes pārvaldnieki nosaka divu izvēlņu joslu saturu (horizontāli un vertikāli).
@@ -374,7 +375,7 @@ DoTestSendHTML=Tests nosūtot HTML
 ErrorCantUseRazIfNoYearInMask=Kļūda, nevar izmantot opciju @, lai atjaunotu skaitītāju katru gadu, ja secība {yy} vai {yyyy} nav maskā.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Kļūda, nevar izmantot iespēju @, ja secība {gg} {mm} vai {gggg} {mm} nav maska.
 UMask=Umask parametri jauniem failiem Unix/Linux/BSD/Mac failu sistēma.
-UMaskExplanation=Šis parametrs ļauj noteikt atļaujas, kas pēc noklusējuma failus, ko rada Dolibarr uz servera (laikā augšupielādēt piemēram). <br> Tam jābūt astotnieku vērtība (piemēram, 0666 nozīmē lasīt un rakstīt visiem). <br> Šis parametrs ir bezjēdzīgi uz Windows servera.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Apskatiet Wiki lapu, lai iegūtu sarakstu ar dalībniekiem un to organizācijām
 UseACacheDelay= Kavēšanās caching eksporta atbildes sekundēs (0 vai tukšs bez cache)
 DisableLinkToHelpCenter=Paslēpt saiti "<b> nepieciešama palīdzība vai atbalsts </b>" pieteikšanās lapā
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP MaxMind pārveidošanu iespējas
 Module3200Name=Nemainīgi arhīvi
 Module3200Desc=Iespējojiet nemainīgu biznesa notikumu žurnālu. Notikumi tiek arhivēti reāllaikā. Žurnāls ir tikai lasāmu tabulu ķēdes notikumus, kurus var eksportēt. Šis modulis dažās valstīs var būt obligāts.
 Module3300Name=Moduļu veidotājs
-Module3200Desc=Iespējojiet nemainīgu biznesa notikumu žurnālu. Notikumi tiek arhivēti reāllaikā. Žurnāls ir tikai lasāmu tabulu ķēdes notikumus, kurus var eksportēt. Šis modulis dažās valstīs var būt obligāts.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Sociālie tīkli
 Module3400Desc=Iespējojiet sociālo tīklu laukus trešajām pusēm un adresēm (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Izmantojiet mazas atmiņas režīmu
 ExportUseLowMemoryModeHelp=Izmantojiet mazas atmiņas režīmu, lai ģenerētu izdrukas failu (saspiešana tiek veikta caur cauruli, nevis PHP atmiņā). Šī metode neļauj pārbaudīt, vai fails ir pilnīgs, un kļūdas ziņojumu nevar ziņot, ja tas neizdodas. Izmantojiet to, ja jums nav pietiekami daudz atmiņas kļūdu.
 
 ModuleWebhookName = Web aizķere
-ModuleWebhookDesc = Interfeiss, lai uztvertu dolibarr aktivizētājus un nosūtītu to uz URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Tīmekļa aizķeres iestatīšana
 Settings = Iestatījumi
 WebhookSetupPage = Web aizķeres iestatīšanas lapa
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/lv_LV/ecm.lang b/htdocs/langs/lv_LV/ecm.lang
index 560089bc4aa..de86412f521 100644
--- a/htdocs/langs/lv_LV/ecm.lang
+++ b/htdocs/langs/lv_LV/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=DMS / ECM apgabals
 ECMAreaDesc=Platība DMS / ECM (Dokumentu pārvaldības sistēma / Elektroniskā satura pārvaldība) ļauj ātri saglabāt, kopīgot un ātri meklēt dokumentus Dolibarr.
 ECMAreaDesc2a=* Manuālos direktorijus var izmantot, lai saglabātu dokumentus, kas nav saistīti ar konkrētu elementu.
 ECMAreaDesc2b=* Automātiskie direktoriji tiek aizpildīti automātiski, pievienojot dokumentus no elementa lapas.
-ECMAreaDesc3=* Medias direktoriji ir faili, kas atrodas dokumentu direktorijas apakšdirektorijā <b> /medias </b>, un tos var lasīt visi bez nepieciešamības reģistrēties un fails nav skaidri jākopīgo. To izmanto, lai saglabātu attēlu failus no e-pasta vai vietnes moduļa.
+ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=Katalogs <b>%s</b> ir dzēsts.
 ECMSectionWasCreated=Katalogs <b> %s </b> ir izveidots.
 ECMSearchByKeywords=Meklēt pēc atslēgvārdiem
diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang
index ce6de8b0c78..79063ebb7d0 100644
--- a/htdocs/langs/lv_LV/interventions.lang
+++ b/htdocs/langs/lv_LV/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Noslēpt stundas un minūtes no datuma lauka iejau
 InterventionStatistics=Intervences statistika
 NbOfinterventions=Intervences karšu skaits
 NumberOfInterventionsByMonth=Intervences karšu skaits pēc mēneša (validācijas datums)
-AmountOfInteventionNotIncludedByDefault=Ienākuma summa pēc noklusējuma netiek iekļauta peļņā (vairumā gadījumu laika kontrolsaraksts tiek izmantots, lai uzskaitītu pavadīto laiku). Lai tos iekļautu, pievienojiet opciju PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT uz 1 sākuma iestatīšanas pogu.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Intervences id
 InterRef=Intervences atsauce
 InterDateCreation=Date creation intervention
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 4d01ceeecac..d7f7947ff9e 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -7,10 +7,10 @@ MailCard=Sūtīšana pa e-kartiņu
 MailRecipients=Saņēmēji
 MailRecipient=Saņēmējs
 MailTitle=Apraksts
-MailFrom=Nosūtītājs
+MailFrom=No
 MailErrorsTo=Kļūdas līdz
 MailReply=Atbildēt uz
-MailTo=Saņēmējs (-i)
+MailTo=Kam
 MailToUsers=Lietotājam (-iem)
 MailCC=Kopēt
 MailToCCUsers=Kopēt lietotājiem (-iem)
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Kontakti pēc amata
 MailingModuleDescEmailsFromFile=E-pasti no faila
 MailingModuleDescEmailsFromUser=Lietotāja ievadītie e-pasti
 MailingModuleDescDolibarrUsers=Lietotāji ar e-pastu
-MailingModuleDescThirdPartiesByCategories=Trešās personas (pēc sadaļām)
+MailingModuleDescThirdPartiesByCategories=Trešās puses
 SendingFromWebInterfaceIsNotAllowed=Sūtīšana no tīmekļa saskarnes nav atļauta.
 EmailCollectorFilterDesc=Lai e-pasts tiktu apkopots, visiem filtriem ir jāatbilst
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Ierakstu izveidojis e-pasta savācējs %s no e-pas
 DefaultBlacklistMailingStatus=Lauka %s noklusējuma vērtība, veidojot jaunu kontaktpersonu
 DefaultStatusEmptyMandatory=Tukšs, bet obligāts
 WarningLimitSendByDay=BRĪDINĀJUMS. Jūsu instances iestatīšana vai līgums ierobežo jūsu e-pasta ziņojumu skaitu dienā līdz <b> %s </b> . Mēģinot sūtīt vairāk, jūsu instance var tikt palēnināta vai apturēta. Lūdzu, sazinieties ar atbalsta dienestu, ja jums nepieciešama lielāka kvota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/lv_LV/partnership.lang b/htdocs/langs/lv_LV/partnership.lang
index 977d036d741..b66900054af 100644
--- a/htdocs/langs/lv_LV/partnership.lang
+++ b/htdocs/langs/lv_LV/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Partnerība: pārbaudiet atsauces saiti
 # Menu
 #
 NewPartnership=Jauna partnerība
-NewPartnershipbyWeb= Jūsu partnerība tika veiksmīgi pievienota.
+NewPartnershipbyWeb=Your partnership request has been added successfully. We may contact you soon...
 ListOfPartnerships=Partnerības saraksts
 
 #
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index a6e66acef68..0d707ad1495 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Izveidojis
 NewTicket=Jauns notikums
 SubjectAnswerToTicket=Pieteikuma atbilde
 TicketTypeRequest=Pieprasījuma veids
-TicketCategory=Biļešu kategorizēšana
+TicketCategory=Ticket group
 SeeTicket=Apskatīt pieteikumu
 TicketMarkedAsRead=Pieteikums ir atzīmēts kā lasīts
 TicketReadOn=Izlasīts
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 7afcf08cde8..c8f6af25915 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Aktiver kombinasjonsliste for underordnet konto (kan v
 ACCOUNTING_DATE_START_BINDING=Definer en dato for å starte binding og overføring i regnskap. Etter denne datoen vil ikke transaksjonene bli overført til regnskap.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ved regnskapsoverføring, hvilken periode er valgt som standard
 
-ACCOUNTING_SELL_JOURNAL=Salgsjournal (salg og retur)
-ACCOUNTING_PURCHASE_JOURNAL=Kjøpsjournal (kjøp og retur)
-ACCOUNTING_BANK_JOURNAL=Kassejournal (kvitteringer og utbetalinger)
+ACCOUNTING_SELL_JOURNAL=Salgsjournal - salg og returer
+ACCOUNTING_PURCHASE_JOURNAL=Kjøpsjournal – kjøp og retur
+ACCOUNTING_BANK_JOURNAL=Kassejournal - inn- og utbetalinger
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Utgiftsjournal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Generell journal
 ACCOUNTING_HAS_NEW_JOURNAL=Har ny journal
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Dette vil slette alle linjer i regnskap for året/måneden og/e
 ConfirmDeleteMvtPartial=Dette vil slette transaksjonen fra regnskapet (alle linjer knyttet til samme transaksjon vil bli slettet)
 FinanceJournal=Finansjournal
 ExpenseReportsJournal=Journal for utgiftsrapporter
+InventoryJournal=Lagertellingsjournal
 DescFinanceJournal=Finansjournal med alle typer betalinger etter bankkonto
 DescJournalOnlyBindedVisible=Dette er en oversikt over poster som er bundet til en regnskapskonto og kan registreres i journaler og hovedbok.
 VATAccountNotDefined=MVA-konto er ikke definert
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 3072281ce19..26987719e71 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgeter
 MaxNbOfLinesForBoxes=Maks. antall linjer for widgeter
 AllWidgetsWereEnabled=Alle tilgjengelige widgeter er aktivert
+WidgetAvailable=Widget tilgjengelig
 PositionByDefault=Gjeldende rekkefølge
 Position=Posisjon
 MenusDesc=Menyeditor for å velge innhold i den horisontale og vertikale menyen.
@@ -374,7 +375,7 @@ DoTestSendHTML=Testsending HTML
 ErrorCantUseRazIfNoYearInMask=Feil! Kan ikke bruke opsjonen @ for å nullstille telleren hvert år, hvis ikke {åå} eller {åååå} er i masken.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Feil: Kan ikke bruke valget @ hvis ikke sekvensen {åå}{mm} eller {åååå}{mm} er i malen.
 UMask=UMaskparameter for nye filer på Unix/Linux/BSD filsystemer.
-UMaskExplanation=Denne instillingen lar deg angi filtillatelser som settes på filer opprettet på Dolibarrseveren (for eksempel ved opplastning).<br>Dette må være en oktal verdi (for eksempel 0666 betyr lese og skrive for alle).<br>Denne innstillingen brukes ikke på Windowsbaserte servere.
+UMaskExplanation=Denne parameteren lar deg definere tillatelser satt som standard på filer opprettet av Dolibarr på serveren (for eksempel under opplasting). <br> Det må være den oktale verdien (for eksempel betyr 0666 lesing og skriving for alle.). Anbefalt verdi er 0600 eller 0660 <br> Denne parameteren er ubrukelig på en Windows-server.
 SeeWikiForAllTeam=Ta en titt på Wiki-siden for en liste over bidragsytere og deres organisasjon
 UseACacheDelay= Forsinkelse for cache eksport respons i sekunder (0 eller tom for ingen cache)
 DisableLinkToHelpCenter=Skjul lenken " <b> Trenger hjelp eller støtte </b> " på påloggingssiden
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind konverteringsegenskaper
 Module3200Name=Uforanderlige arkiver
 Module3200Desc=Aktiver en uforanderlig logg over forretningshendelser. Hendelser arkiveres i sanntid. Loggen er en skrivebeskyttet tabell med kjedede hendelser som kan eksporteres. Denne modulen kan være obligatorisk for enkelte land.
 Module3300Name=Modulbygger
-Module3200Desc=Aktiver en uforanderlig logg over forretningshendelser. Hendelser arkiveres i sanntid. Loggen er en skrivebeskyttet tabell med kjedede hendelser som kan eksporteres. Denne modulen kan være obligatorisk for enkelte land.
+Module3300Desc=Et RAD (Rapid Application Development - lav-kode og ingen kode)-verktøy for å hjelpe utviklere eller avanserte brukere med å bygge sin egen modul/applikasjon.
 Module3400Name=Sosiale nettverk
 Module3400Desc=Aktiver felt for sosiale nettverk i tredjeparter og adresser (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Bruk en modus for lite minne
 ExportUseLowMemoryModeHelp=Bruk lav minne-modus for å generere dump-filen (komprimering gjøres gjennom en pipe i stedet for inn i PHP-minnet). Denne metoden tillater ikke å kontrollere at filen er fullstendig og feilmelding kan ikke rapporteres hvis den mislykkes. Bruk den hvis du opplever ikke nok minnefeil.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Grensesnitt for å fange dolibarr-utløsere og sende det til en URL
+ModuleWebhookDesc = Grensesnitt for å fange dolibarr-utløsere og sende data om hendelsen til en URL
 WebhookSetup = Webhook oppsett
 Settings = Innstillinger
 WebhookSetupPage = Webhook oppsettside
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Advarsel: modulen %s har satt e
 WarningModuleHasChangedSecurityCsrfParameter=Advarsel: modulen %s har deaktivert CSRF-sikkerheten til forekomsten din. Denne handlingen er mistenkelig, og installasjonen din er kanskje ikke lenger sikret. Ta kontakt med forfatteren av modulen for forklaring.
 EMailsInGoingDesc=Innkommende e-poster administreres av modulen %s. Du må aktivere og konfigurere den hvis du trenger å støtte inngående e-post.
 MAIN_IMAP_USE_PHPIMAP=Bruk PHP-IMAP-biblioteket for IMAP i stedet for opprinnelig PHP IMAP. Dette tillater også bruk av en OAuth2-tilkobling for IMAP (modul OAuth må også være aktivert).
+MAIN_CHECKBOX_LEFT_COLUMN=Vis kolonnen for felt- og linjevalg til venstre (til høyre som standard)
+
+CSSPage=CSS-stil
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index bc746e7a8be..9f12038b258 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -118,6 +118,27 @@ BoxCustomersOutstandingBillReached=Kunder med utestående grense nådd
 UsersHome=Hjemmebrukere og grupper
 MembersHome=Hjem medlemskap
 ThirdpartiesHome=Hjem Tredjeparter
+productindex=Hjem produkter og tjenester
+mrpindex=Hjem MRP
+commercialindex=Hjem kommersielt
+projectsindex=Hjemmeprosjekter
+invoiceindex=Hjemmefakturaer
+hrmindex=Hjemmefakturaer
 TicketsHome=Hjem Billetter
+stockindex=Hjemmelager
+sendingindex=Hjem frakt
+receptionindex=Hjem mottak
+activityindex=Hjem aktivitet
+proposalindex=Hjem tilbud
+ordersindex=Hjem ordre
+orderssuppliersindex=Hjem leverandørordre
+contractindex=Hjem kontrakter
+interventionindex=Hjem intervensjoner
+suppliersproposalsindex=Hjem leverandørtilbud
+donationindex=Hjem donasjoner
+specialexpensesindex=Hjem spesielle utgifter
+expensereportindex=Hjem utgiftsrapport
+mailingindex=Hjem epost
+opensurveyindex=Hjem opensurvey
 AccountancyHome=Hjem Regnskap
 ValidatedProjects=Validerte prosjekter
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index ead65631027..a6e848b82dd 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=DMS/ECM-område
 ECMAreaDesc=DMS / ECM (Document Management System / Electronic Content Management) -området lar deg lagre, dele og raskt søke alle slags dokumenter i Dolibarr.
 ECMAreaDesc2a=* Manuelle kataloger kan brukes til å lagre dokumenter som ikke er knyttet til et bestemt element.
 ECMAreaDesc2b=* Automatiske kataloger fylles automatisk når du legger til dokumenter fra siden til et element.
-ECMAreaDesc3=* Mediakataloger er filer i underkatalogen <b> /medias </b> i dokumentkatalogen, lesbare av alle uten behov for å logges og uten behov for å dele filen eksplisitt. Den brukes til å lagre bildefiler fra e-post eller nettsidemodul.
+ECMAreaDesc3=* Media-kataloger er filer i underkatalogen <b> /medias </b> i dokumentkatalogen, lesbare av alle uten behov for å logges og uten behov for å dele filen eksplisitt. Den brukes til å lagre bildefiler til for eksempel epost- eller nettsidemodulen.
 ECMSectionWasRemoved=Mappen <b>%s</b> er slettet.
 ECMSectionWasCreated=Mappen <b> %s</b> er opprettet.
 ECMSearchByKeywords=Søk på nøkkelord
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index ed5e53e5c6d..ebe033fbaf4 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -262,6 +262,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Feil, parameter <b> %s </b> må v
 ErrorLoginDateValidity=Feil, denne påloggingen er utenfor gyldig datoområde
 ErrorValueLength=Lengden på feltet '<b> %s </b>' må være høyere enn '<b> %s </b>'
 ErrorReservedKeyword=Ordet '<b> %s </b>' er et reservert nøkkelord
+ErrorFilenameReserved=Filnavnet <b> %s </b> kan ikke brukes da det er en reservert og beskyttet kommando.
 ErrorNotAvailableWithThisDistribution=Ikke tilgjengelig i denne distribusjonen
 ErrorPublicInterfaceNotEnabled=Offentlig grensesnitt var ikke aktivert
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Språket til den nye siden må defineres hvis den er angitt som oversettelse av en annen side
@@ -308,7 +309,7 @@ ErrorExistingPermission = Tillatelse <b> %s </b> for objekt <b> %s </b> finnes a
 ErrorFieldExist=Verdien for <b> %s </b> finnes allerede
 ErrorEqualModule=Modulen er ugyldig i <b> %s </b>
 ErrorFieldValue=Verdien for <b> %s </b> er feil
-ErrorCoherenceMenu= <b> %s </b> er nødvendig når <b> % </b> er lik VENSTRE
+ErrorCoherenceMenu=<b>%s</b> er påkrevd når <b>%s</b> er 'venstre'
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index 0f53c6533d8..4273e7f2712 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Skjuler timer- og minutt-feltene for intervensjons
 InterventionStatistics=Statistikk over intervensjoner
 NbOfinterventions=Antall intervensjonskort
 NumberOfInterventionsByMonth=Antall intervensjonskort etter måned (dato for validering)
-AmountOfInteventionNotIncludedByDefault=Beløp fra intervensjoner er ikke inkludert som standard i overskudd (i de fleste tilfeller er tidsplaner brukt til å regne tid brukt). Legg til alternativ PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT til 1 i hjem-oppsett-andre for å inkludere dem.
+AmountOfInteventionNotIncludedByDefault=Intervensjonsbeløp er ikke inkludert som standard i overskuddet (i de fleste tilfeller brukes timelister for å telle brukt tid). Du kan bruke PROJECT_ELEMENTS_FOR_ADD_MARGIN og PROJECT_ELEMENTS_FOR_MINUS_MARGIN-alternativet i hjem-oppsett-annet for å fullføre listen over elementer som er inkludert i profitt.
 InterId=Intervensjons-ID
 InterRef=Intervensjonsref.
 InterDateCreation=Dato for opprettelse av intervensjon
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 5688fc05010..0defb33949a 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Kontakter etter stilling
 MailingModuleDescEmailsFromFile=E-poster fra fil
 MailingModuleDescEmailsFromUser=E-postmeldinger innlagt av bruker
 MailingModuleDescDolibarrUsers=Brukere med e-post
-MailingModuleDescThirdPartiesByCategories=Tredjeparter (etter kategorier)
+MailingModuleDescThirdPartiesByCategories=Tredjeparter
 SendingFromWebInterfaceIsNotAllowed=Det er ikke tillatt å sende fra webgrensesnitt.
 EmailCollectorFilterDesc=Alle filtre må samsvare for at en e-post skal hentes inn
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Post opprettet av Email Collector %s fra e-post %s
 DefaultBlacklistMailingStatus=Standardverdi for feltet '%s' når du oppretter en ny kontakt
 DefaultStatusEmptyMandatory=Tom, men obligatorisk
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=Ingen flere mottaker å sende e-posten til
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 211d485db58..6fee2d31eb7 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -514,6 +514,7 @@ NotYetAvailable=Ikke tilgjengelig ennå
 NotAvailable=Ikke tilgjengelig
 Categories=Merker/kategorier
 Category=Merke/Kategori
+SelectTheTagsToAssign=Velg taggene/kategoriene du vil tilordne
 By=Av
 From=Fra
 FromDate=Fra
@@ -1223,5 +1224,6 @@ AddToContacts=Legg til adresse i kontaktene mine
 LastAccess=Siste tilgang
 UploadAnImageToSeeAPhotoHere=Last opp et bilde fra fanen %s for å se et bilde her
 LastPasswordChangeDate=Dato for siste endring av passord
-PublicVirtualCardUrl=Virtuell visittkortside
+PublicVirtualCardUrl=Virtuelt visittkortside URL
+PublicVirtualCard=Virtuelt visittkort
 TreeView=Trevisning
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index 49566206e4a..626a04fd8ec 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -6,6 +6,7 @@ TotalMargin=Totalmargin
 MarginOnProducts=Margin - Varer
 MarginOnServices=Margin - Tjenester
 MarginRate=Margin/påslag
+ModifyMarginRates=Endre marginsatser
 MarkRate=Dekningsbidrag
 DisplayMarginRates=Vis marginrater
 DisplayMarkRates=Vis dekningsbidrag
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 2ba247470a5..6729de350c4 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -4,6 +4,8 @@ MemberCard=Medlemskort
 SubscriptionCard=Abonnementskort
 Member=Medlem
 Members=Medlemmer
+NoRecordedMembers=Ingen registrerte medlemmer
+NoRecordedMembersByType=Ingen registrerte medlemmer
 ShowMember=Bis medlemskort
 UserNotLinkedToMember=Brukeren er ikke knyttet til noe medlem
 ThirdpartyNotLinkedToMember=Tredjepart ikke knyttet til et medlem
@@ -233,3 +235,4 @@ CreateDolibarrThirdPartyDesc=En tredjepart er den juridiske enheten som vil bli
 MemberFirstname=Medlemmets fornavn
 MemberLastname=Medlemmets etternavn
 MemberCodeDesc=Medlemskode, unik for alle medlemmer
+NoRecordedMembers=Ingen registrerte medlemmer
diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang
index 2bf5efc0b96..9059835ff45 100644
--- a/htdocs/langs/nb_NO/mrp.lang
+++ b/htdocs/langs/nb_NO/mrp.lang
@@ -119,3 +119,6 @@ BomCantAddChildBom=Nomenklaturen %s er allerede til stede i treet som fører til
 BOMNetNeeds = BOM Netto behov
 BOMProductsList=BOM's varer 
 BOMServicesList=BOM's tjenester
+Manufacturing=Produksjon
+Disassemble=Demonter
+ProducedBy=Produsert av
diff --git a/htdocs/langs/nb_NO/partnership.lang b/htdocs/langs/nb_NO/partnership.lang
index 1d392e7af37..c0bb483262f 100644
--- a/htdocs/langs/nb_NO/partnership.lang
+++ b/htdocs/langs/nb_NO/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Partnerskap: Sjekk refererende tilbakekobling
 # Menu
 #
 NewPartnership=Nytt partnerskap
-NewPartnershipbyWeb= Partnerskapet ditt ble lagt til.
+NewPartnershipbyWeb=Din partnerskapsforespørsel er lagt til. Vi kan kontakte deg snart...
 ListOfPartnerships=Liste over partnerskap
 
 #
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index 47d71678984..c478c0ac099 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Laget av
 NewTicket=Ny supportseddel
 SubjectAnswerToTicket=Supportseddel-svar
 TicketTypeRequest=Forespørselstype
-TicketCategory=Billettkategorisering
+TicketCategory=Billettgruppe
 SeeTicket=Se supportseddel
 TicketMarkedAsRead=Supportseddel merket som lest
 TicketReadOn=Les videre
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index cf230b6cafe..4ab974fc579 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Schakel combolijst in voor dochteronderneming-account
 ACCOUNTING_DATE_START_BINDING=Definieer een startdatum voor het koppelen en doorboeken naar de boekhouding. Transacties voor deze datum worden niet doorgeboekt naar de boekhouding.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Wat is de standaard geselecteerde periode bij overdracht van boekhouding?
 
-ACCOUNTING_SELL_JOURNAL=Verkoopjournaal (verkoop en retouren)
-ACCOUNTING_PURCHASE_JOURNAL=Inkoopjournaal (aankoop en retour)
-ACCOUNTING_BANK_JOURNAL=Kas journaal (ontvangsten en uitbetalingen)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Algemeen journaal
 ACCOUNTING_HAS_NEW_JOURNAL=Heeft nieuw Journaal
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Hiermee worden alle boekingen van de boekhouding voor het jaar
 ConfirmDeleteMvtPartial=Hiermee wordt de boeking uit de boekhouding verwijderd (alle regels die betrekking hebben op dezelfde boeking worden verwijderd)
 FinanceJournal=Kas/Bank journaal
 ExpenseReportsJournal=Overzicht resultaatrekening
+InventoryJournal=Voorraad journaal
 DescFinanceJournal=Financieel journaal inclusief alle soorten betalingen per kas/bankrekening
 DescJournalOnlyBindedVisible=Deze boeking is gekoppeld aan een tegenrekening en kan worden opgenomen in de dagboeken en het grootboek.
 VATAccountNotDefined=BTW rekeningen niet gedefinieerd
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index c2f0769e319..8acc7f4464a 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Max. aantal regels voor widgets
 AllWidgetsWereEnabled=Alle beschikbare widgets zijn geactiveerd
+WidgetAvailable=Widget available
 PositionByDefault=Standaard volgorde
 Position=Positie
 MenusDesc=Menu-managers bepalen de inhoud van de twee menubalken in (horizontaal en verticaal).
@@ -374,7 +375,7 @@ DoTestSendHTML=Test het verzenden van HTML
 ErrorCantUseRazIfNoYearInMask=Fout, kan optie @ niet gebruiken om teller te resetten als sequence {yy} or {yyyy}  niet in het masker.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fout, kan optie @ niet gebruiken wanneer de volgorde {jj}{mm} of {jjjj}{mm} niet is opgenomen in het masker.
 UMask=Umask parameter voor nieuwe bestanden op een Unix- / Linux- / BSD bestandssysteem.
-UMaskExplanation=Deze parameter laat u de rechten bepalen welke standaard zijn ingesteld voor de bestanden aangemaakt door Dolibarr op de server (tijdens het uploaden, bijvoorbeeld).<br>Het moet de octale waarde zijn (bijvoorbeeld, 0666 betekent lezen en schrijven voor iedereen).<br>Deze parameter wordt NIET op een Windows server gebruikt
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Kijk op de Wiki pagina voor een lijst met bijdragers en hun organisatie
 UseACacheDelay= Ingestelde vertraging voor de cache export in secondes (0 of leeg voor geen cache)
 DisableLinkToHelpCenter=Verberg de link " <b> Hulp of ondersteuning nodig </b> " op de inlogpagina
@@ -663,7 +664,7 @@ Module2900Desc=Capaciteitconversie GeoIP Maxmind
 Module3200Name=Niet aanpasbare archieven
 Module3200Desc=Schakel een niet aanpasbaar logboek van zakelijke evenementen in. Evenementen worden in realtime gearchiveerd. Het logboek is een alleen-lezen tabel met gekoppelde gebeurtenissen die kunnen worden geëxporteerd. Deze module kan voor sommige landen verplicht zijn.
 Module3300Name=Modulebouwer
-Module3200Desc=Schakel een niet aanpasbaar logboek van zakelijke evenementen in. Evenementen worden in realtime gearchiveerd. Het logboek is een alleen-lezen tabel met gekoppelde gebeurtenissen die kunnen worden geëxporteerd. Deze module kan voor sommige landen verplicht zijn.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Sociale netwerken
 Module3400Desc=Schakel Social Network-velden in voor derden en adressen (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Gebruik een modus met weinig geheugen
 ExportUseLowMemoryModeHelp=Gebruik de lage geheugenmodus om het dumpbestand te genereren (compressie gebeurt via een pijp in plaats van in het PHP-geheugen). Met deze methode kan niet worden gecontroleerd of het bestand compleet is en kan er geen foutbericht worden gemeld als het mislukt. Gebruik het als u niet genoeg geheugenfouten ervaart.
 
 ModuleWebhookName = webhook
-ModuleWebhookDesc = Interface om dolibarr-triggers te vangen en naar een URL te sturen
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook instellen
 Settings = Instellingen
 WebhookSetupPage = Webhook-instellingenpagina
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang
index 529fcdd8eec..9fc833878f2 100644
--- a/htdocs/langs/nl_NL/interventions.lang
+++ b/htdocs/langs/nl_NL/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Verbergt uren en minuten uit het datumveld voor in
 InterventionStatistics=Interventie statistieken
 NbOfinterventions=Aantal interventiekaarten
 NumberOfInterventionsByMonth=Aantal interventiekaarten per maand (datum van validatie)
-AmountOfInteventionNotIncludedByDefault=Het bedrag voor interventie is niet standaard opgenomen in de winst (in de meeste gevallen worden de urenstaten gebruikt om de bestede tijd te tellen). Voeg optie PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT toe aan 1 in home-setup-diversen om ze op te nemen.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Interventie ID
 InterRef=Interventie ref.
 InterDateCreation=Aanmaakdatum interventie
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index aba2a1a6e03..d33ba58876c 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacten per positie
 MailingModuleDescEmailsFromFile=E-mails uit bestand
 MailingModuleDescEmailsFromUser=E-mails door gebruiker opgemaakt
 MailingModuleDescDolibarrUsers=Gebruikers met e-mails
-MailingModuleDescThirdPartiesByCategories=Derden (op categorieën)
+MailingModuleDescThirdPartiesByCategories=Derde partijen
 SendingFromWebInterfaceIsNotAllowed=Verzenden vanuit de web interface is niet toegestaan.
 EmailCollectorFilterDesc=Alle filters moeten overeenkomen om een e-mail te kunnen verzamelen
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record aangemaakt door de E-mail Collector %s van
 DefaultBlacklistMailingStatus=Standaardwaarde voor veld '%s' bij het aanmaken van een nieuw contact
 DefaultStatusEmptyMandatory=Leeg maar verplicht
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index 8dbed0b7a00..dbdc0274480 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Aangemaakt door
 NewTicket=Nieuwe Ticket
 SubjectAnswerToTicket=Ticket antwoord
 TicketTypeRequest=Aanvraag type
-TicketCategory=Ticket categorisatie
+TicketCategory=Ticket group
 SeeTicket=Bekijk ticket
 TicketMarkedAsRead=Ticket is gemarkeerd als gelezen
 TicketReadOn=Lees verder
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index bf7e0f5dcb4..79e289ac087 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -145,6 +145,7 @@ Box=Widżet
 Boxes=Widżety
 MaxNbOfLinesForBoxes=Max. liczba linii dla widżetów
 AllWidgetsWereEnabled=Wszystkie dostępne widgety zostały wlączone
+WidgetAvailable=Widget available
 PositionByDefault=Domyślny porządek
 Position=Pozycja
 MenusDesc=Menadżer menu ustawia zawartość dwóch pasków menu (poziomego i pionowego)
@@ -374,7 +375,7 @@ DoTestSendHTML=Test przesyłania HTML
 ErrorCantUseRazIfNoYearInMask=Błąd, nie można korzystać z opcji @ na reset licznika każdego roku, jeśli ciąg {rr} lub {rrrr} nie jest w masce.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Błąd, nie można użyć opcji @ jeżeli sekwencja {rr}{mm} lub {yyyy}{mm} nie jest elementem maski.
 UMask=Parametr Umask dla nowych plików systemów Unix / Linux / BSD / Mac.
-UMaskExplanation=Ten parametr pozwala określić uprawnienia ustawione domyślnie na pliki stworzone przez Dolibarr na serwerze (na przykład podczas przesyłania). <br> To musi być wartość ósemkowa (na przykład, 0666 oznacza odczytu i zapisu dla wszystkich). <br> Paramtre Ce ne sert pas sous un serveur Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Spójrz na stronę Wiki, aby zapoznać się z listą współpracowników i ich organizacji
 UseACacheDelay= Opóźnienie dla buforowania odpowiedzi eksportu w sekundach (0 lub puste pole oznacza brak buforowania)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=Możliwości konwersji GeoIP Maxmind
 Module3200Name=Niezmienione archiwa
 Module3200Desc=Włącz niezmienny dziennik zdarzeń biznesowych. Wydarzenia są archiwizowane w czasie rzeczywistym. Dziennik jest tabelą tylko do odczytu połączonych zdarzeń, które można wyeksportować. Ten moduł może być obowiązkowy w niektórych krajach.
 Module3300Name=Module Builder
-Module3200Desc=Włącz niezmienny dziennik zdarzeń biznesowych. Wydarzenia są archiwizowane w czasie rzeczywistym. Dziennik jest tabelą tylko do odczytu połączonych zdarzeń, które można wyeksportować. Ten moduł może być obowiązkowy w niektórych krajach.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Sieci społecznościowe
 Module3400Desc=Włącz pola sieci społecznościowych w kontrahentach i adresach (skype, twitter, facebook, ...).
 Module4000Name=HR
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Ustawienia
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang
index 7ff04e7ab29..6082371f18b 100644
--- a/htdocs/langs/pl_PL/interventions.lang
+++ b/htdocs/langs/pl_PL/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Ukrywa godziny i minuty z pola dat dla rekordów i
 InterventionStatistics=Statystyki interwencji
 NbOfinterventions=Ilość kart interwencji
 NumberOfInterventionsByMonth=Ilość kart interwencji w miesiącu (data potwierdzenia)
-AmountOfInteventionNotIncludedByDefault=Ilość interwencji nie jest domyślnie uwzględniana w zysku (w większości przypadków do obliczania czasu wykorzystano karty czasu pracy). Ustaw opcję PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT na 1 w konfiguracji domowej - inne, aby je uwzględnić.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=ID interwencji
 InterRef=Numer referencyjny interwencji
 InterDateCreation=Data stworzenia interwencji
@@ -66,3 +66,7 @@ RepeatableIntervention=Szablon interwencji
 ToCreateAPredefinedIntervention=Aby utworzyć predefiniowaną lub powtarzającą się interwencję, utwórz wspólną interwencję i przekształć ją w szablon interwencji
 ConfirmReopenIntervention=Czy na pewno chcesz ponownie otworzyć interwencję <b> %s </b>?
 GenerateInter=Generate intervention
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index f29814c7c96..376a78a8538 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Kontakty według pozycji
 MailingModuleDescEmailsFromFile=E-maile z pliku
 MailingModuleDescEmailsFromUser=E-maile wprowadzone przez użytkownika
 MailingModuleDescDolibarrUsers=Użytkownicy z e-mailami
-MailingModuleDescThirdPartiesByCategories=Strony trzecie (według kategorii)
+MailingModuleDescThirdPartiesByCategories=Kontrahenci
 SendingFromWebInterfaceIsNotAllowed=Wysyłanie z interfejsu internetowego jest niedozwolone.
 EmailCollectorFilterDesc=Aby odebrać e-mail, wszystkie filtry muszą być zgodne
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Rekord utworzony przez moduł zbierający wiadomo
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Puste, ale obowiązkowe
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/pl_PL/ticket.lang b/htdocs/langs/pl_PL/ticket.lang
index 8cdbeb6c627..df0f176b023 100644
--- a/htdocs/langs/pl_PL/ticket.lang
+++ b/htdocs/langs/pl_PL/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Stworzone przez
 NewTicket=Nowy bilet
 SubjectAnswerToTicket=Odpowiedź na bilet
 TicketTypeRequest=Rodzaj żądania
-TicketCategory=Kategoryzacja biletów
+TicketCategory=Ticket group
 SeeTicket=Zobacz bilet
 TicketMarkedAsRead=Bilet został oznaczony jako przeczytany
 TicketReadOn=Czytaj
diff --git a/htdocs/langs/pt_AO/companies.lang b/htdocs/langs/pt_AO/companies.lang
deleted file mode 100644
index 68a71bb368e..00000000000
--- a/htdocs/langs/pt_AO/companies.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
-HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 73a4bb7c0bf..8b16829f8fc 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 BoldRefAndPeriodOnPDF=Imprimir referência e período do item em PDF
-BoldLabelOnPDF=Imprimir etiqueta do item em negrito, em PDF
 VersionProgram=Versão Programa
 VersionLastInstall=Versão de instalação inicial
 VersionLastUpgrade=Atualização versão mais recente
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 41baf08b8ca..75703cf45c9 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -30,10 +30,6 @@ Individual=Pessoa física
 ToCreateContactWithSameName=Irá automaticamente criar um contato/endereço com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, a criação de um único terceiro é suficiente.
 ParentCompany=Matriz
 Subsidiaries=Filiais
-ReportByMonth=Relatório por mês
-ReportByCustomers=Relatório por cliente
-ReportByThirdparties=Relatório por terceiro
-ReportByQuarter=Relatório por taxa
 CivilityCode=Forma de tratamento
 RegisteredOffice=Escritório registrado
 Lastname=Sobrenome
@@ -52,7 +48,6 @@ Region-State=Região - Estado
 CountryCode=Código do país
 CountryId=ID do País
 Call=Chamar
-PhonePro=Telefone comercial
 PhonePerso=Tel. particular
 PhoneMobile=Celular
 No_Email=Recusar e-mails em massa
@@ -178,7 +173,6 @@ SupplierCodeShort=Código Fornecedor
 SupplierCodeDesc=Código do Fornecedor, exclusivo para todos os fornecedores
 RequiredIfCustomer=Necessário se o terceiro for um cliente ou um possível cliente
 RequiredIfSupplier=Obrigatório se terceiros são fornecedores
-ValidityControledByModule=Validade controlada pelo módulo
 ProspectToContact=Prospecto de cliente a contactar
 CompanyDeleted=A empresa "%s" foi excluída do banco de dados.
 ListOfContacts=Lista de contatos/endereços
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index d38b4871ea8..b0cb5093218 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -23,7 +23,6 @@ DatabaseConnection=Login à Base de Dados
 NoTemplateDefined=Nenhum modelo disponível para este tipo de email
 CurrentTimeZone=Timezone PHP (do servidor apache)
 EmptySearchString=Digite critérios na pesquisa
-EnterADateCriteria=Insira um critério de data
 NoRecordFound=Nenhum registro encontrado
 NoRecordDeleted=Nenhum registro foi deletado
 NotEnoughDataYet=Sem dados suficientes
@@ -50,7 +49,6 @@ ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de ICMS definido para o
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de imposto social / fiscal definidos para o país '%s'.
 ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
 ErrorCannotAddThisParentWarehouse=Voce está tentando adicionar um armazém pai, o qual ja é um filho do armazém existente
-FieldCannotBeNegative=O campo "%s" não pode ser negativo
 MaxNbOfRecordPerPage=Número máx de registros por página
 NotAuthorized=Você não está autorizado a fazer isso.
 SelectDate=Selecionar uma data
@@ -141,7 +139,6 @@ NoUserGroupDefined=Nenhum grupo definido pelo usuário
 NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
 NameSlashCompany=Nome / Companhia
 PersonalValue=Valor Personalizado
-OldValue=Valor antigo %s
 CurrentValue=Valor atual
 MultiLanguage=Multi Idioma
 RefOrLabel=Ref. da etiqueta
@@ -151,7 +148,6 @@ Model=Modelo de Documento
 DefaultModel=Modelo de documento padrão
 Action=Ação
 About=Acerca de
-NumberByMonth=Total de relatórios por mês
 Limit=Límite
 Logout=Sair
 NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação
@@ -166,7 +162,6 @@ DateModificationShort=Data Modif.
 IPModification=Endereço IP da modificação
 DateLastModification=Última data de modificação
 DateValidation=Data Validação
-DateSigning=Data de assinatura
 DateDue=Data Vencimento
 DateValue=Data Valor
 DateValueShort=Data Valor
@@ -200,7 +195,6 @@ UnitPriceHTCurrency=Preço unitário (sem) (Moeda)
 UnitPriceTTC=Preço Unit. Total
 PriceU=Preço Unit.
 PriceUHT=Preço Unit.
-PriceUHTCurrency=U.P (líquido) (moeda)
 PriceUTTC=U.P. (inc. Impostos)
 Amount=Valor
 AmountInvoice=Valor Fatura
@@ -251,14 +245,12 @@ VATINs=Impostos IGST
 LT1Type=Tipo de imposto sobre vendas 2
 LT2Type=Tipo de imposto sobre vendas 3
 VATRate=Taxa ICMS
-RateOfTaxN=Taxa de imposto %s
 VATCode=Codigo do ICMS
 VATNPR=Valor taxa NPR
 DefaultTaxRate=Taxa de imposto padrão
 RemainToPay=Permanecer para pagar
 Module=Modulo/Aplicacao
 Modules=Módulos / Aplicações
-Filters=Filtros
 OtherStatistics=Outras estatisticas
 Favorite=Favorito
 RefSupplier=Ref. fornecedor
@@ -336,7 +328,6 @@ Entities=Entidadees
 CustomerPreview=Historico Cliente
 SupplierPreview=Visualização do fornecedor
 ShowCustomerPreview=Ver Historico Cliente
-InternalRef=Ref. interna
 SeeAll=Ver tudo
 SendByMail=Envio por e-mail
 MailSentBy=Mail enviado por
@@ -443,7 +434,6 @@ XMoreLines=%s linha(s) escondidas
 ShowMoreLines=Mostrar mais / menos linhas
 PublicUrl=URL pública
 AddBox=Adicionar caixa
-SelectElementAndClick=Selecione um elemento e clique em %s
 PrintFile=Imprimir arquivo %s
 ShowTransaction=Mostrar entrada na conta bancária
 ShowIntervention=Mostrar intervençao
@@ -487,7 +477,6 @@ ViewAccountList=Ver razão
 ViewSubAccountList=Ver razão da subconta
 RemoveString=Remover string '%s'
 SomeTranslationAreUncomplete=Alguns dos idiomas oferecidos podem estar parcialmente traduzidos ou podem conter erros. Ajude a corrigir seu idioma registrando-se em <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> para adicionar suas melhorias.
-DirectDownloadLink=Link de download público
 PublicDownloadLinkDesc=Apenas o link é necessário para baixar o arquivo
 DirectDownloadInternalLink=Link privado para baixar
 PrivateDownloadLinkDesc=Você precisa estar logado e precisa de permissões para visualizar ou baixar o arquivo
@@ -543,11 +532,9 @@ Monthly=Por mês
 Remote=Controlo remoto
 Deletedraft=Excluir rascunho
 ConfirmMassDraftDeletion=Confirmação de exclusão de massa de esboço
-FileSharedViaALink=Arquivo compartilhado com um link público
 SelectAThirdPartyFirst=Selecione um terceiro primeiro ...
 YouAreCurrentlyInSandboxMode=No momento você está no %s modo "caixa de areia"
 AnalyticCode=Código analitico
-ShowCompanyInfos=Mostrar informações da empresa
 ShowMoreInfos=Mostrar mais informações
 NoFilesUploadedYet=Por favor, carregue um doc. primeiro
 SeePrivateNote=Veja avisos privados
@@ -555,7 +542,6 @@ PaymentInformation=Informações de Pagamento
 ValidFrom=Válido de
 NoRecordedUsers=Sem Usuários
 ToClose=Para Fechar
-ToRefuse=Recusar
 ToProcess=A processar
 ToApprove=Para Aprovar
 GlobalOpenedElemView=Visão Global
@@ -585,9 +571,6 @@ DateOfBirth=Data de nascimento
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=O token de segurança expirou, então a ação foi cancelada. Por favor, tente novamente.
 UpToDate=Atualizado
 OutOfDate=Desatualizado
-UpdateForAllLines=Atualização para todas as linhas
-OnHold=Em espera
-Civility=Civilidade
 CreateExternalUser=Criar usuário externo
 CategTypeNotFound=Nenhum tipo de tag encontrado para o tipo de registro
 CopiedToClipboard=Copiado para a área de transferência
diff --git a/htdocs/langs/pt_MZ/admin.lang b/htdocs/langs/pt_MZ/admin.lang
index a7ccdbf4100..c3987f623d6 100644
--- a/htdocs/langs/pt_MZ/admin.lang
+++ b/htdocs/langs/pt_MZ/admin.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 BoldRefAndPeriodOnPDF=Imprimir referência e período do item em PDF
-BoldLabelOnPDF=Imprimir etiqueta do item em negrito, em PDF
 VersionProgram=Versão Programa
 VersionLastInstall=Versão de instalação inicial
 VersionLastUpgrade=Atualização versão mais recente
diff --git a/htdocs/langs/pt_MZ/companies.lang b/htdocs/langs/pt_MZ/companies.lang
index 4f29abde47f..f351d09772e 100644
--- a/htdocs/langs/pt_MZ/companies.lang
+++ b/htdocs/langs/pt_MZ/companies.lang
@@ -31,10 +31,6 @@ Individual=Pessoa física
 ToCreateContactWithSameName=Irá automaticamente criar um contato/endereço com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, a criação de um único terceiro é suficiente.
 ParentCompany=Matriz
 Subsidiaries=Filiais
-ReportByMonth=Relatório por mês
-ReportByCustomers=Relatório por cliente
-ReportByThirdparties=Relatório por terceiro
-ReportByQuarter=Relatório por taxa
 CivilityCode=Forma de tratamento
 RegisteredOffice=Escritório registrado
 Lastname=Sobrenome
@@ -51,7 +47,6 @@ Region=Região
 Region-State=Região - Estado
 CountryCode=Código do país
 Call=Chamar
-PhonePro=Telefone comercial
 PhonePerso=Tel. particular
 PhoneMobile=Celular
 No_Email=Recusar e-mails em massa
diff --git a/htdocs/langs/pt_MZ/main.lang b/htdocs/langs/pt_MZ/main.lang
index 13b20a305eb..8524f2a5911 100644
--- a/htdocs/langs/pt_MZ/main.lang
+++ b/htdocs/langs/pt_MZ/main.lang
@@ -49,7 +49,6 @@ ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVM definido para o p
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de imposto social / fiscal definidos para o país '%s'.
 ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
 ErrorCannotAddThisParentWarehouse=Voce está tentando adicionar um armazém pai, o qual ja é um filho do armazém existente
-FieldCannotBeNegative=O campo "%s" não pode ser negativo
 MaxNbOfRecordPerPage=Número máx de registros por página
 NotAuthorized=Você não está autorizado a fazer isso.
 SelectDate=Selecionar uma data
@@ -137,7 +136,6 @@ NoUserGroupDefined=Nenhum grupo definido pelo usuário
 NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
 NameSlashCompany=Nome / Companhia
 PersonalValue=Valor Personalizado
-OldValue=Valor antigo %s
 CurrentValue=Valor atual
 MultiLanguage=Multi Idioma
 RefOrLabel=Ref. da etiqueta
@@ -162,7 +160,6 @@ DateModificationShort=Data Modif.
 IPModification=Endereço IP da modificação
 DateLastModification=Última data de modificação
 DateValidation=Data Validação
-DateSigning=Data de assinatura
 DateDue=Data Vencimento
 DateValue=Data Valor
 DateValueShort=Data Valor
@@ -247,7 +244,6 @@ DefaultTaxRate=Taxa de imposto padrão
 RemainToPay=Permanecer para pagar
 Module=Modulo/Aplicacao
 Modules=Módulos / Aplicações
-Filters=Filtros
 OtherStatistics=Outras estatisticas
 Favorite=Favorito
 RefSupplier=Ref. fornecedor
@@ -477,7 +473,6 @@ Calendar=Calendário
 GroupBy=Agrupar por
 ViewFlatList=Visão da lista resumida
 RemoveString=Remover string '%s'
-DirectDownloadLink=Link de download público
 DirectDownloadInternalLink=Link privado para baixar
 Download=Baixar
 DownloadDocument=Descarregar documento
@@ -535,7 +530,6 @@ ConfirmMassDraftDeletion=Confirmação de exclusão de massa de esboço
 SelectAThirdPartyFirst=Selecione um terceiro primeiro ...
 YouAreCurrentlyInSandboxMode=No momento você está no %s modo "caixa de areia"
 AnalyticCode=Código analitico
-ShowCompanyInfos=Mostrar informações da empresa
 ShowMoreInfos=Mostrar mais informações
 NoFilesUploadedYet=Por favor, carregue um doc. primeiro
 SeePrivateNote=Veja avisos privados
@@ -569,7 +563,6 @@ Used=Usado
 ASAP=O mais breve possível
 CREATEInDolibarr=Registro %s criado
 DateOfBirth=Data de nascimento
-OnHold=Em espera
 ClientTZ=Fuso Horário do cliente (usuário)
 Terminate=Concluir
 InternalUser=Usuário Interno
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 3e9068e3bb2..6f095f5a3ae 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
 BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
-BoldLabelOnPDF=Print label of product item in Bold in PDF
+BoldLabelOnPDF=Imprimir etiqueta do item em negrito, em PDF
 Foundation=Fundação
 Version=Versão
 Publisher=Editor
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgets
 MaxNbOfLinesForBoxes=Máx. número de linhas para widgets
 AllWidgetsWereEnabled=Todos os widgets disponíveis estão habilitados
+WidgetAvailable=Widget disponível
 PositionByDefault=Ordem predefinida
 Position=Posição
 MenusDesc=Os gestores de menu definem o conteúdo das duas barras de menu (horizontal e vertical)
@@ -160,7 +161,7 @@ Purge=Limpar
 PurgeAreaDesc=Esta página permite excluir todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b> %s </b>). Usar esse recurso normalmente não é necessário. Ele é fornecido como uma solução alternativa para usuários cujo Dolibarr é hospedado por um provedor que não oferece permissões para excluir arquivos gerados pelo servidor da web.
 PurgeDeleteLogFile=Eliminar os ficheiros de registo, incluindo <b>%s</b> definido para o módulo Syslog (não existe risco de perda de dados)
 PurgeDeleteTemporaryFiles=Excluir todos os ficheiros de log e temporários (sem risco de perda de dados). O parâmetro pode ser 'tempfilesold', 'logfiles' ou ambos 'tempfilesold + logfiles'. Nota: A exclusão de ficheiros temporários é feita apenas se o diretório temporário foi criado há mais de 24 horas.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
+PurgeDeleteTemporaryFilesShort=Eliminar registos e ficheiros temporários (sem risco de perda de dados)
 PurgeDeleteAllFilesInDocumentsDir=Exclua todos os arquivos do diretório: <b> %s </b>. <br> Isso excluirá todos os documentos gerados relacionados aos elementos (terceiros, faturas etc ...), arquivos carregados no módulo ECM, despejos de backup de banco de dados e arquivos temporários.
 PurgeRunNow=Limpar agora
 PurgeNothingToDelete=Nenhuma diretoria ou ficheiros para eliminar.
@@ -374,7 +375,7 @@ DoTestSendHTML=Teste de envio HTML
 ErrorCantUseRazIfNoYearInMask=Erro, não pode usar a opção @ para repor o contador a cada ano, se sequência {yy} ou {aaaa} não está na máscara.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não pode usar a opção @ se a sequência {yy}{mm} ou {yyyy}{mm} não se encontra na máscara definida.
 UMask=Parâmetro UMask de novos ficheiros em sistemas Unix/Linux/BSD/macOS.
-UMaskExplanation=Este parâmetro permite definir permissões usadas por omissão em ficheiros criados pelo Dolibarr no servidor (durante o carregamento, por exemplo).<br>Este deve ter o valor octal (por exemplo, 0666 significa permissão de leitura/escrita para todos).<br>Este parâmetro não tem nenhum efeito sobre um servidor Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Dê uma olhada na página Wiki para obter uma lista de contribuidores e suas organizações
 UseACacheDelay= Atraso, em segundos, para o caching de exportação (0 ou em branco para não criar cache)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=Capacidades de conversões GeoIP Maxmind
 Module3200Name=Arquivos inalteráveis
 Module3200Desc=Ativar um registro inalterável de eventos de negócios. Eventos são arquivados em tempo real. O log é uma tabela somente leitura de eventos encadeados que podem ser exportados. Este módulo pode ser obrigatório para alguns países.
 Module3300Name=Module Builder
-Module3200Desc=Ativar um registro inalterável de eventos de negócios. Eventos são arquivados em tempo real. O log é uma tabela somente leitura de eventos encadeados que podem ser exportados. Este módulo pode ser obrigatório para alguns países.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Redes sociais
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=GRH
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Definições
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index ccfb56424f9..2e887e0dc1a 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -44,15 +44,15 @@ Individual=Particular
 ToCreateContactWithSameName=Criará automaticamente um contato / endereço com as mesmas informações do terceiro sob o terceiro. Na maioria dos casos, mesmo que seu terceiro seja uma pessoa física, criar um terceiro sozinho é suficiente.
 ParentCompany=Empresa-mãe
 Subsidiaries=Subsidiárias
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Relatório por mês
+ReportByCustomers=Relatório por cliente
+ReportByThirdparties=Relatório por terceiro
+ReportByQuarter=Relatório por taxa
 CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
 Lastname=Apelidos
 Firstname=Primeiro Nome
-RefEmployee=Employee reference
+RefEmployee=Referência de funcionário
 NationalRegistrationNumber=National registration number
 PostOrFunction=Posição da tarefa
 UserTitle=Título
@@ -60,20 +60,20 @@ NatureOfThirdParty=Natureza do terceiro
 NatureOfContact=Natureza do contacto
 Address=Direcção
 State=Concelho
-StateId=State ID
+StateId=Identificação Estatal
 StateCode=Código de região
 StateShort=Concelho
 Region=Distrito
 Region-State=Distrito - Concelho
 Country=País
 CountryCode=Código país
-CountryId=Country ID
+CountryId=Id. do País
 Phone=Telefone
 PhoneShort=Telefone
 Skype=Skype
 Call=Chamada
 Chat=Chat
-PhonePro=Bus. phone
+PhonePro=Telefone comercial
 PhonePerso=Telef. particular
 PhoneMobile=Telemovel
 No_Email=Recusar emails em massa
@@ -82,7 +82,7 @@ Zip=Código postal
 Town=Localidade
 Web=Web
 Poste= Posição
-DefaultLang=Default language
+DefaultLang=Idioma predefinido
 VATIsUsed=Imposto sobre vendas usado
 VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
 VATIsNotUsed=Não sujeito a IVA
@@ -312,12 +312,12 @@ CustomerRelativeDiscountShort=Desconto Relativo
 CustomerAbsoluteDiscountShort=Desconto fixo
 CompanyHasRelativeDiscount=Este cliente tem um desconto por defeito de <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Este cliente não tem descontos relativos por defeito
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=Você não tem desconto relativo predefinido deste fornecedor
+HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> with this vendor
+HasNoRelativeDiscountFromSupplier=No default relative discount with this vendor
 CompanyHasAbsoluteDiscount=Este cliente tem descontos disponíveis (notas de créditos ou adiantamentos) para <b> %s </ b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Este cliente tem descontos disponíveis (comerciais, adiantamentos) para <b> %s </ b> %s
 CompanyHasCreditNote=Este cliente ainda tem notas de crédito para <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=Você não tem desconto ou nota de crédito disponível neste fornecedor
+HasNoAbsoluteDiscountFromSupplier=No discount/credit available from this vendor
 HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
 HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
 HasCreditNoteFromSupplier=You have credit notes for <b>%s</b> %s from this vendor
@@ -354,7 +354,7 @@ CustomerCodeDesc=Código do cliente, exclusivo para todos os clientes
 SupplierCodeDesc=Código de Fornecedor, exclusivo para todos os fornecedores
 RequiredIfCustomer=Requerida se o Terceiro for Cliente ou Cliente Potencial
 RequiredIfSupplier=Obrigatório se os terceiros forem fornecedores
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Validade controlada pelo módulo
 ThisIsModuleRules=Regras para este módulo
 ProspectToContact=Cliente Potencial a Contactar
 CompanyDeleted=A Empresa "%s" foi Eliminada
@@ -364,7 +364,7 @@ ListOfThirdParties=Lista de Terceiros
 ShowCompany=Terceiro
 ShowContact=Endereço de contacto
 ContactsAllShort=Todos (sem filtro)
-ContactType=Contact role
+ContactType=Função do contacto
 ContactForOrders=Contacto para Pedidos
 ContactForOrdersOrShipments=Contacto da encomenda ou da expedição
 ContactForProposals=Contacto do orçamento
@@ -386,7 +386,7 @@ VATIntraCheck=Verificar
 VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link <b> %s </b> usa o serviço de verificador de IVA europeu (VIES) que requer acesso à Internet do servidor Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verifique o ID do IVA intracomunitário no site da Comissão Europeia
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+VATIntraManualCheck=Também pode verificar manualmente no ''site'' da Web da Comissão Europeia <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Verificação Impossivel. O serviço de verificação não é prestado pelo país membro (%s).
 NorProspectNorCustomer=Não é cliente potencial, nem cliente
 JuridicalStatus=Forma Jurídica
@@ -444,7 +444,7 @@ AddAddress=Adicionar Direcção
 SupplierCategory=Categoria do fornecedor
 JuridicalStatus200=Independente
 DeleteFile=Eliminar ficheiro
-ConfirmDeleteFile=Tem a certeza que quer eliminar este ficheiro?
+ConfirmDeleteFile=Tem a certeza que pretende eliminar este ficheiro <b> %s </b>?
 AllocateCommercial=Atribuído a representante de vendas
 Organization=Organismo
 FiscalYearInformation=Ano fiscal
@@ -462,8 +462,8 @@ ListSuppliersShort=Lista de Fornecedores
 ListProspectsShort=Lista de Perspectivas
 ListCustomersShort=Lista de Clientes
 ThirdPartiesArea=Terceiros / Contatos
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=Terceiros mais recentes (%s) que foram modificados
+UniqueThirdParties=Número total de Terceiros
 InActivity=Aberto
 ActivityCeased=Fechado
 ThirdPartyIsClosed=O terceiro encontra-se fechado
@@ -498,3 +498,9 @@ RestOfEurope=Rest of Europe (EEC)
 OutOfEurope=Out of Europe (EEC)
 CurrentOutstandingBillLate=Current outstanding bill late
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Be carefull, depending on your product price settings, you should change thirdparty before adding product to POS.
+EmailAlreadyExistsPleaseRewriteYourCompanyName=email already exists please rewrite your company name
+TwoRecordsOfCompanyName=more than one record exists for this company, please contact us to complete your partnership request
+CompanySection=Company section
+ShowSocialNetworks=Show social networks
+HideSocialNetworks=Hide social networks
+
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index 396b386cb41..e2e20bb2e5c 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -86,7 +86,7 @@ ErrorFieldRequiredUserOrGroup=The "group" field or the "user" field must be fill
 fusionGroupsUsers=The groups field and the user field will be merged
 MenuLogCP=Ver os registos de alteração
 LogCP=Log of all updates made to "Balance of Leave"
-ActionByCP=Updated by
+ActionByCP=Atualizado por
 UserUpdateCP=Updated for
 PrevSoldeCP=Balanço prévio
 NewSoldeCP=Novo Balanço
@@ -143,16 +143,16 @@ TemplatePDFHolidays=Modelo para solicitações de licenças PDF
 FreeLegalTextOnHolidays=Texto livre em PDF
 WatermarkOnDraftHolidayCards=Marcas d'água em pedidos de licença de rascunho
 HolidaysToApprove=Holidays to approve
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
-HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
+NobodyHasPermissionToValidateHolidays=Nobody has permission to validate leave requests
+HolidayBalanceMonthlyUpdate=Monthly update of leave balance
 XIsAUsualNonWorkingDay=%s is usualy a NON working day
 BlockHolidayIfNegative=Block if balance negative
 LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
-IncreaseHolidays=Increase holiday
-HolidayRecordsIncreased= %s holiday records increased
-HolidayRecordIncreased=Holiday record increased
-ConfirmMassIncreaseHoliday=Bulk holiday increase
+IncreaseHolidays=Increase leave balance
+HolidayRecordsIncreased= %s leave balances increased
+HolidayRecordIncreased=Leave balance increased
+ConfirmMassIncreaseHoliday=Bulk leave balance increase
 NumberDayAddMass=Number of day to add to the selection
 ConfirmMassIncreaseHolidayQuestion=Are you sure you want to increase holiday of the %s selected record(s)?
 HolidayQtyNotModified=Balance of remaining days for %s has not been changed
diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang
index 6e007f30c96..495ba0b6240 100644
--- a/htdocs/langs/pt_PT/interventions.lang
+++ b/htdocs/langs/pt_PT/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Oculta as horas e minutos campo de data dos regist
 InterventionStatistics=Estatísticas das intervenções
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
-AmountOfInteventionNotIncludedByDefault=O montante da intervenção não é incluído, por defeito, no lucro (na maioria dos casos, os quadros de horários são usados ​​para contar o tempo gasto). Adicione a opção PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT com o valor 1 em Inicio->Configurações->Outras configurações para incluí-los.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=ID da intervenção
 InterRef=Ref. da intervenção
 InterDateCreation=Data de criação da intervenção
@@ -66,3 +66,7 @@ RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
 GenerateInter=Generate intervention
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index 659b2489e1f..56ca932dbbf 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contatos por posição
 MailingModuleDescEmailsFromFile=E-mails do arquivo
 MailingModuleDescEmailsFromUser=Entrada de e-mails pelo usuário
 MailingModuleDescDolibarrUsers=Usuários com e-mails
-MailingModuleDescThirdPartiesByCategories=Terceiros (por categorias)
+MailingModuleDescThirdPartiesByCategories=Terceiros
 SendingFromWebInterfaceIsNotAllowed=Envio de interface web não é permitido.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 36f1e6a4894..5a3dcb3d9fd 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -34,10 +34,10 @@ NoTemplateDefined=Nenhum modelo disponível para este tipo de e-mail
 AvailableVariables=Variáveis de substituição disponíveis
 NoTranslation=Sem tradução
 Translation=Tradução
-Translations=Translations
+Translations=Traduções
 CurrentTimeZone=Zona Horária PHP (servidor)
 EmptySearchString=Introduza alguns critérios de pesquisa
-EnterADateCriteria=Enter a date criteria
+EnterADateCriteria=Insira um critério de data
 NoRecordFound=Nenhum foi encontrado nenhum registo
 NoRecordDeleted=Nenhum registo eliminado
 NotEnoughDataYet=Não existe dados suficientes
@@ -74,7 +74,7 @@ ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVA definido para o p
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição social definida para o país %s.
 ErrorFailedToSaveFile=Erro, o registo do ficheiro falhou.
 ErrorCannotAddThisParentWarehouse=Você está a tentar adicionar um armazém "pai" que já é um armazém "filho" de um armazém já existente.
-FieldCannotBeNegative=Field "%s" cannot be negative
+FieldCannotBeNegative=O campo "%s" não pode ser negativo
 MaxNbOfRecordPerPage=Número máximo de registos por página
 NotAuthorized=Não tem permissão para efetuar essa operação
 SetDate=Definir data
@@ -95,7 +95,7 @@ FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não
 NbOfEntries=N.º de entradas
 GoToWikiHelpPage=Consultar ajuda online (necessita de acesso à Internet)
 GoToHelpPage=Ir para páginas de ajuda
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=Página dedicada a ajuda relacionada com a sua tela atual
 HomePage=Página Inicial
 RecordSaved=Registo Guardado
 RecordDeleted=Registo eliminado
@@ -122,7 +122,7 @@ ReturnCodeLastAccessInError=Retornar o código para o último pedido incorreto d
 InformationLastAccessInError=Informação sobre o último pedido incorreto de acesso à base de dados
 DolibarrHasDetectedError=O Dolibarr detectou um erro técnico
 YouCanSetOptionDolibarrMainProdToZero=Você pode ler o ficheiro de log ou definir a opção $dolibarr_main_prod para '0' no seu ficheiro de configuração para obter mais informações.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=Esta informação pode ser útil para fins de diagnóstico (pode definir a opção $dolibarr_main_prod como '1' para ocultar informações confidenciais)
 MoreInformation=Mais Informação
 TechnicalInformation=Informação técnica
 TechnicalID=ID Técnico
@@ -188,7 +188,7 @@ SaveAndNew=Salvar e criar novo
 TestConnection=Testar conexão
 ToClone=Clonar
 ConfirmCloneAsk=De certeza que quer clonar o objecto <b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=Escolha os dados que deseja clonar:
 NoCloneOptionsSpecified=Não existem dados definidos para clonar.
 Of=de
 Go=Avançar
@@ -220,13 +220,13 @@ User=Utilizador
 Users=Utilizadores
 Group=Grupo
 Groups=Grupos
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Grupo de utilizadores
+UserGroups=Grupos de utilizadores
 NoUserGroupDefined=Nenhum grupo de utilizador definido
 Password=Senha
-PasswordRetype=Repeat your password
+PasswordRetype=Reescreva a sua senha
 NoteSomeFeaturesAreDisabled=Note que estão desativados muitos módulos/funções nesta demonstração.
-YourUserFile=Your user file
+YourUserFile=Seu ficheiro de utilizador
 Name=Nome
 NameSlashCompany=Nome / Empresa
 Person=Pessoa
@@ -236,7 +236,7 @@ Value=Valor
 PersonalValue=Valor pessoal
 NewObject=Novo %s
 NewValue=Novo valor
-OldValue=Old value %s
+OldValue=Valor antigo %s
 CurrentValue=Valor actual
 Code=Código
 Type=Tipo
@@ -253,13 +253,13 @@ Designation=Designação
 DescriptionOfLine=Descrição da linha
 DateOfLine=Data da linha
 DurationOfLine=Duração da linha
-ParentLine=Parent line ID
+ParentLine=ID da linha fonte
 Model=Modelo de documento
 DefaultModel=Modelo de documento predefinido
 Action=Evento
 About=Sobre
 Number=Número
-NumberByMonth=Total reports by month
+NumberByMonth=Total de relatórios por mês
 AmountByMonth=Valor por mês
 Numero=Número
 Limit=Limite
@@ -276,7 +276,7 @@ Cards=Fichas
 Card=Ficha
 Now=Agora
 HourStart=Hora de inicio
-Deadline=Deadline
+Deadline=Data limite
 Date=Data
 DateAndHour=Data e Hora
 DateToday=Data de hoje
@@ -285,13 +285,13 @@ DateStart=Data de início
 DateEnd=Data de fim
 DateCreation=Data de Criação
 DateCreationShort=Data de criação
-IPCreation=Creation IP
+IPCreation=Criação de IP
 DateModification=Data de Modificação
 DateModificationShort=Data de Modif.
-IPModification=Modification IP
+IPModification=Modificação de IP
 DateLastModification=A última data de alteração
 DateValidation=Data de Validação
-DateSigning=Signing date
+DateSigning=Data de assinatura
 DateClosing=Data de Encerramento
 DateDue=Data de Vencimento
 DateValue=Data do valor
@@ -355,7 +355,7 @@ MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
 UserAuthor=Criado por
-UserModif=Updated by
+UserModif=Atualizado por
 b=b.
 Kb=Kb
 Mb=Mb
@@ -375,7 +375,7 @@ UnitPriceHTCurrency=Preço por unidade (Excl. IVA) (moeda)
 UnitPriceTTC=Preço Unitário
 PriceU=P.U.
 PriceUHT=P.U. (líquido)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=U.P (líquido) (moeda)
 PriceUTTC=P.U. (inc. impostos)
 Amount=Montante
 AmountInvoice=Montante da Fatura
@@ -403,8 +403,8 @@ AmountTotal=Montante Total
 AmountAverage=Montante médio
 PriceQtyMinHT=Preço para quandidade min. (excl. IVA)
 PriceQtyMinHTCurrency=Preço da quantidade min. (excl. IVA) (moeda)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
+PercentOfOriginalObject=Percentagem do objeto original
+AmountOrPercent=Quantidade ou percentagem
 Percentage=Percentagem
 Total=Total
 SubTotal=Subtotal
@@ -443,7 +443,7 @@ LT1IN=ICBS
 LT2IN=IBSE
 LT1GC=Centavos adicionais
 VATRate=Taxa IVA
-RateOfTaxN=Rate of tax %s
+RateOfTaxN=Taxa de imposto %s
 VATCode=Código da taxa de imposto
 VATNPR=Taxa de imposto NPR
 DefaultTaxRate=Taxa de imposto predefinida
@@ -455,7 +455,7 @@ RemainToPay=Montante por pagar
 Module=Módulo/Aplicação
 Modules=Módulos/Aplicações
 Option=Opção
-Filters=Filters
+Filters=Filtros
 List=Lista
 FullList=Lista Completa
 FullConversation=Conversa completa
@@ -490,7 +490,7 @@ ActionsOnContact=Eventos para este contacto/endereço
 ActionsOnContract=Eventos para este contracto
 ActionsOnMember=Eventos sobre este membro
 ActionsOnProduct=Eventos sobre este produto
-ActionsOnAsset=Events for this fixed asset
+ActionsOnAsset=Eventos para este bem fixo
 NActionsLate=%s em atraso
 ToDo=A realizar
 Completed=Concluído
@@ -514,6 +514,7 @@ NotYetAvailable=Ainda não disponivel
 NotAvailable=Não disponivel
 Categories=Etiquetas/Categorias
 Category=Etiqueta/Categoria
+SelectTheTagsToAssign=Selecione as etiquetas/categorias a atribuir
 By=Por
 From=De
 FromDate=De
@@ -631,7 +632,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Ficheiros e Documentos Anexos
 JoinMainDoc=Unir ao documento principal
-JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
+JoinMainDocOrLastGenerated=Envie o documento principal ou, caso não seja encontrado, o último gerado
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -678,7 +679,7 @@ SupplierPreview=Pré-visualização do fornecedor
 ShowCustomerPreview=Ver Historial Cliente
 ShowSupplierPreview=Mostrar pré-visualização do fornecedor
 RefCustomer=Ref. Cliente
-InternalRef=Internal ref.
+InternalRef=Ref. interna
 Currency=Moeda
 InfoAdmin=Informação para os administradores
 Undo=Desfazer
@@ -700,7 +701,7 @@ SendMail=Enviar e-mail
 Email=Email
 NoEMail=Sem e-mail
 AlreadyRead=Já lido
-NotRead=Unread
+NotRead=Não lida
 NoMobilePhone=Sem telefone móvel
 Owner=Proprietário
 FollowingConstantsWillBeSubstituted=As seguintes constantes serão substituidas pelo seu valor correspondente.
@@ -722,7 +723,7 @@ FeatureDisabled=Função Desactivada
 MoveBox=Mover widget
 Offered=Oferta
 NotEnoughPermissions=Não tem permissões para efectuar esta acção
-UserNotInHierachy=This action is reserved to the supervisors of this user
+UserNotInHierachy=Esta ação é reservada aos Supervisores deste Utilizador
 SessionName=Nome Sessão
 Method=Método
 Receive=Receção
@@ -747,8 +748,8 @@ MenuMembers=Membros
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Taxas | Despesas Especiais
 ThisLimitIsDefinedInSetup=Límite Dolibarr (Menu inicio->configuração->segurança): %s Kb, PHP limit: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
-NoFileFound=No documents uploaded
+ThisLimitIsDefinedInSetupAt=Limite do Dolibarr (Menu %s): %s Kb, limite do PHP (Param %s): %s Kb
+NoFileFound=Nenhum documento enviado
 CurrentUserLanguage=Idioma atual
 CurrentTheme=Tema Actual
 CurrentMenuManager=Gestor de menu atual
@@ -812,7 +813,7 @@ URLPhoto=Url da foto / logotipo
 SetLinkToAnotherThirdParty=Link para um terceiro
 LinkTo=Associar a
 LinkToProposal=Associar ao orçamento
-LinkToExpedition= Link to expedition
+LinkToExpedition= Link para expedição
 LinkToOrder=Hiperligação para encomendar
 LinkToInvoice=Associar a fatura
 LinkToTemplateInvoice=Link para a factura modelo
@@ -822,7 +823,7 @@ LinkToSupplierInvoice=Link para a factura do fornecedor
 LinkToContract=Associar a contrato
 LinkToIntervention=Associar a intervenção
 LinkToTicket=Link para o ticket
-LinkToMo=Link to Mo
+LinkToMo=Link para
 CreateDraft=Criar Rascunho
 SetToDraft=Voltar para o rascunho
 ClickToEdit=Clique para editar
@@ -866,7 +867,7 @@ XMoreLines=%s linhas(s) ocultas
 ShowMoreLines=Mostrar mais/menos linhas
 PublicUrl=URL público
 AddBox=Adicionar Caixa
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Selecione um elemento e clique em %s
 PrintFile=Imprimir Ficheiro %s
 ShowTransaction=Mostrar transação
 ShowIntervention=Mostrar intervenção
@@ -877,8 +878,8 @@ Denied=Negada
 ListOf=Lista de %s
 ListOfTemplates=Lista de modelos
 Gender=Género
-Genderman=Male
-Genderwoman=Female
+Genderman=Homem
+Genderwoman=Mulher
 Genderother=Outro
 ViewList=Ver Lista
 ViewGantt=Vista de Gantt
@@ -898,9 +899,9 @@ MassFilesArea=Área para os ficheiros criados através de ações em massa
 ShowTempMassFilesArea=Mostrar área para os ficheiros criados através de ações em massa
 ConfirmMassDeletion=Confirmação de Múltiplas Eliminações
 ConfirmMassDeletionQuestion=Tem a certeza de que quer apagar os %s registo(s) seleccionado(s)?
-ConfirmMassClone=Bulk clone confirmation
-ConfirmMassCloneQuestion=Select project to clone to
-ConfirmMassCloneToOneProject=Clone to project %s
+ConfirmMassClone=Confirmação de clonagem em massa
+ConfirmMassCloneQuestion=Selecione o projeto para clonar
+ConfirmMassCloneToOneProject=Clonar para projeto %s
 RelatedObjects=Objetos relacionados
 ClassifyBilled=Classificar como faturado
 ClassifyUnbilled=Classificar como não faturado
@@ -916,25 +917,26 @@ ExportFilteredList=Exportar lista filtrada
 ExportList=Exportar lista
 ExportOptions=Opções de exportação
 IncludeDocsAlreadyExported=Os documentos incluídos já foram exportados
-ExportOfPiecesAlreadyExportedIsEnable=Documents already exported are visible and will be exported
-ExportOfPiecesAlreadyExportedIsDisable=Documents already exported are hidden and won't be exported
+ExportOfPiecesAlreadyExportedIsEnable=Documentos já exportados estão visíveis e serão exportados
+ExportOfPiecesAlreadyExportedIsDisable=Documentos já exportados estão ocultos e não serão exportados
 AllExportedMovementsWereRecordedAsExported=Todos os movimentos exportados foram marcados como exportados
 NotAllExportedMovementsCouldBeRecordedAsExported=Nem todos os movimentos exportados foram marcados como exportados
 Miscellaneous=Diversos
 Calendar=Calendario
 GroupBy=Agrupar por...
+GroupByX=Agrupar por %s
 ViewFlatList=Vista de lista
 ViewAccountList=Ver livro-mestre
 ViewSubAccountList=Ver livro-mestre da subconta
 RemoveString=Remover texto '%s'
-SomeTranslationAreUncomplete=Some of the languages offered may be only partially translated or may contain errors. Please help to correct your language by registering at <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/projects/p/dolibarr/</a> to add your improvements.
-DirectDownloadLink=Public download link
-PublicDownloadLinkDesc=Only the link is required to download the file
-DirectDownloadInternalLink=Private download link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+SomeTranslationAreUncomplete=Alguns dos idiomas oferecidos podem estar apenas parcialmente traduzidos ou conter erros. Ajude a corrigir o seu idioma registando-se em <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> para adicionar as suas melhorias.
+DirectDownloadLink=Link de download público
+PublicDownloadLinkDesc=Apenas o link é necessário para fazer download do arquivo
+DirectDownloadInternalLink=Link de download privado
+PrivateDownloadLinkDesc=Necessita de estar conectado e de permissões para visualizar ou fazer download do arquivo
 Download=Download
 DownloadDocument=Download do documento
-DownloadSignedDocument=Download signed document
+DownloadSignedDocument=Fazer download do documento assinado
 ActualizeCurrency=Atualizar taxa de conversão da moeda
 Fiscalyear=Ano Fiscal
 ModuleBuilder=Construtor de Módulos e Aplicações
@@ -1045,7 +1047,7 @@ SearchIntoContacts=Contactos
 SearchIntoMembers=Membros
 SearchIntoUsers=Utilizadores
 SearchIntoProductsOrServices=Produtos ou serviços
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Lotes / Séries
 SearchIntoProjects=Projetos
 SearchIntoMO=Ordens de Fabrico
 SearchIntoTasks=Tarefas
@@ -1083,13 +1085,13 @@ KeyboardShortcut=Atalho de teclado
 AssignedTo=Atribuído a
 Deletedraft=Eliminar rascunho
 ConfirmMassDraftDeletion=Confirmação de eliminação múltipla de rascunhos
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=Arquivo compartilhado com um link público
 SelectAThirdPartyFirst=Seleccione um terceiro em primeiro...
 YouAreCurrentlyInSandboxMode=Você está atualmente no modo %s "sandbox"
 Inventory=Inventário
 AnalyticCode=Código analítico
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Mostrar informações da empresa
 ShowMoreInfos=Mostrar Mais Informações
 NoFilesUploadedYet=Por favor envie um documento em primeiro
 SeePrivateNote=Ver nota privada
@@ -1098,7 +1100,7 @@ ValidFrom=Válido desde
 ValidUntil=Válido até
 NoRecordedUsers=Sem utilizadores
 ToClose=Para fechar
-ToRefuse=To refuse
+ToRefuse=Recusar
 ToProcess=Por processar
 ToApprove=Para aprovar
 GlobalOpenedElemView=Vista global
@@ -1132,7 +1134,7 @@ DeleteFileText=Tem a certeza de que quer eliminar este ficheiro?
 ShowOtherLanguages=Mostrar outros idiomas
 SwitchInEditModeToAddTranslation=Mude para o modo de edição para adicionar traduções para este idioma
 NotUsedForThisCustomer=Não utilizado para este cliente
-NotUsedForThisVendor=Not used for this vendor
+NotUsedForThisVendor=Não usado para este Vendedor
 AmountMustBePositive=Total deve ser positivo
 ByStatus=Por estado
 InformationMessage=Informação
@@ -1150,75 +1152,78 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=O token de segurança
 UpToDate=Actualizado
 OutOfDate=Desactualizado
 EventReminder=Lembrete de evento
-UpdateForAllLines=Update for all lines
-OnHold=On hold
-Civility=Civility
-AffectTag=Assign a Tag
-AffectUser=Assign a User
-SetSupervisor=Set the supervisor
-CreateExternalUser=Create external user
-ConfirmAffectTag=Bulk Tag Assignement
-ConfirmAffectUser=Bulk User Assignement
-ProjectRole=Role assigned on each project/opportunity
-TasksRole=Role assigned on each task (if used)
-ConfirmSetSupervisor=Bulk Supervisor Set
-ConfirmUpdatePrice=Choose a increase/decrease price rate
-ConfirmAffectTagQuestion=Are you sure you want to assign tags to the %s selected record(s)?
-ConfirmAffectUserQuestion=Are you sure you want to assign users to the %s selected record(s)?
-ConfirmSetSupervisorQuestion=Are you sure you want to set supervisor to the %s selected record(s)?
-ConfirmUpdatePriceQuestion=Are you sure you want to update the price of the %s selected record(s)?
-CategTypeNotFound=No tag type found for type of records
+UpdateForAllLines=Atualização para todas as linhas
+OnHold=Em espera
+Civility=Civilidade
+AffectTag=Atribuir uma Etiqueta
+AffectUser=Atribuir um Utilizador
+SetSupervisor=Definir o supervisor
+CreateExternalUser=Criar utilizador externo
+ConfirmAffectTag=Atribuição de Etiqueta em massa
+ConfirmAffectUser=Atribuição de Utilizador em massa
+ProjectRole=Função atribuída em cada projeto/oportunidade
+TasksRole=Função atribuída em cada tarefa (se usado)
+ConfirmSetSupervisor=Designação de Supervisor em massa
+ConfirmUpdatePrice=Escolha uma taxa aumento/diminuição do preço
+ConfirmAffectTagQuestion=Tem a certeza de que deseja atribuir etiquetas aos %s registos selecionados?
+ConfirmAffectUserQuestion=Tem a certeza de que deseja atribuir Utilizadores aos %s registos selecionados?
+ConfirmSetSupervisorQuestion=Tem a certeza de que deseja designar o Supervisor para os %s registos selecionados?
+ConfirmUpdatePriceQuestion=Tem a certeza de que deseja atualizar o preço dos %s registos selecionados?
+CategTypeNotFound=Nenhuma etiqueta encontrada para o tipo de registo
 Rate=Tipo
-SupervisorNotFound=Supervisor not found
-CopiedToClipboard=Copied to clipboard
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Are you sure you want to cancel
-EmailMsgID=Email MsgID
-EmailDate=Email date
-SetToStatus=Set to status %s
-SetToEnabled=Set to enabled
-SetToDisabled=Set to disabled
-ConfirmMassEnabling=mass enabling confirmation
-ConfirmMassEnablingQuestion=Are you sure you want to enable the %s selected record(s)?
-ConfirmMassDisabling=mass disabling confirmation
-ConfirmMassDisablingQuestion=Are you sure you want to disable the %s selected record(s)?
-RecordsEnabled=%s record(s) enabled
-RecordsDisabled=%s record(s) disabled
-RecordEnabled=Record enabled
-RecordDisabled=Record disabled
-Forthcoming=Forthcoming
-Currently=Currently
-ConfirmMassLeaveApprovalQuestion=Are you sure you want to approve the %s selected record(s)?
-ConfirmMassLeaveApproval=Mass leave approval confirmation
-RecordAproved=Record approved
-RecordsApproved=%s Record(s) approved
-Properties=Properties
-hasBeenValidated=%s has been validated
+SupervisorNotFound=Supervisor não encontrado
+CopiedToClipboard=Copiado
+InformationOnLinkToContract=Este montante é apenas o total de todas as linhas do contrato. Nenhuma noção de tempo é tida em consideração.
+ConfirmCancel=Tem certeza que deseja cancelar
+EmailMsgID=E-mail MsgID
+EmailDate=Data do e-mail
+SetToStatus=Definir para o estado %s
+SetToEnabled=Definir como ativado
+SetToDisabled=Definir como desativado
+ConfirmMassEnabling=confirmação de ativação em massa
+ConfirmMassEnablingQuestion=Tem a certeza de que deseja ativar os %s registos selecionados?
+ConfirmMassDisabling=confirmação de desativação em massa
+ConfirmMassDisablingQuestion=Tem a certeza de que deseja desativar os %s registos selecionados?
+RecordsEnabled=%s registo(s) ativado(s)
+RecordsDisabled=%s registo(s) desativado(s)
+RecordEnabled=Registo ativado
+RecordDisabled=Registo desativado
+Forthcoming=Em breve
+Currently=Atualmente
+ConfirmMassLeaveApprovalQuestion=Tem a certeza de que deseja aprovar os %s registos selecionados?
+ConfirmMassLeaveApproval=Confirmação de aprovação de ausência em massa
+RecordAproved=Registo aprovado
+RecordsApproved=%s Registo(s) aprovado(s)
+Properties=Propriedades
+hasBeenValidated=%s foi validado
 ClientTZ=Fuso Horário do Cliente (utilizador)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+NotClosedYet=Ainda não encerrado
+ClearSignature=Redefinir assinatura
+CanceledHidden=Cancelado oculto
+CanceledShown=Cancelado apresentado
 Terminate=Cancelar
 Terminated=Inativo
-AddLineOnPosition=Add line on position (at the end if empty)
-ConfirmAllocateCommercial=Assign sales representative confirmation
-ConfirmAllocateCommercialQuestion=Are you sure you want to assign the %s selected record(s)?
-CommercialsAffected=Sales representatives assigned
-CommercialAffected=Sales representative assigned
-YourMessage=Your message
-YourMessageHasBeenReceived=Your message has been received. We will answer or contact you as soon as possible.
-UrlToCheck=Url to check
-Automation=Automation
-CreatedByEmailCollector=Created by Email collector
-CreatedByPublicPortal=Created from Public portal
-UserAgent=User Agent
+AddLineOnPosition=Adicionar linha na posição (ou no final, se estiver vazio)
+ConfirmAllocateCommercial=Confirmação de designação de representante de vendas
+ConfirmAllocateCommercialQuestion=Tem a certeza de que deseja atribuir os %s registos selecionados?
+CommercialsAffected=Representantes de vendas designados
+CommercialAffected=Representante de vendas designado
+YourMessage=Sua mensagem
+YourMessageHasBeenReceived=A sua mensagem foi recebida. Responderemos ou entraremos em contacto o mais breve possível.
+UrlToCheck=URL a verificar
+Automation=Automação
+CreatedByEmailCollector=Criado por coletor de e-mail
+CreatedByPublicPortal=Criado a partir do portal público
+UserAgent=Agente utilizador
 InternalUser=Utilizador interno
 ExternalUser=Utilizador externo
-NoSpecificContactAddress=No specific contact or address
-NoSpecificContactAddressBis=This tab is dedicated to force specific contacts or addresses for the current object. Use it only if you want to define one or several specific contacts or addresses for the object when the information on the thirdparty is not enough or not accurate.
-HideOnVCard=Hide %s
-AddToContacts=Add address to my contacts
-LastAccess=Last access
-UploadAnImageToSeeAPhotoHere=Upload an image from the tab %s to see a photo here
-LastPasswordChangeDate=Last password change date
+NoSpecificContactAddress=Sem contacto ou endereço específico
+NoSpecificContactAddressBis=Esta aba é dedicada a forçar contactos ou endereços específicos para o objeto atual. Use-a somente se desejar definir um ou vários contactos ou endereços específicos para o objeto quando as informações do terceiro não forem suficientes ou precisas.
+HideOnVCard=Ocultar %s
+AddToContacts=Adicionar endereço aos meus contactos
+LastAccess=Último acesso
+UploadAnImageToSeeAPhotoHere=Carregue uma imagem da aba %s para ver uma foto aqui
+LastPasswordChangeDate=Data da última alteração de senha
+PublicVirtualCardUrl=URL da página do cartão de visita virtual
+PublicVirtualCard=Cartão de visita virtual
+TreeView=Vista em árvore
diff --git a/htdocs/langs/pt_PT/sms.lang b/htdocs/langs/pt_PT/sms.lang
index facdadb0279..f64c624e678 100644
--- a/htdocs/langs/pt_PT/sms.lang
+++ b/htdocs/langs/pt_PT/sms.lang
@@ -44,7 +44,7 @@ NbOfSms=Número de números de telefone
 ThisIsATestMessage=Esta é uma mensagem de teste
 SendSms=Enviar SMS
 SmsInfoCharRemain=No. de caracteres restantes
-SmsInfoNumero= (formato internacional, ou seja: +33899701761)
+SmsInfoNumero= (formato internacional, p.e.: +351 969 XXX XXX)
 DelayBeforeSending=Atraso antes de enviar (minutos)
 SmsNoPossibleSenderFound=Nenhum operador disponível. Verifique a configuração do seu serviço SMS. 
 SmsNoPossibleRecipientFound=Nenhum alvo disponível. Verifique a configuração do seu provedor de SMS.
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index cb7df2b80e1..049b12582ba 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Activare listă combinată pentru contul subsidiar (po
 ACCOUNTING_DATE_START_BINDING=Definiți o dată pentru a începe legarea și transferul în contabilitate. Înainte de această dată, tranzacțiile nu vor fi transferate în contabilitate.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Pentru transferul contabil, care este perioada selectată implicit 
 
-ACCOUNTING_SELL_JOURNAL=Jurnal de vânzări (vânzări și retururi)
-ACCOUNTING_PURCHASE_JOURNAL=Jurnal de achiziții (achiziții și retururi)
-ACCOUNTING_BANK_JOURNAL=Jurnal de numerar (încasări și plăți)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Jurnalul rapoartelor de cheltuieli
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Registrul jurnal
 ACCOUNTING_HAS_NEW_JOURNAL=Are un nou jurnal
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Aceasta va șterge toate rândurile din contabilitate pentru an
 ConfirmDeleteMvtPartial=Aceasta va șterge tranzacția din contabilitate (toate liniile legate de aceeași tranzacție vor fi șterse)
 FinanceJournal=Jurnal Bancă
 ExpenseReportsJournal=Jurnalul rapoartelor de cheltuieli
+InventoryJournal=Jurnal de inventar
 DescFinanceJournal=Jurnal financiar bancar, include toate tipurile de plăți efectuate prin conturile bancare
 DescJournalOnlyBindedVisible=Aceasta este o vedere a înregistrării care este legată de un cont contabil și poate fi înregistrată în jurnale și Registrul jurnal.
 VATAccountNotDefined=Contul contabil de TVA nu a fost definit
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index fe6f24b2aa8..bae975f4fbe 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widget-uri
 MaxNbOfLinesForBoxes=Numărul maxim de linii pentru widget-uri
 AllWidgetsWereEnabled=Toate widgeturile disponibile sunt activate
+WidgetAvailable=Widget disponibil
 PositionByDefault=Ordinea implicită
 Position=Poziţie
 MenusDesc=Managerii de meniuri stabilesc conținutul celor două bare de meniu (orizontală și verticală).
@@ -374,7 +375,7 @@ DoTestSendHTML=Test trimitere HTML
 ErrorCantUseRazIfNoYearInMask=Eroare, nu se poate folosi opțiunea @ pentru a reseta contorul la fiecare an, dacă secvența {yy} sau  {yyyy} nu este în mască.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Eroare, nu se poate utiliza opţiunea @ dacă secvenţa {yy}{mm} sau {yyyy}{mm}  nu este în mască.
 UMask=Parametrul UMask pentru fişiere noi în sistemul de fişiere Unix/Linux/BSD/Mac.
-UMaskExplanation=Acest parametru îţi permite să defineşti permisiuni implicite  pe fişierele create de sistem pe server (în timpul încărcării, de exemplu). <br> Acesta trebuie să fie o valoare octală (de exemplu, 0666 înseamnă citire şi scriere pentru toată lumea). <br> Acest parametru nu se poate utiliza pe un server Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Uitați-vă la pagina Wiki pentru o listă de contribuitori și organizațiiile lor
 UseACacheDelay= Întârziere răspuns pentru caching de export în secunde (0 sau gol pentru nici un cache)
 DisableLinkToHelpCenter=Ascunde link-ul "<b>Ai nevoie de ajutor sau asistență</b>" de pe pagina de autentificare
@@ -663,7 +664,7 @@ Module2900Desc=Capabilităţi de conversie GeoIP Maxmind
 Module3200Name=Jurnale Nealterabile
 Module3200Desc=Activează un jurnal inalterabil al evenimentelor de afaceri. Evenimentele sunt arhivate în timp real. Jurnalul este o tabelă cu functie doar de citire a evenimentelor în lanț care pot fi exportate. Acest modul poate fi obligatoriu pentru unele țări.
 Module3300Name=Dezvoltator de module
-Module3200Desc=Activează un jurnal inalterabil al evenimentelor de afaceri. Evenimentele sunt arhivate în timp real. Jurnalul este o tabelă cu functie doar de citire a evenimentelor în lanț care pot fi exportate. Acest modul poate fi obligatoriu pentru unele țări.
+Module3300Desc=Un instrument RAD (Rapid Application Development - low-code and no-code) pentru a ajuta dezvoltatorii sau utilizatorii avansați să-și construiască propriul modul/aplicație.
 Module3400Name=Reţele sociale
 Module3400Desc=Activați câmpurile Rețele sociale la terți și adrese (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Utilizare mod de memorie limitată
 ExportUseLowMemoryModeHelp=Utilizare mod de memorie scăzută pentru generarea fișierului dump (comprimarea se face printr-un pipe în loc de memoria PHP). Această metodă nu permite să verifici dacă fișierul este complet și mesajul de eroare nu poate fi raportat dacă nu reușește. Utilizează dacă nu ai erori de memorie.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interfață de capturare triggere sistem și trimitere la o adresă URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Configurare Webhook
 Settings = Configurări
 WebhookSetupPage = Pagină de configurare Webhook
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Atenție: modulul %s a setat un
 WarningModuleHasChangedSecurityCsrfParameter=Atenție: modulul %s a dezactivat securitatea CSRF a instanței tale. Această acțiune este suspectă și este posibil ca instalarea ta să nu mai fie securizată. Contacteză autorul modulului pentru explicații. 
 EMailsInGoingDesc=E-mailurile primite sunt gestionate de modulul %s. Trebuie să îl activezi și să îl configurezi dacă trebuie să accepți e-mailurile primite.
 MAIN_IMAP_USE_PHPIMAP=Utilizează biblioteca PHP-IMAP pentru IMAP în loc de PHP IMAP nativ. Acest lucru permite, de asemenea, utilizarea unei conexiuni OAuth2 pentru IMAP (modulul OAuth trebuie, de asemenea, activat). 
+MAIN_CHECKBOX_LEFT_COLUMN=Afișare coloană pentru selecție câmp și linie în stânga (în mod implicit în dreapta)
+
+CSSPage=Stil CSS
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index 9d743434c7c..1021450ce04 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=DMS/ECM
 ECMAreaDesc=DMS/ECM (Document Management System / Electronic Content Management) vă permite să salvați, să partajați și să căutați rapid toate tipurile de documente în Dolibarr.
 ECMAreaDesc2a=* Directoarele manuale pot fi folosite pentru a salva documente care nu au legătură cu un anumit element.
 ECMAreaDesc2b=* Directoarele automate sunt completate automat la adăugarea documentelor din pagina unui element.
-ECMAreaDesc3=* Directoarele Media sunt fișiere din subdirectorul <b>/medias</b> din directorul de documente, care pot fi citite de oricine, fără a fi nevoie să fie autentificat și fără a fi necesar să fie partajat explicit fișierul. Este folosit pentru a stoca fișiere imagine din modulul de email sau site web.
+ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=Directorul <b>%s</b> a fost şters.
 ECMSectionWasCreated=Directorul <b> %s </b> a fost creat.
 ECMSearchByKeywords=Caută după cuvinte cheie
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 86919a04ae3..fbb5e25b81c 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -262,6 +262,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Eroare, parametrul <b>%s</b> trebu
 ErrorLoginDateValidity=Eroare, această conectare se află în afara intervalului temporal valabil
 ErrorValueLength=Lungimea câmpului '<b>%s</b>' trebuie să fie mai mare de '<b>%s</b>'
 ErrorReservedKeyword=Cuvântul '<b>%s</b>' este un cuvânt cheie rezervat
+ErrorFilenameReserved=The filename <b>%s</b> can't be used as it is a reserved and protected command.
 ErrorNotAvailableWithThisDistribution=Nu este disponibil cu această distribuție
 ErrorPublicInterfaceNotEnabled=Interfaţa publică nu a fost activată
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Limba noii pagini trebuie definită dacă este setată ca traducere a altei pagini
@@ -308,7 +309,7 @@ ErrorExistingPermission = Permisiunea <b>%s</b> pentru obiectul <b>%s</b> exist
 ErrorFieldExist=Valoarea pentru <b>%s</b> există deja
 ErrorEqualModule=Modul invalid în <b>%s</b>
 ErrorFieldValue=Valoarea pentru <b>%s</b> este incorectă
-ErrorCoherenceMenu=<b>%s</b> este obligatoriu când <b>%</b> egal STÂNGA
+ErrorCoherenceMenu=<b>%s</b> is required when <b>%s</b> is 'left'
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parametrul tău PHP upload_max_filesize (%s) este mai mare decât paramentrul PHP post_max_size (%s). Aceasta nu este o configuraţie consistentă.
diff --git a/htdocs/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang
index 3456ba1d0b4..afe669b3d0e 100644
--- a/htdocs/langs/ro_RO/interventions.lang
+++ b/htdocs/langs/ro_RO/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Ascunde orele și minutele din câmpul de dată pe
 InterventionStatistics=Statistici intervenţii
 NbOfinterventions=Număr intervenții
 NumberOfInterventionsByMonth=Nr. intervenții pe lună (după data de validare)
-AmountOfInteventionNotIncludedByDefault=Suma de intervenție nu este inclusă implicit în profit (în majoritatea cazurilor, foile de pontaj sunt utilizate pentru a calcula timpul consumat). Adăugați opțiunea PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT la 1 în Acasă-Setări-Alte setări pentru a-l include.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=ID intervenţie
 InterRef=Ref. intervenţie
 InterDateCreation=Dată creare intervenție
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 2a091dca2de..9e7885e6750 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -7,10 +7,10 @@ MailCard=Fişă newsletter
 MailRecipients=Destinatari
 MailRecipient=Destinatar
 MailTitle=Titlu descriere
-MailFrom=Expeditor
+MailFrom=De la
 MailErrorsTo=Erori la
 MailReply=Răspunde la
-MailTo=Destinatar(i)
+MailTo=La
 MailToUsers=Pentru utilizator(i)
 MailCC=Copie la
 MailToCCUsers=CC la utilizator(i)
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacte după funcţie
 MailingModuleDescEmailsFromFile=Adrese email din fișier
 MailingModuleDescEmailsFromUser=Adrese de email introduse de utilizator
 MailingModuleDescDolibarrUsers=Utilizatori cu adrese de email
-MailingModuleDescThirdPartiesByCategories=Terți (pe categorii)
+MailingModuleDescThirdPartiesByCategories=Terţi
 SendingFromWebInterfaceIsNotAllowed=Trimiterea de pe interfața web nu este permisă.
 EmailCollectorFilterDesc=Toate filtrele trebuie să se potrivească pentru ca un email să fie colectat
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Înregistrare creată de colectorul de email %s di
 DefaultBlacklistMailingStatus=Valoare implicită pentru câmpul '%s' când este creat un nou contact
 DefaultStatusEmptyMandatory= Necompletat, dar obligatoriu
 WarningLimitSendByDay=ATENȚIE: Configurarea sau contractul instanței tale limitează numărul de email-uri pe zi la <b>%s</b>. Încercarea de a trimite mai multe poate duce la încetinirea sau suspendarea instanței. Contactează serviciul de asistență dacă ai de o cotă mai mare.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 7f901d0d43d..69701e13b84 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -4,6 +4,8 @@ MemberCard=Fişă membru
 SubscriptionCard=Fişă cotizaţie
 Member=Membru
 Members=Membri
+NoRecordedMembers=No recorded members
+NoRecordedMembersByType=No recorded members
 ShowMember=Arată fişa membrului
 UserNotLinkedToMember=Utilizator neasociat la la un membru
 ThirdpartyNotLinkedToMember=Terț neasociat la un membru
@@ -233,3 +235,4 @@ CreateDolibarrThirdPartyDesc=Un terț este persoana juridică care va fi utiliza
 MemberFirstname=Prenume membru
 MemberLastname=Nume membru
 MemberCodeDesc=Cod de membru, unic pentru toți membrii 
+NoRecordedMembers=No recorded members
diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang
index e268c9f7540..5fc7091ccd5 100644
--- a/htdocs/langs/ro_RO/mrp.lang
+++ b/htdocs/langs/ro_RO/mrp.lang
@@ -119,3 +119,6 @@ BomCantAddChildBom=Nomenclatorul %s este deja prezentă în arborele care duce l
 BOMNetNeeds = Necesar net BOM
 BOMProductsList=Produse BOM
 BOMServicesList=Servicii BOM
+Manufacturing=Producție
+Disassemble=Dezasamblare
+ProducedBy=Produs de
diff --git a/htdocs/langs/ro_RO/partnership.lang b/htdocs/langs/ro_RO/partnership.lang
index 4c7b59c24f6..0276b20b759 100644
--- a/htdocs/langs/ro_RO/partnership.lang
+++ b/htdocs/langs/ro_RO/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Parteneriat: Verificare backlink de referinţă
 # Menu
 #
 NewPartnership=Parteneriat nou
-NewPartnershipbyWeb= Parteneriatul tău a fost adăugat cu succes.
+NewPartnershipbyWeb=Your partnership request has been added successfully. We may contact you soon...
 ListOfPartnerships=Listă parteneriate
 
 #
diff --git a/htdocs/langs/ro_RO/ticket.lang b/htdocs/langs/ro_RO/ticket.lang
index 0acad8b4e16..ef31806cec1 100644
--- a/htdocs/langs/ro_RO/ticket.lang
+++ b/htdocs/langs/ro_RO/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Creat de
 NewTicket=Tichet nou
 SubjectAnswerToTicket=Răspuns la tichet
 TicketTypeRequest=Tip de solicitare
-TicketCategory=Categorizare tichet
+TicketCategory=Grup tichete
 SeeTicket=Vezi tichetul
 TicketMarkedAsRead=Tichetul a fost marcat ca citit
 TicketReadOn=Citește mai departe
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index fc2270f06a7..1760a6e4bb8 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -145,6 +145,7 @@ Box=Виджет
 Boxes=Виджеты
 MaxNbOfLinesForBoxes=Макс. количество строк для виджета
 AllWidgetsWereEnabled=Доступны все доступные виджеты
+WidgetAvailable=Widget available
 PositionByDefault=Порядок по умолчанию
 Position=Позиция
 MenusDesc=Менеджеры меню устанавливают содержание двух полос меню (горизонтальной и вертикальной).
@@ -374,7 +375,7 @@ DoTestSendHTML=Тестовая отправка HTML
 ErrorCantUseRazIfNoYearInMask=Ошибка, не может использовать параметр @ для сброса счетчика каждый год, если последовательность {yy} или {yyyy} не находится в маске.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Ошибка, не возможно использовать опцию @ если последовательность {yy}{mm} или {yyyy}{mm} не в маске.
 UMask=UMask параметр для новых файлов в файловых системах Unix/Linux/BSD/Mac.
-UMaskExplanation=Этот параметр позволяет определить набор прав по умолчанию для файлов, созданных Dolibarr на сервере (при загрузке, например).<br>Это должно быть восьмеричное значение (например, 0666 означает, читать и записывать сможет каждый).<br>Этот параметр бесполезен на Windows-сервере.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Посмотрите на вики-странице список участников и их организации.
 UseACacheDelay= Задержка для кэширования при экспорте в секундах (0 или пусто для отключения кэширования)
 DisableLinkToHelpCenter=Скрыть ссылку «<b>Нужна помощь или поддержка</b>» на странице входа
@@ -663,7 +664,7 @@ Module2900Desc=Подключение к службе GeoIP MaxMind для пр
 Module3200Name=Неограниченные архивы
 Module3200Desc=Включите неизменяемый журнал деловых событий. События архивируются в режиме реального времени. Журнал представляет собой доступную только для чтения таблицу связанных событий, которые можно экспортировать. Этот модуль может быть обязательным для некоторых стран.
 Module3300Name=Module Builder
-Module3200Desc=Включите неизменяемый журнал деловых событий. События архивируются в режиме реального времени. Журнал представляет собой доступную только для чтения таблицу связанных событий, которые можно экспортировать. Этот модуль может быть обязательным для некоторых стран.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Социальные сети
 Module3400Desc=Включите поля социальных сетей в третьи стороны и адреса (скайп, твиттер, фейсбук, ...).
 Module4000Name=Управление персоналом
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Используйте режим с низким объ
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Вебхук
-ModuleWebhookDesc = Интерфейс для перехвата триггеров dolibarr и отправки их по URL-адресу
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Настройка вебхука
 Settings = Настройки
 WebhookSetupPage = Страница настройки вебхука
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang
index 668f1872d8a..27b0f9fb1ef 100644
--- a/htdocs/langs/ru_RU/interventions.lang
+++ b/htdocs/langs/ru_RU/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Скрывает часы и минуты из п
 InterventionStatistics=Статистика посредничества
 NbOfinterventions=Кол-во карт посредничества
 NumberOfInterventionsByMonth=Количество карт посредничества по месяцам (дата проверки)
-AmountOfInteventionNotIncludedByDefault=Сумма посредничества по умолчанию не включается в прибыль (в большинстве случаев для подсчета затраченного времени используются табели учета рабочего времени). Добавьте параметр PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT в 1 в home-setup-other, чтобы включить их.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Идентификатор посредничества
 InterRef=Посредничество ссылка
 InterDateCreation=Дата создания посредничества
@@ -68,3 +68,5 @@ ConfirmReopenIntervention=Вы уверены, что хотите снова о
 GenerateInter=Созадать посредничество
 FichinterNoContractLinked=Вмешательство %s создано без связанного контракта.
 ErrorFicheinterCompanyDoesNotExist=Компания не существует. Вмешательство не создано.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index d31685f37d8..ab552cb34a6 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Контакты по должности
 MailingModuleDescEmailsFromFile=Электронные письма из файла
 MailingModuleDescEmailsFromUser=Электронные письма, введенные пользователем
 MailingModuleDescDolibarrUsers=Пользователи с электронной почтой
-MailingModuleDescThirdPartiesByCategories=Контрагенты (по категориям)
+MailingModuleDescThirdPartiesByCategories=Контрагенты
 SendingFromWebInterfaceIsNotAllowed=Отправка из веб-интерфейса не разрешена.
 EmailCollectorFilterDesc=Все фильтры должны совпадать, чтобы электронная почта была собрана
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Запись, созданная сборщико
 DefaultBlacklistMailingStatus=Значение по умолчанию для поля '%s' при создании нового контакта
 DefaultStatusEmptyMandatory=Пусто, но обязательно
 WarningLimitSendByDay=ВНИМАНИЕ: В соответствии с настройками или контрактом вашего экземпляра количество писем в день ограничено до <b>%s</b>. Попытка отправить больше может привести к замедлению или приостановке работы вашего экземпляра. Обратитесь в службу поддержки, если вам нужна более высокая квота.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/ru_RU/ticket.lang b/htdocs/langs/ru_RU/ticket.lang
index 6cc771a9a6f..d860b7ffdfa 100644
--- a/htdocs/langs/ru_RU/ticket.lang
+++ b/htdocs/langs/ru_RU/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Создано
 NewTicket=Новый тикет
 SubjectAnswerToTicket=Ответ на тикет
 TicketTypeRequest=Тип запроса
-TicketCategory=Категоризация тикетов
+TicketCategory=Ticket group
 SeeTicket=Посмотреть тикет
 TicketMarkedAsRead=Тикет отмечен как прочитанный
 TicketReadOn=Читать дальше
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 258dfb88f4e..e09a983283d 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -145,6 +145,7 @@ Box=Panel
 Boxes=Panely
 MaxNbOfLinesForBoxes=Max. number of lines for widgets
 AllWidgetsWereEnabled=All available widgets are enabled
+WidgetAvailable=Widget available
 PositionByDefault=Predvolené poradie
 Position=Pozícia
 MenusDesc=Menu manažér nastaví obsah dvoch menu panelov ( horizontálne a vertikálne)
@@ -374,7 +375,7 @@ DoTestSendHTML=Otestujte odosielanie HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Chyba, nemožno použiť voľbu @ li postupnosť {yy} {mm} alebo {yyyy} {mm} nie je v maske.
 UMask=Umask parameter pre nové súbory na Unix / Linux / BSD / Mac systému súborov.
-UMaskExplanation=Tento parameter umožňuje definovať oprávnenia v predvolenom nastavení na súbory vytvorené Dolibarr na serveri (počas nahrávania napríklad). <br> To musí byť osmičková hodnota (napr. 0666 znamená čítať a písať pre všetkých). <br> Tento parameter je k ničomu, na serveri Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= Oneskorenie pre ukladanie do medzipamäte export reakcie v sekundách (0 alebo prázdne bez vyrovnávacej pamäte)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP MaxMind konverzie možnosti
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
 Module3300Name=Module Builder
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Social Networks
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index 70effdd7b94..71fa257412d 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Tretie strany
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index ad90ac9c932..90dd901e7d5 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Omogoči kombinirani seznam za podrejeni račun (morda
 ACCOUNTING_DATE_START_BINDING=Določite datum začetka vezave in prenosa v računovodstvu. Pod tem datumom se transakcije ne prenesejo v računovodstvo.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Pri prenosu knjigovodstva, katero obdobje je privzeto izbrano
 
-ACCOUNTING_SELL_JOURNAL=Dnevnik prodaje (prodaje in vračila)
-ACCOUNTING_PURCHASE_JOURNAL=Dnevnik nakupov (nakup in vračila)
-ACCOUNTING_BANK_JOURNAL=Blagajniški dnevnik (prejemki in izdatki)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Pregled stroškovnih poročil
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Splošni dnevnik
 ACCOUNTING_HAS_NEW_JOURNAL=Ima nov dnevnik
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=S tem boste izbrisali vse vrstice v računovodstvu za leto/mese
 ConfirmDeleteMvtPartial=S tem boste transakcijo izbrisali iz računovodstva (izbrisane bodo vse vrstice, povezane z isto transakcijo)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Dnevnik poročil o stroških
+InventoryJournal=Inventurni dnevnik
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=To je pogled evidence, ki je vezan na računovodski račun in ga je mogoče zabeležiti v dnevnike in glavno knjigo.
 VATAccountNotDefined=Račun za DDV ni opredeljen
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 7ab414d4340..6128136e73b 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Pripomočki
 MaxNbOfLinesForBoxes=maks. število vrstic za pripomočke
 AllWidgetsWereEnabled=Omogočeni so vsi razpoložljivi pripomočki
+WidgetAvailable=Widget available
 PositionByDefault=Privzet vrstni red
 Position=Položaj
 MenusDesc=Upravljavci menijev nastavijo vsebino dveh menijskih vrstic (vodoravno in navpično).
@@ -374,7 +375,7 @@ DoTestSendHTML=Testno pošiljanje HTML
 ErrorCantUseRazIfNoYearInMask=Napaka, ni možno uporabiti opcije @, za vsakoletno resetiranje števca, če sekvence {yy} ali {yyyy} ni v maski.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Napaka, ni možno uporabiti opcije @, če sekvence {yy}{mm} ali {yyyy}{mm} ni v maski.
 UMask=UMask parameter za nove datoteke na Unix/Linux/BSD datotečnem sistemu.
-UMaskExplanation=Ta parameter omogoča definicijo privzetih dovoljenj za datoteke na strežniku, ki jih je kreiral Dolibarr (na primer med nalaganjem).<br>Vrednost  je oktalna (na primer, 0666 pomeni branje in pisanje za vse).<br>Tega parametra ni na Windows strežniku.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Oglejte si stran Wiki za seznam sodelavcev in njihove organizacije
 UseACacheDelay= Zakasnitev predpomnilnika za izvozni odziv v sekundah (0 ali prazno pomeni, da ni predpomnilnika)
 DisableLinkToHelpCenter=Skrij povezavo " <b> Potrebujem pomoč ali podporo </b> " na strani za prijavo
@@ -663,7 +664,7 @@ Module2900Desc=Možnost konverzije GeoIP Maxmind
 Module3200Name=Nespremenljivi arhivi
 Module3200Desc=Omogočite nespremenljiv dnevnik poslovnih dogodkov. Dogodki se arhivirajo v realnem času. Dnevnik je tabela verižnih dogodkov samo za branje, ki jo je mogoče izvoziti. Ta modul je lahko obvezen za nekatere države.
 Module3300Name=Module Builder
-Module3200Desc=Omogočite nespremenljiv dnevnik poslovnih dogodkov. Dogodki se arhivirajo v realnem času. Dnevnik je tabela verižnih dogodkov samo za branje, ki jo je mogoče izvoziti. Ta modul je lahko obvezen za nekatere države.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Socialna omrežja
 Module3400Desc=Omogočite polja Social Networks v tretjih osebah in naslovih (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Uporabite način nizke količine pomnilnika
 ExportUseLowMemoryModeHelp=Uporabite način nizkega pomnilnika za ustvarjanje datoteke izpisa (stiskanje poteka skozi cev namesto v pomnilnik PHP). Ta metoda ne omogoča preverjanja, ali je datoteka popolna, in sporočila o napaki ni mogoče sporočiti, če ne uspe. Uporabite ga, če naletite na napake premalo pomnilnika.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Vmesnik za lovljenje sprožilcev dolibarr in pošiljanje na URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Nastavitev Webhooka
 Settings = nastavitve
 WebhookSetupPage = Stran za nastavitev Webhooka
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/sl_SI/interventions.lang b/htdocs/langs/sl_SI/interventions.lang
index c622599aa45..162921354cf 100644
--- a/htdocs/langs/sl_SI/interventions.lang
+++ b/htdocs/langs/sl_SI/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Skrije ure in minute izven datumskega polja za zap
 InterventionStatistics=Statistika intervencij
 NbOfinterventions=Št. intervencijskih kart
 NumberOfInterventionsByMonth=Število intervencijskih kartic po mesecih (datum validacije)
-AmountOfInteventionNotIncludedByDefault=Znesek intervencije privzeto ni vključen v dobiček (v večini primerov se za štetje porabljenega časa uporabljajo časovnice). Dodajte možnost PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT na 1 v home-setup-other, da jih vključite.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=ID intervencije
 InterRef=Ref. intervencije
 InterDateCreation=Intervencija ustvarjanja datuma
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index b238306ee6f..a58df6ead5c 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Kontakti po položaju
 MailingModuleDescEmailsFromFile=E-poštna sporočila iz datoteke
 MailingModuleDescEmailsFromUser=E-poštna sporočila, ki jih vnese uporabnik
 MailingModuleDescDolibarrUsers=Uporabniki z e-pošto
-MailingModuleDescThirdPartiesByCategories=Partnerji (po kategorijah)
+MailingModuleDescThirdPartiesByCategories=Partnerji
 SendingFromWebInterfaceIsNotAllowed=Pošiljanje iz spletnega vmesnika ni dovoljeno.
 EmailCollectorFilterDesc=Za zbiranje e-pošte se morajo vsi filtri ujemati
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Zapis, ki ga je ustvaril zbiralnik e-pošte %s iz
 DefaultBlacklistMailingStatus=Privzeta vrednost za polje '%s' pri ustvarjanju novega stika
 DefaultStatusEmptyMandatory=Prazen, a obvezen
 WarningLimitSendByDay=OPOZORILO: Nastavitev ali pogodba vašega primerka omejuje vaše število e-poštnih sporočil na dan na <b> %s </b> . Poskus pošiljanja več lahko povzroči upočasnitev ali začasno zaustavitev vašega primerka. Če potrebujete višjo kvoto, se obrnite na podporo.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/sl_SI/partnership.lang b/htdocs/langs/sl_SI/partnership.lang
index b00f6de7b20..6be6c76caac 100644
--- a/htdocs/langs/sl_SI/partnership.lang
+++ b/htdocs/langs/sl_SI/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Partnerstvo: Preverite napotitveno povratno povezavo
 # Menu
 #
 NewPartnership=Novo partnerstvo
-NewPartnershipbyWeb= Vaše partnerstvo je bilo uspešno dodano.
+NewPartnershipbyWeb=Your partnership request has been added successfully. We may contact you soon...
 ListOfPartnerships=Seznam partnerstev
 
 #
diff --git a/htdocs/langs/sl_SI/ticket.lang b/htdocs/langs/sl_SI/ticket.lang
index 90ecd5b1ec8..95a9b290804 100644
--- a/htdocs/langs/sl_SI/ticket.lang
+++ b/htdocs/langs/sl_SI/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Ustvaril
 NewTicket=Nov zahtevek
 SubjectAnswerToTicket=Odgovor na zahtevek
 TicketTypeRequest=Vrsta zahteve
-TicketCategory=Kategorizacija zahtevka
+TicketCategory=Ticket group
 SeeTicket=Glej zahtevek
 TicketMarkedAsRead=Zahtevek je označen kot prebran
 TicketReadOn=Beri naprej
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index d05a96ba136..c029094b88c 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -145,6 +145,7 @@ Box=Vidžet
 Boxes=Vidžeti
 MaxNbOfLinesForBoxes=Maksimalni broj linija za vidžete
 AllWidgetsWereEnabled=All available widgets are enabled
+WidgetAvailable=Widget available
 PositionByDefault=Podrazumevani redosled
 Position=Pozicija
 MenusDesc=Menadžer menija postavlja sadržaj dve trake menija (horizontalnu i vertikalnu).
@@ -374,7 +375,7 @@ DoTestSendHTML=Test slanja HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Greška, ne možete koristiti opciju @ ako sekvenca {yy}{mm} ili {yyyy}{mm} nije unutar maske.
 UMask=UMask parameter za nove fajlove na Unix/Linux/BSD/Mac fajl sistemima.
-UMaskExplanation=Ovaj parametar omogućava da definišete dozvole koje se podrazumevano postavljaju na fajlovima koje pravi Dolibarr na serveru (tokom uploada na primer).<br>Mora biti oktalna vrednost (na primer, 0666 znači čitaj i piši za sve).<br>Ovaj parametar je beskoristan na Windows serveru.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Pogledajte na Wiki strani listu saradnika i njihove organizacije
 UseACacheDelay= Odlaganje za keširanje eksport odgovora u sekundama (0 ili prazno da nema keša)
 DisableLinkToHelpCenter=Sakriti link "<b>Potrebna pomoć ili podrška</b>" na login strani
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind mogućnosti konverzije
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
 Module3300Name=Module Builder
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Social Networks
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index f651ac48d5a..46f1d76ed8b 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=Subjekti
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index cdc97249343..f8c7d961687 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -167,9 +167,9 @@ ACCOUNTANCY_COMBO_FOR_AUX=Aktivera kombinationslista för dotterbolagskonto (kan
 ACCOUNTING_DATE_START_BINDING=Definiera ett datum för att börja binda och överföra i bokföring. Under detta datum överförs inte transaktionerna till bokföring.
 ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Vid bokföringsöverföring, vilken period är vald som standard
 
-ACCOUNTING_SELL_JOURNAL=Försäljningsjournal (försäljning och returer)
-ACCOUNTING_PURCHASE_JOURNAL=Inköpsjournal (köp och returer)
-ACCOUNTING_BANK_JOURNAL=Kassajournal (kvitton och utbetalningar)
+ACCOUNTING_SELL_JOURNAL=Sales journal - sales and returns
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal - purchase and returns
+ACCOUNTING_BANK_JOURNAL=Cash journal - receipts and disbursements
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Utgiftsloggbok
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Allmän journal
 ACCOUNTING_HAS_NEW_JOURNAL=Har ny loggbok
@@ -238,6 +238,7 @@ ConfirmDeleteMvt=Detta kommer att radera alla rader i bokföring för året/mån
 ConfirmDeleteMvtPartial=Detta kommer att radera transaktionen från bokföringen (alla rader relaterade till samma transaktion kommer att raderas)
 FinanceJournal=Finansloggbok
 ExpenseReportsJournal=Utläggsrapporter loggbok
+InventoryJournal=Inventeringsjournal
 DescFinanceJournal=Finansbokföring inklusive alla typer av betalningar via bankkonto
 DescJournalOnlyBindedVisible=Detta är en vy över posten som är bunden till ett redovisningskonto och kan registreras i tidskrifterna och storboken.
 VATAccountNotDefined=Konto för moms inte definierad
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 43a99a810b3..537dc5c4ce0 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -145,6 +145,7 @@ Box=Widget
 Boxes=Widgetar
 MaxNbOfLinesForBoxes=Max antal rader för widgetar
 AllWidgetsWereEnabled=Alla tillgängliga widgetar är aktiverade
+WidgetAvailable=Widget available
 PositionByDefault=Standardsortering
 Position=Position
 MenusDesc=Menyhanterare ställer in innehållet i de två menyerna (horisontellt och vertikalt).
@@ -374,7 +375,7 @@ DoTestSendHTML=Testa att skicka HTML
 ErrorCantUseRazIfNoYearInMask=Fel! Kan inte använda alternativet @ för att återställa räknaren varje år om sekvensen {yy} eller {yyyy} inte finns i masken.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fel! Kan inte använda alternativet @ om sekvensen (yy)(mm) eller (yyyy)(mm) inte finns i masken.
 UMask=UMask-parameter för nya filer på Unix/Linux/BSD-filsystem.
-UMaskExplanation=Denna parameter gör att du kan ange rättigheter som standard på filer skapade av Dolibarr på servern (under uppladdning till exempel). <br>Det måste vara det oktala värdet (till exempel 0666 innebär läs- och skrivrättigheter för alla).<br>Denna parameter är meningslös på en Windows-server.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Ta en titt på Wiki-sidan för en lista över bidragsgivare och deras organisation
 UseACacheDelay= Fördröjning för cache-exportsvar i sekunder (0 eller tomt för ingen cache)
 DisableLinkToHelpCenter=Dölj länken <b>Behöver du hjälp eller support</b> på inloggningssidan
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind konverteringskapacitet
 Module3200Name=Oföränderliga arkiv
 Module3200Desc=Aktivera en oföränderlig logg över affärshändelser. Händelser arkiveras i realtid. Loggen är en skrivskyddad tabell med händelser som kan exporteras. Denna modul kan vara obligatorisk i vissa länder.
 Module3300Name=Modulbyggare
-Module3200Desc=Aktivera en oföränderlig logg över affärshändelser. Händelser arkiveras i realtid. Loggen är en skrivskyddad tabell med händelser som kan exporteras. Denna modul kan vara obligatorisk i vissa länder.
+Module3300Desc=Ett RAD-verktyg (Rapid Application Development - low-code and no-code) för att hjälpa utvecklare eller avancerade användare att bygga sin egen modul/applikation.
 Module3400Name=Sociala nätverk
 Module3400Desc=Aktivera fält för sociala nätverks i tredjeparter och adresser (Skype, Twitter, Facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Använd ett läge med lågt minne
 ExportUseLowMemoryModeHelp=Använd lågminnesläget för att generera dumpfilen (komprimering görs genom en pipe istället för i PHP-minnet). Den här metoden tillåter inte att kontrollera om filen är komplett och felmeddelandet kan inte rapportera om det misslyckas. Använd den om du upplever att du inte har tillräckligt med minne.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Gränssnitt för att fånga dolibarr-utlösare och skicka den till en URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook-inställning
 Settings = Inställningar
 WebhookSetupPage = Inställningar för webhooks
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Varning: modulen %s har satt en
 WarningModuleHasChangedSecurityCsrfParameter=Varning: modulen %s har inaktiverat CSRF-säkerheten för din instans. Denna åtgärd är misstänkt och din installation kanske inte längre är säkrad. Kontakta författaren av modulen för förklaring.
 EMailsInGoingDesc=Inkommande e-postmeddelanden hanteras av modulen %s. Du måste aktivera och konfigurera det om du behöver stödja inkommande e-postmeddelanden.
 MAIN_IMAP_USE_PHPIMAP=Använd PHP-IMAP-biblioteket för IMAP istället för inbyggt PHP IMAP. Detta tillåter också användningen av en OAuth2-anslutning för IMAP (modulen OAuth måste också vara aktiverad).
+MAIN_CHECKBOX_LEFT_COLUMN=Visa kolumnen för fält- och radval till vänster (till höger som standard)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index 85ff1196a46..f15b706395a 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -19,7 +19,7 @@ ECMArea=DMS/ECM område
 ECMAreaDesc=Med DMS/ECM-området (Document Management System/Electronic Content Management) kan du spara, dela och söka snabbt i alla typer av dokument.
 ECMAreaDesc2a=* Manuella kataloger kan användas för att spara dokument som inte är kopplade till ett visst element.
 ECMAreaDesc2b=* Automatiska kataloger fylls automatiskt när du lägger till dokument från sidan av ett element.
-ECMAreaDesc3=* Mediakataloger är filer i underkatalogen <b>/medias</b> i dokumentkatalogen, läsbara av alla utan att behöva logga in och utan att filen måste delas. Den används för att lagra bildfiler från e-post eller modulen webbplatser.
+ECMAreaDesc3=* Medias directories are files into the subdirectory <b>/medias</b> of documents directory, readable by everybody with no need to be logged and no need to have the file shared explicitely. It is used to store image files for the emailing or website module for example.
 ECMSectionWasRemoved=Katalogen <b>%s</b> har raderats.
 ECMSectionWasCreated=Katalogen <b>%s</b> har skapats.
 ECMSearchByKeywords=Sök nyckelord
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index ddbf7e223d1..59bdf290077 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -262,6 +262,7 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Fel, parameter <b> %s </b> måste
 ErrorLoginDateValidity=Fel, den här inloggningen ligger utanför giltighetsdatumintervallet
 ErrorValueLength=Fältets längd '<b> %s </b>' måste vara högre än '<b> %s </b>'
 ErrorReservedKeyword=Ordet '<b> %s </b>' är ett reserverat nyckelord
+ErrorFilenameReserved=The filename <b>%s</b> can't be used as it is a reserved and protected command.
 ErrorNotAvailableWithThisDistribution=Ej tillgängligt med denna distribution
 ErrorPublicInterfaceNotEnabled=Det offentliga gränssnittet var inte aktiverat
 ErrorLanguageRequiredIfPageIsTranslationOfAnother=Språket på den nya sidan måste definieras om det är inställt som en översättning av en annan sida
@@ -308,7 +309,7 @@ ErrorExistingPermission = Tillstånd <b> %s </b> för objekt <b> %s </b> finns r
 ErrorFieldExist=Värdet för <b> %s </b> finns redan
 ErrorEqualModule=Modul ogiltig i <b> %s </b>
 ErrorFieldValue=Värdet för <b> %s </b> är felaktigt
-ErrorCoherenceMenu= <b> %s </b> krävs när <b> % </b> är lika med VÄNSTER
+ErrorCoherenceMenu=<b>%s</b> is required when <b>%s</b> is 'left'
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) är högre än PHP-parameter post_max_size (%s). Detta är inte en konsekvent installation.
diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang
index 5d6f479606a..8ed248906bc 100644
--- a/htdocs/langs/sv_SE/interventions.lang
+++ b/htdocs/langs/sv_SE/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Döljer timmar och minuter från datumfältet för
 InterventionStatistics=Statistik över interventioner
 NbOfinterventions=Antal interventionskort
 NumberOfInterventionsByMonth=Antal interventionskort per månad (datum för bekräftande)
-AmountOfInteventionNotIncludedByDefault=Antalet interventioner ingår inte som standard i beräkning av vinst (i de flesta fall används tidkort för att räkna den använda tiden). Lägg till alternativ PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT till 1 i Start-Inställningar-Annat för att inkludera dem.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Intervention ID
 InterRef=Interventionsref.
 InterDateCreation=Intervention skapad datum
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index c00d6838921..c077986c0ad 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Kontakter efter position
 MailingModuleDescEmailsFromFile=E-post från fil
 MailingModuleDescEmailsFromUser=E-postmeddelanden inskrivna av användaren
 MailingModuleDescDolibarrUsers=Användare med e-post
-MailingModuleDescThirdPartiesByCategories=Tredje part (enligt kategorier)
+MailingModuleDescThirdPartiesByCategories=Tredjepart
 SendingFromWebInterfaceIsNotAllowed=Skicka från webbgränssnitt är inte tillåtet.
 EmailCollectorFilterDesc=Alla filter måste matcha för att ett e-postmeddelande ska samlas in
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Post skapad av e-postsamlare %s från e-post %s
 DefaultBlacklistMailingStatus=Standardvärde för fältet '%s' när en ny kontakt skapas
 DefaultStatusEmptyMandatory=Tom men obligatorisk
 WarningLimitSendByDay=VARNING: Inställningen eller kontraktet för din instans begränsar ditt antal e-postmeddelanden per dag till <b> %s </b> . Om du försöker skicka mer kan det leda till att din instans saktar ner eller avbryts. Kontakta din support om du behöver en högre kvot.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 02e05cb70bb..6cf5c8947e7 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -4,6 +4,8 @@ MemberCard=Medlemskort
 SubscriptionCard=Abonnemangskort
 Member=Medlem
 Members=Medlemmar
+NoRecordedMembers=No recorded members
+NoRecordedMembersByType=No recorded members
 ShowMember=Visa medlemskort
 UserNotLinkedToMember=Användare länkade inte till en medlem
 ThirdpartyNotLinkedToMember=Tredje part inte kopplad till en medlem
@@ -233,3 +235,4 @@ CreateDolibarrThirdPartyDesc=En tredje part är den juridiska person som kommer
 MemberFirstname=Medlemmens förnamn
 MemberLastname=Medlemmens efternamn
 MemberCodeDesc=Medlemskod, unik för alla medlemmar
+NoRecordedMembers=No recorded members
diff --git a/htdocs/langs/sv_SE/partnership.lang b/htdocs/langs/sv_SE/partnership.lang
index 701d4a88e71..ddc4c3e1bfe 100644
--- a/htdocs/langs/sv_SE/partnership.lang
+++ b/htdocs/langs/sv_SE/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=Partners: Kontrollera hänvisningslänk
 # Menu
 #
 NewPartnership=Nytt partner
-NewPartnershipbyWeb= Din partner har lagts till.
+NewPartnershipbyWeb=Your partnership request has been added successfully. We may contact you soon...
 ListOfPartnerships=Lista över partners
 
 #
diff --git a/htdocs/langs/sv_SE/ticket.lang b/htdocs/langs/sv_SE/ticket.lang
index d8b99e4c8df..7fffba2728f 100644
--- a/htdocs/langs/sv_SE/ticket.lang
+++ b/htdocs/langs/sv_SE/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Skapad av
 NewTicket=Ny ärende
 SubjectAnswerToTicket=Ärendesvar
 TicketTypeRequest=Förfrågan typ
-TicketCategory=Ärendekategorisering
+TicketCategory=Ticket group
 SeeTicket=Se ärende
 TicketMarkedAsRead=Ärende har markerats som läst
 TicketReadOn=Läs vidare
diff --git a/htdocs/langs/ta_IN/admin.lang b/htdocs/langs/ta_IN/admin.lang
index 1d9e7a9316b..88e3d472098 100644
--- a/htdocs/langs/ta_IN/admin.lang
+++ b/htdocs/langs/ta_IN/admin.lang
@@ -145,6 +145,7 @@ Box=விட்ஜெட்
 Boxes=விட்ஜெட்டுகள்
 MaxNbOfLinesForBoxes=அதிகபட்சம். விட்ஜெட்டுகளுக்கான வரிகளின் எண்ணிக்கை
 AllWidgetsWereEnabled=கிடைக்கக்கூடிய அனைத்து விட்ஜெட்களும் இயக்கப்பட்டுள்ளன
+WidgetAvailable=Widget available
 PositionByDefault=இயல்புநிலை ஆர்டர்
 Position=பதவி
 MenusDesc=மெனு மேலாளர்கள் இரண்டு மெனு பார்களின் (கிடைமட்ட மற்றும் செங்குத்து) உள்ளடக்கத்தை அமைக்கின்றனர்.
@@ -374,7 +375,7 @@ DoTestSendHTML=HTML அனுப்பும் சோதனை
 ErrorCantUseRazIfNoYearInMask=பிழை, வரிசை {yy} அல்லது {yyyy} முகமூடியில் இல்லையெனில், கவுண்டரை மீட்டமைக்க @ என்ற விருப்பத்தைப் பயன்படுத்த முடியாது.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=பிழை, {yy}{mm} அல்லது {yyyy}{mm} முகமூடியில் இல்லையெனில் @ விருப்பத்தைப் பயன்படுத்த முடியாது.
 UMask=Unix/Linux/BSD/Mac கோப்பு முறைமையில் புதிய கோப்புகளுக்கான UMask அளவுரு.
-UMaskExplanation=இந்த அளவுரு சேவையகத்தில் Dolibarr ஆல் உருவாக்கப்பட்ட கோப்புகளில் இயல்புநிலையாக அமைக்கப்பட்ட அனுமதிகளை வரையறுக்க உங்களை அனுமதிக்கிறது (உதாரணமாக பதிவேற்றத்தின் போது). <br> இது ஆக்டல் மதிப்பாக இருக்க வேண்டும் (உதாரணமாக, 0666 என்றால் அனைவருக்கும் படிக்கவும் எழுதவும்). <br> இந்த அளவுரு விண்டோஸ் சர்வரில் பயனற்றது.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=பங்களிப்பாளர்கள் மற்றும் அவர்களின் நிறுவனங்களின் பட்டியலுக்கு விக்கி பக்கத்தைப் பார்க்கவும்
 UseACacheDelay= வினாடிகளில் ஏற்றுமதி பதிலை தேக்ககப்படுத்துவதில் தாமதம் (0 அல்லது கேச் இல்லாதது காலி)
 DisableLinkToHelpCenter=உள்நுழைவு பக்கத்தில் " <b> உதவி அல்லது ஆதரவு </b> " என்ற இணைப்பை மறை
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind மாற்றும் திறன்கள்
 Module3200Name=மாற்ற முடியாத காப்பகங்கள்
 Module3200Desc=வணிக நிகழ்வுகளின் மாற்ற முடியாத பதிவை இயக்கவும். நிகழ்வுகள் நிகழ்நேரத்தில் காப்பகப்படுத்தப்படும். பதிவு என்பது ஏற்றுமதி செய்யக்கூடிய சங்கிலி நிகழ்வுகளின் படிக்க மட்டுமேயான அட்டவணை. இந்த தொகுதி சில நாடுகளில் கட்டாயமாக இருக்கலாம்.
 Module3300Name=Module Builder
-Module3200Desc=வணிக நிகழ்வுகளின் மாற்ற முடியாத பதிவை இயக்கவும். நிகழ்வுகள் நிகழ்நேரத்தில் காப்பகப்படுத்தப்படும். பதிவு என்பது ஏற்றுமதி செய்யக்கூடிய சங்கிலி நிகழ்வுகளின் படிக்க மட்டுமேயான அட்டவணை. இந்த தொகுதி சில நாடுகளில் கட்டாயமாக இருக்கலாம்.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=சமுக வலைத்தளங்கள்
 Module3400Desc=மூன்றாம் தரப்பினர் மற்றும் முகவரிகளில் சமூக வலைப்பின்னல்கள் புலங்களை இயக்கவும் (ஸ்கைப், ட்விட்டர், பேஸ்புக், ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/ta_IN/interventions.lang b/htdocs/langs/ta_IN/interventions.lang
index 6c773958e35..eb581abb5da 100644
--- a/htdocs/langs/ta_IN/interventions.lang
+++ b/htdocs/langs/ta_IN/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=தலையீடு பதிவுகளுக
 InterventionStatistics=தலையீடுகளின் புள்ளிவிவரங்கள்
 NbOfinterventions=தலையீட்டு அட்டைகளின் எண்ணிக்கை
 NumberOfInterventionsByMonth=மாதத்தின்படி தலையீட்டு அட்டைகளின் எண்ணிக்கை (சரிபார்க்கப்பட்ட தேதி)
-AmountOfInteventionNotIncludedByDefault=தலையீட்டின் அளவு லாபத்தில் இயல்புநிலையாக சேர்க்கப்படவில்லை (பெரும்பாலான சந்தர்ப்பங்களில், செலவழித்த நேரத்தை கணக்கிட நேரத்தாள்கள் பயன்படுத்தப்படுகின்றன). PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT என்ற விருப்பத்தை ஹோம்-அமைப்பில்-மற்றவற்றைச் சேர்க்க, 1 இல் சேர்க்கவும்.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=தலையீடு ஐடி
 InterRef=தலையீடு ref.
 InterDateCreation=தேதி உருவாக்கம் தலையீடு
@@ -66,3 +66,7 @@ RepeatableIntervention=தலையீட்டின் வார்ப்ப
 ToCreateAPredefinedIntervention=முன் வரையறுக்கப்பட்ட அல்லது தொடர்ச்சியான தலையீட்டை உருவாக்க, ஒரு பொதுவான தலையீட்டை உருவாக்கி அதை தலையீட்டு டெம்ப்ளேட்டாக மாற்றவும்
 ConfirmReopenIntervention=<b> %s </b> தலையீட்டைத் திரும்பப் பெற விரும்புகிறீர்களா?
 GenerateInter=தலையீட்டை உருவாக்குங்கள்
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/ta_IN/mails.lang b/htdocs/langs/ta_IN/mails.lang
index da4dbb2706e..c9072a91e43 100644
--- a/htdocs/langs/ta_IN/mails.lang
+++ b/htdocs/langs/ta_IN/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=நிலை மூலம் தொடர்
 MailingModuleDescEmailsFromFile=கோப்பிலிருந்து மின்னஞ்சல்கள்
 MailingModuleDescEmailsFromUser=பயனரின் மின்னஞ்சல்கள் உள்ளீடு
 MailingModuleDescDolibarrUsers=மின்னஞ்சல்களைக் கொண்ட பயனர்கள்
-MailingModuleDescThirdPartiesByCategories=மூன்றாம் தரப்பினர் (வகைகள் மூலம்)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=இணைய இடைமுகத்திலிருந்து அனுப்ப அனுமதி இல்லை.
 EmailCollectorFilterDesc=மின்னஞ்சலைச் சேகரிக்க அனைத்து வடிப்பான்களும் பொருந்த வேண்டும்
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=%s மின்னஞ்சலில் இரு
 DefaultBlacklistMailingStatus=புதிய தொடர்பை உருவாக்கும் போது '%s' புலத்திற்கான இயல்பு மதிப்பு
 DefaultStatusEmptyMandatory=காலி ஆனால் கட்டாயம்
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/ta_IN/ticket.lang b/htdocs/langs/ta_IN/ticket.lang
index 7a969be34a6..6afdbb0f2f4 100644
--- a/htdocs/langs/ta_IN/ticket.lang
+++ b/htdocs/langs/ta_IN/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=டிக்கெட்டுகளை மாற்றவும
 Permission56003=டிக்கெட்டுகளை நீக்கு
 Permission56004=டிக்கெட்டுகளை நிர்வகிக்கவும்
 Permission56005=அனைத்து மூன்றாம் தரப்பினரின் டிக்கெட்டுகளையும் பார்க்கவும் (வெளிப்புற பயனர்களுக்கு பயனுள்ளதாக இல்லை, எப்போதும் அவர்கள் சார்ந்திருக்கும் மூன்றாம் தரப்பினருக்கு மட்டுமே)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=டிக்கெட் - வகைகள்
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=வெளி பங்களிப்ப
 OriginEmail=நிருபர் மின்னஞ்சல்
 Notify_TICKET_SENTBYMAIL=மின்னஞ்சல் மூலம் டிக்கெட் செய்தியை அனுப்பவும்
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=படி
 Assigned=ஒதுக்கப்படும்
@@ -183,7 +186,7 @@ CreatedBy=உருவாக்கியது
 NewTicket=புதிய டிக்கெட்
 SubjectAnswerToTicket=டிக்கெட் பதில்
 TicketTypeRequest=கோரிக்கை வகை
-TicketCategory=டிக்கெட் வகைப்பாடு
+TicketCategory=Ticket group
 SeeTicket=சீட்டைப் பார்க்கவும்
 TicketMarkedAsRead=டிக்கெட் படித்ததாகக் குறிக்கப்பட்டுள்ளது
 TicketReadOn=படிக்கவும்
diff --git a/htdocs/langs/tg_TJ/admin.lang b/htdocs/langs/tg_TJ/admin.lang
index a278a7cb366..48ef4170a1c 100644
--- a/htdocs/langs/tg_TJ/admin.lang
+++ b/htdocs/langs/tg_TJ/admin.lang
@@ -145,6 +145,7 @@ Box=Виҷет
 Boxes=Виджетҳо
 MaxNbOfLinesForBoxes=Макс. шумораи сатрҳо барои виджетҳо
 AllWidgetsWereEnabled=Ҳама виджетҳои дастрас фаъоланд
+WidgetAvailable=Widget available
 PositionByDefault=Тартиби пешфарз
 Position=Мавқеъ
 MenusDesc=Менеҷерони меню мундариҷаи ду сатри менюро (уфуқӣ ва амудӣ) муқаррар мекунанд.
@@ -374,7 +375,7 @@ DoTestSendHTML=Санҷиши фиристодани HTML
 ErrorCantUseRazIfNoYearInMask=Хато, ҳар сол наметавонад опсияи @ -ро барои аз нав танзимкунии ҳисобкунак истифода баред, агар пайдарпаии {yy} ё {yyyy} дар ниқоб набошад.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Хато, агар имкон надошта бошад, опсияи @ -ро истифода баред, агар пайдарпаии {yy} {mm} ё {yyyy} {mm} дар ниқоб набошад.
 UMask=Параметри UMask барои файлҳои нав дар системаи файлии Unix/Linux/BSD/Mac.
-UMaskExplanation=Ин параметр ба шумо имкон медиҳад, ки иҷозатҳоро, ки бо нобаёнӣ ба файлҳои аз ҷониби Dolibarr дар сервер сохташуда муқаррар карда шудаанд, муайян кунед (масалан ҳангоми боргузорӣ). <br> Он бояд арзиши ҳаштум бошад (масалан, 0666 маънои барои ҳама хондан ва навиштанро дорад). <br> Ин параметр дар сервери Windows бефоида аст.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Ба рӯйхати саҳмгузорон ва ташкили онҳо ба саҳифаи Wiki нигаред
 UseACacheDelay= Таъхир барои кэш кардани посухи содиротӣ дар сонияҳо (0 ё холӣ барои бе кеш)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=Имкониятҳои табдили GeoIP Maxmind
 Module3200Name=Архивҳои тағирнопазир
 Module3200Desc=Журнали тағирнопазири рӯйдодҳои тиҷоратиро фаъол созед. Чорабиниҳо дар вақти воқеӣ бойгонӣ карда мешаванд. Журнал як ҷадвали рӯйдодҳои занҷирбанд аст, ки онҳоро содир кардан мумкин аст. Ин модул метавонад барои баъзе кишварҳо ҳатмӣ бошад.
 Module3300Name=Module Builder
-Module3200Desc=Журнали тағирнопазири рӯйдодҳои тиҷоратиро фаъол созед. Чорабиниҳо дар вақти воқеӣ бойгонӣ карда мешаванд. Журнал як ҷадвали рӯйдодҳои занҷирбанд аст, ки онҳоро содир кардан мумкин аст. Ин модул метавонад барои баъзе кишварҳо ҳатмӣ бошад.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Шабакаҳои иҷтимоӣ
 Module3400Desc=Майдонҳои шабакаҳои иҷтимоиро ба шахсони сеюм ва суроғаҳо (скайп, twitter, facebook, ...) фаъол созед.
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/tg_TJ/interventions.lang b/htdocs/langs/tg_TJ/interventions.lang
index 0a62b7ca0e4..49ce4132c68 100644
--- a/htdocs/langs/tg_TJ/interventions.lang
+++ b/htdocs/langs/tg_TJ/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Соатҳо ва дақиқаҳоро дар ма
 InterventionStatistics=Омори мудохила
 NbOfinterventions=Шумораи кортҳои мудохила
 NumberOfInterventionsByMonth=Шумораи кортҳои мудохила аз рӯи моҳ (санаи тасдиқ)
-AmountOfInteventionNotIncludedByDefault=Маблағи мудохила бо нобаёнӣ ба фоида дохил карда намешавад (дар аксари ҳолатҳо, ҷадвалҳои вақт барои ҳисоб кардани вақти сарфшуда истифода мешаванд). Илова кардани PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT ба 1 ба home-setup-other барои дохил кардани онҳо.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=ID мудохила
 InterRef=Дахолат дахолат
 InterDateCreation=Дахолати эҷоди сана
@@ -66,3 +66,7 @@ RepeatableIntervention=Шаблон мудохила
 ToCreateAPredefinedIntervention=Барои эҷоди мудохилаи пешакӣ ё такроршаванда, як дахолати умумӣ эҷод кунед ва онро ба қолаби мудохила табдил диҳед
 ConfirmReopenIntervention=Шумо мутмаин ҳастед, ки дахолати <b> %s </b> боз кардан мехоҳед?
 GenerateInter=Тавлиди дахолат
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/tg_TJ/mails.lang b/htdocs/langs/tg_TJ/mails.lang
index 06b537ffc63..337e3f252ca 100644
--- a/htdocs/langs/tg_TJ/mails.lang
+++ b/htdocs/langs/tg_TJ/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Тамос бо мавқеъ
 MailingModuleDescEmailsFromFile=Почтаи электронӣ аз файл
 MailingModuleDescEmailsFromUser=Вуруди почтаи электронӣ аз ҷониби корбар
 MailingModuleDescDolibarrUsers=Истифодабарандагон бо почтаи электронӣ
-MailingModuleDescThirdPartiesByCategories=Шахсони сеюм (аз рӯи категорияҳо)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=Фиристодан аз интерфейси веб манъ аст.
 EmailCollectorFilterDesc=Ҳама филтрҳо бояд мувофиқат кунанд, то почтаи электронӣ ҷамъоварӣ карда шавад
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Сабт аз ҷониби коллектори п
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Холӣ, аммо ҳатмӣ
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/tg_TJ/ticket.lang b/htdocs/langs/tg_TJ/ticket.lang
index 370265f8852..d71894deb80 100644
--- a/htdocs/langs/tg_TJ/ticket.lang
+++ b/htdocs/langs/tg_TJ/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=Тағир додани чиптаҳо
 Permission56003=Билетҳоро нест кунед
 Permission56004=Идоракунии чиптаҳо
 Permission56005=Чиптаҳои ҳамаи шахсони сеюмро бинед (барои корбарони беруна муассир нест, ҳамеша бо тарафи сеюме, ки ба онҳо вобаста аст, маҳдуд аст)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=Чипта - намудҳо
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Иштирокчии беруна
 OriginEmail=Хабарнигори почтаи электронӣ
 Notify_TICKET_SENTBYMAIL=Паёми чиптаро тавассути почтаи электронӣ фиристед
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=Хондан
 Assigned=Таъин карда шудааст
@@ -183,7 +186,7 @@ CreatedBy=Аз ҷониби муаллиф
 NewTicket=Билети нав
 SubjectAnswerToTicket=Ҷавоби билет
 TicketTypeRequest=Навъи дархост
-TicketCategory=Гурӯҳбандии чиптаҳо
+TicketCategory=Ticket group
 SeeTicket=Билетро бинед
 TicketMarkedAsRead=Билет ҳамчун хондашуда қайд карда шудааст
 TicketReadOn=Хонда шуд
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index ebb4ae622dc..372752df2bf 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -145,6 +145,7 @@ Box=วิดเจ็ต
 Boxes=วิดเจ็ต
 MaxNbOfLinesForBoxes=จำนวนบรรทัดสูงสุดสำหรับวิดเจ็ต
 AllWidgetsWereEnabled=วิดเจ็ตทั้งหมดที่มีเปิดใช้งานแล้ว
+WidgetAvailable=Widget available
 PositionByDefault=Default order
 Position=ตำแหน่ง
 MenusDesc=ตัวจัดการเมนูกำหนดเนื้อหาของแถบเมนูสองแถบ (แนวนอนและแนวตั้ง)
@@ -374,7 +375,7 @@ DoTestSendHTML=ทดสอบการส่ง HTM​​L
 ErrorCantUseRazIfNoYearInMask=เกิดข้อผิดพลาด ไม่สามารถใช้ตัวเลือก @ เพื่อรีเซ็ตตัวนับในแต่ละปีได้ หากลำดับ {yy} หรือ {yyyy} ไม่อยู่ในรูปแบบ
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=เกิดข้อผิดพลาด ไม่สามารถใช้ตัวเลือก @ หากลำดับ {yy}{mm} หรือ {yyyy}{mm} ไม่อยู่ในรูปแบบ
 UMask=umask พารามิเตอร์สำหรับไฟล์ใหม่ใน Unix / Linux / BSD / ระบบไฟล์ Mac
-UMaskExplanation=พารามิเตอร์นี้จะช่วยให้คุณสามารถกำหนดสิทธิ์ในการตั้งค่าได้โดยเริ่มต้นในไฟล์ที่สร้างขึ้นโดย Dolibarr บนเซิร์ฟเวอร์ (ระหว่างการอัปโหลดตัวอย่าง) <br> มันจะต้องเป็นค่าฐานแปด (ตัวอย่างเช่น 0666 หมายถึงการอ่านและเขียนสำหรับทุกคน) <br> พารามิเตอร์นี้จะไม่ได้ผลในเซิร์ฟเวอร์ Windows
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= สำหรับการตอบสนองที่ล่าช้าในการส่งออกในไม่กี่วินาทีแคช (0 หรือที่ว่างเปล่าสำหรับแคชไม่ได้)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind ความสามารถในการแป
 Module3200Name=Unalterable Archives
 Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
 Module3300Name=Module Builder
-Module3200Desc=Enable an unalterable log of business events. Events are archived in real-time. The log is a read-only table of chained events that can be exported. This module may be mandatory for some countries.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=สังคมออนไลน์
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=ระบบบริหารจัดการทรัพยากรบุคคล
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index 4fdde098262..e19b97abf34 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Contacts by position
 MailingModuleDescEmailsFromFile=Emails from file
 MailingModuleDescEmailsFromUser=Emails input by user
 MailingModuleDescDolibarrUsers=Users with Emails
-MailingModuleDescThirdPartiesByCategories=Third parties (by categories)
+MailingModuleDescThirdPartiesByCategories=บุคคลที่สาม
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 3ee1784bb01..e213f511dee 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -145,6 +145,7 @@ Box=Ekran etiketi
 Boxes=Ekran Etiketleri
 MaxNbOfLinesForBoxes=Ekran etiketleri için maksimum satır sayısı
 AllWidgetsWereEnabled=Mevcut olan tüm ekran etiketleri etkinleştirildi
+WidgetAvailable=Widget available
 PositionByDefault=Varsayılan sıra
 Position=Konum
 MenusDesc=Menü yöneticisi iki menü çubuğunun içeriğini ayarlar (yatay ve dikey).
@@ -374,7 +375,7 @@ DoTestSendHTML=HTML Test gönderimi
 ErrorCantUseRazIfNoYearInMask=Hata, {yy} ya da {yyyy} dizisi maske olarak tanımlanmamışsa @ seçeneği kullanılamaz.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Hata, eğer {yy}{mm} ya da {yyyy}{mm} dizisi maske olarak tanımlanmamışsa @ seçeneği kullanılamaz.
 UMask=Unix/Linux/BSD dosya sisteminde yeni dosyalar için Umask parametresi.
-UMaskExplanation=Bu parametre Dolibarr tarafından sunucuda oluşturulan dosyaların izinlerini varsayılan olarak tanımlamanıza (örneğin yükleme sırasında) izin verir.<br>Bu sekizli değer olmalıdır (örneğin, 0666 herkes için okuma ve yazma anlamına gelir).<br>Bu parametre Windows sunucusunda kullanılmaz.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Katkıda bulunanlar ve kuruluşlarının bir listesi için Wiki sayfasına göz atın
 UseACacheDelay= Saniye olarak önbellek aktarması tepki gecikmesi (hiç önbellek yoksa 0 ya da boş)
 DisableLinkToHelpCenter=Oturum açma sayfasında "<b>Yardım ya da destek gerekli</b>" bağlantısını gizle
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind dönüştürme becerileri
 Module3200Name=Değiştirilemez Arşivler
 Module3200Desc=Değiştirilemeyen bir iş etkinlikleri günlüğü etkinleştirin. Etkinlikler gerçek zamanlı olarak arşivlenir. Günlük, dışa aktarılabilen zincirlenmiş etkinliklerin salt okunur bir tablosudur. Bu modül bazı ülkeler için zorunlu olabilir.
 Module3300Name=Module Builder
-Module3200Desc=Değiştirilemeyen bir iş etkinlikleri günlüğü etkinleştirin. Etkinlikler gerçek zamanlı olarak arşivlenir. Günlük, dışa aktarılabilen zincirlenmiş etkinliklerin salt okunur bir tablosudur. Bu modül bazı ülkeler için zorunlu olabilir.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Sosyal Ağlar
 Module3400Desc=Sosyal Ağ alanlarını Carilere ve adreslere (skype, twitter, facebook, ...) etkinleştirin.
 Module4000Name=IK
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Ayarlar
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index cd3ffbce9b8..80ccbdbf58c 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Pozisyona göre kişiler
 MailingModuleDescEmailsFromFile=Dosyadan e-postalar
 MailingModuleDescEmailsFromUser=Kullanıcı tarafından girilen e-postalar
 MailingModuleDescDolibarrUsers=E-postaları olan kullanıcılar
-MailingModuleDescThirdPartiesByCategories=Üçüncü taraflar (kategorilere göre)
+MailingModuleDescThirdPartiesByCategories=Cariler
 SendingFromWebInterfaceIsNotAllowed=Sending from web interface is not allowed.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index a314769195a..6b054ec84f0 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -145,6 +145,7 @@ Box=Віджет
 Boxes=Віджети
 MaxNbOfLinesForBoxes=Макс. кількість рядків для віджетів
 AllWidgetsWereEnabled=Усі доступні віджети ввімкнено
+WidgetAvailable=Widget available
 PositionByDefault=Порядок за замовчуванням
 Position=Позиція
 MenusDesc=Менеджери меню встановлюють вміст двох рядків меню (горизонтального та вертикального).
@@ -374,7 +375,7 @@ DoTestSendHTML=Тест надсилання HTML
 ErrorCantUseRazIfNoYearInMask=Помилка, не можна використовувати параметр @ для скидання лічильника щороку, якщо послідовність {yy} або {yyyy} відсутня в масці.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Помилка, не можна використовувати варіант @, якщо послідовність {yy} {mm} або {yyyy} {mm} не в масці.
 UMask=Параметр UMask для нових файлів у файловій системі Unix/Linux/BSD/Mac.
-UMaskExplanation=Цей параметр дозволяє визначити дозволи, встановлені за замовчуванням для файлів, створених Dolibarr на сервері (наприклад, під час завантаження). <br> Це має бути вісімкове значення (наприклад, 0666 означає читання та запис для всіх). <br> Цей параметр не потрібний на сервері Windows.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Погляньте на сторінку Wiki, щоб ознайомитись зі списком учасників та їх організацією
 UseACacheDelay= Затримка для кешування відповіді експорту в секундах (0 або порожньо щоб не кешувати)
 DisableLinkToHelpCenter=Приховати посилання " <b> Потрібна допомога або підтримка </b> " на сторінці входу
@@ -663,7 +664,7 @@ Module2900Desc=Можливості перетворення GeoIP Maxmind
 Module3200Name=Незмінні архіви
 Module3200Desc=Увімкнути незмінний журнал ділових подій. Події архівуються в режимі реального часу. Журнал – це доступна лише для читання таблиця зв’язаних подій, які можна експортувати. Цей модуль може бути обов’язковим для деяких країн.
 Module3300Name=Module Builder
-Module3200Desc=Увімкнути незмінний журнал ділових подій. Події архівуються в режимі реального часу. Журнал – це доступна лише для читання таблиця зв’язаних подій, які можна експортувати. Цей модуль може бути обов’язковим для деяких країн.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Соціальні мережі
 Module3400Desc=Увімкнути поля соціальних мереж для третіх сторін і адрес (skype, twitter, facebook, ...).
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Використовуйте режим малої пам
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Налаштування
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang
index 575d5f9f108..87f811c5751 100644
--- a/htdocs/langs/uk_UA/interventions.lang
+++ b/htdocs/langs/uk_UA/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Приховує години та хвилини
 InterventionStatistics=Статистика втручань
 NbOfinterventions=№ інтервенційних карток
 NumberOfInterventionsByMonth=Кількість карток інтервенцій за місяцями (дата підтвердження)
-AmountOfInteventionNotIncludedByDefault=Сума інтервенції за замовчуванням не включається до прибутку (у більшості випадків для підрахунку витраченого часу використовуються табелі обліку робочого часу). Додайте опцію PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT до 1 у home-setup-other, щоб включити їх.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Ідентифікатор втручання
 InterRef=Втручання ref.
 InterDateCreation=Втручання щодо створення дати
@@ -68,3 +68,5 @@ ConfirmReopenIntervention=Ви впевнені, що хочете знову в
 GenerateInter=Створення втручання
 FichinterNoContractLinked=Втручання %s створено без пов’язаного контракту.
 ErrorFicheinterCompanyDoesNotExist=Компанія не існує. Втручання не створено.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index d17a3dcb4a3..d61b9e833bb 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Контакти за посадою
 MailingModuleDescEmailsFromFile=Електронні листи з файлу
 MailingModuleDescEmailsFromUser=Електронні листи, введені користувачем
 MailingModuleDescDolibarrUsers=Користувачі з електронною поштою
-MailingModuleDescThirdPartiesByCategories=Треті сторони (за категоріями)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=Відправлення з веб-інтерфейсу заборонено.
 EmailCollectorFilterDesc=Усі фільтри мають збігатися, щоб отримати електронний лист
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Запис, створений збирачем е
 DefaultBlacklistMailingStatus=Значення за замовчуванням для поля '%s' під час створення нового контакту
 DefaultStatusEmptyMandatory=Порожній, але обов’язковий
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/uk_UA/ticket.lang b/htdocs/langs/uk_UA/ticket.lang
index d0fcbb730a1..b982337fb6c 100644
--- a/htdocs/langs/uk_UA/ticket.lang
+++ b/htdocs/langs/uk_UA/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=Створено
 NewTicket=Новий квиток
 SubjectAnswerToTicket=Відповідь на квиток
 TicketTypeRequest=Тип запиту
-TicketCategory=Категоризація квитків
+TicketCategory=Ticket group
 SeeTicket=Дивіться квиток
 TicketMarkedAsRead=Квиток позначено як прочитаний
 TicketReadOn=Читайте далі
diff --git a/htdocs/langs/ur_PK/admin.lang b/htdocs/langs/ur_PK/admin.lang
index 781f79ff416..424a7fc2563 100644
--- a/htdocs/langs/ur_PK/admin.lang
+++ b/htdocs/langs/ur_PK/admin.lang
@@ -145,6 +145,7 @@ Box=ویجیٹ
 Boxes=وجیٹس
 MaxNbOfLinesForBoxes=زیادہ سے زیادہ ویجٹ کے لیے لائنوں کی تعداد
 AllWidgetsWereEnabled=تمام دستیاب وجیٹس فعال ہیں۔
+WidgetAvailable=Widget available
 PositionByDefault=پہلے سے طے شدہ آرڈر
 Position=پوزیشن
 MenusDesc=مینو مینیجر دو مینو بارز (افقی اور عمودی) کا مواد سیٹ کرتے ہیں۔
@@ -374,7 +375,7 @@ DoTestSendHTML=HTML بھیجنے کی جانچ کریں۔
 ErrorCantUseRazIfNoYearInMask=خرابی، اگر ترتیب {yy} یا {yyyy} ماسک میں نہیں ہے تو ہر سال کاؤنٹر کو دوبارہ ترتیب دینے کے لیے @ آپشن کا استعمال نہیں کر سکتے۔
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خرابی، اگر ترتیب {yy}{mm} یا {yyyy}{mm} ماسک میں نہیں ہے تو @ آپشن استعمال نہیں کر سکتے۔
 UMask=Unix/Linux/BSD/Mac فائل سسٹم پر نئی فائلوں کے لیے UMask پیرامیٹر۔
-UMaskExplanation=یہ پیرامیٹر آپ کو سرور پر Dolibarr کی طرف سے بنائی گئی فائلوں پر بطور ڈیفالٹ سیٹ اجازتوں کی وضاحت کرنے کی اجازت دیتا ہے (مثال کے طور پر اپ لوڈ کے دوران)۔ <br> یہ آکٹل قدر ہونی چاہیے (مثال کے طور پر، 0666 کا مطلب ہے سب کے لیے پڑھنا اور لکھنا)۔ <br> یہ پیرامیٹر ونڈوز سرور پر بیکار ہے۔
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=شراکت داروں اور ان کی تنظیم کی فہرست کے لیے وکی صفحہ پر ایک نظر ڈالیں۔
 UseACacheDelay= ایکسپورٹ رسپانس کو سیکنڈ میں کیش کرنے میں تاخیر (0 یا بغیر کیشے کے خالی)
 DisableLinkToHelpCenter=لاگ ان پیج پر لنک کو چھپائیں "<b> مدد کی ضرورت ہے یا </b>"
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP میکس مائنڈ تبادلوں کی صلاحیتیں۔
 Module3200Name=ناقابل تبدیلی آرکائیوز
 Module3200Desc=کاروباری واقعات کا ایک غیر تبدیل شدہ لاگ کو فعال کریں۔ واقعات کو حقیقی وقت میں محفوظ کیا جاتا ہے۔ لاگ ان زنجیروں سے جڑے واقعات کی صرف پڑھنے کے لیے جدول ہے جسے برآمد کیا جا سکتا ہے۔ یہ ماڈیول کچھ ممالک کے لیے لازمی ہو سکتا ہے۔
 Module3300Name=Module Builder
-Module3200Desc=کاروباری واقعات کا ایک غیر تبدیل شدہ لاگ کو فعال کریں۔ واقعات کو حقیقی وقت میں محفوظ کیا جاتا ہے۔ لاگ ان زنجیروں سے جڑے واقعات کی صرف پڑھنے کے لیے جدول ہے جسے برآمد کیا جا سکتا ہے۔ یہ ماڈیول کچھ ممالک کے لیے لازمی ہو سکتا ہے۔
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=سوشل نیٹ ورک
 Module3400Desc=سوشل نیٹ ورکس فیلڈز کو تھرڈ پارٹیز اور ایڈریسز (سکائپ، ٹویٹر، فیس بک، ...) میں فعال کریں۔
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/ur_PK/interventions.lang b/htdocs/langs/ur_PK/interventions.lang
index f6302271d88..773e49f06d2 100644
--- a/htdocs/langs/ur_PK/interventions.lang
+++ b/htdocs/langs/ur_PK/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=مداخلت کے ریکارڈ کے لیے تار
 InterventionStatistics=مداخلت کے اعدادوشمار
 NbOfinterventions=مداخلتی کارڈز کی تعداد
 NumberOfInterventionsByMonth=ماہ کے لحاظ سے مداخلتی کارڈز کی تعداد (توثیق کی تاریخ)
-AmountOfInteventionNotIncludedByDefault=مداخلت کی رقم پہلے سے طے شدہ طور پر منافع میں شامل نہیں ہوتی ہے (زیادہ تر معاملات میں، ٹائم شیٹس کا استعمال وقت کی گنتی کے لیے کیا جاتا ہے)۔ ہوم سیٹ اپ میں 1 میں PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT اختیار شامل کریں-دوسرے کو شامل کرنے کے لیے۔
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=مداخلت کی شناخت
 InterRef=مداخلت کا حوالہ
 InterDateCreation=تاریخ تخلیق مداخلت
@@ -66,3 +66,7 @@ RepeatableIntervention=مداخلت کا سانچہ
 ToCreateAPredefinedIntervention=پہلے سے طے شدہ یا بار بار چلنے والی مداخلت بنانے کے لیے، ایک مشترکہ مداخلت بنائیں اور اسے مداخلت کے سانچے میں تبدیل کریں۔
 ConfirmReopenIntervention=کیا آپ واقعی مداخلت <b> %s </b> کو کھولنا چاہتے ہیں؟
 GenerateInter=مداخلت پیدا کریں۔
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/ur_PK/mails.lang b/htdocs/langs/ur_PK/mails.lang
index acdda587caa..4e41c06b20b 100644
--- a/htdocs/langs/ur_PK/mails.lang
+++ b/htdocs/langs/ur_PK/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=پوزیشن کے لحاظ سے رابطے
 MailingModuleDescEmailsFromFile=فائل سے ای میلز
 MailingModuleDescEmailsFromUser=صارف کے ذریعے ای میلز کا ان پٹ
 MailingModuleDescDolibarrUsers=ای میلز والے صارفین
-MailingModuleDescThirdPartiesByCategories=تیسرے فریق (زمرے کے لحاظ سے)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=ویب انٹرفیس سے بھیجنے کی اجازت نہیں ہے۔
 EmailCollectorFilterDesc=ای میل جمع کرنے کے لیے تمام فلٹرز کا مماثل ہونا چاہیے۔
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=ای میل کلکٹر %s ای میل %s سے ری
 DefaultBlacklistMailingStatus=نیا رابطہ بناتے وقت فیلڈ '%s' کے لیے ڈیفالٹ قدر
 DefaultStatusEmptyMandatory=خالی لیکن لازمی
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/ur_PK/ticket.lang b/htdocs/langs/ur_PK/ticket.lang
index dda8881b5ff..3fdac90aa22 100644
--- a/htdocs/langs/ur_PK/ticket.lang
+++ b/htdocs/langs/ur_PK/ticket.lang
@@ -26,6 +26,7 @@ Permission56002=ٹکٹوں میں ترمیم کریں۔
 Permission56003=ٹکٹیں حذف کریں۔
 Permission56004=ٹکٹوں کا انتظام کریں۔
 Permission56005=تمام فریق ثالث کے ٹکٹ دیکھیں (بیرونی صارفین کے لیے موثر نہیں، ہمیشہ ان تیسرے فریق تک محدود رہیں جس پر وہ انحصار کرتے ہیں)
+Permission56006=Export tickets
 
 Tickets=Tickets
 TicketDictType=ٹکٹ - اقسام
@@ -61,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=بیرونی تعاون کرنے وال
 OriginEmail=رپورٹر ای میل
 Notify_TICKET_SENTBYMAIL=ٹکٹ کا پیغام بذریعہ ای میل بھیجیں۔
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=پڑھیں
 Assigned=تفویض کردہ
@@ -183,7 +186,7 @@ CreatedBy=بنائی گئی
 NewTicket=نیا ٹکٹ
 SubjectAnswerToTicket=ٹکٹ کا جواب
 TicketTypeRequest=درخواست کی قسم
-TicketCategory=ٹکٹ کی درجہ بندی
+TicketCategory=Ticket group
 SeeTicket=ٹکٹ دیکھیں
 TicketMarkedAsRead=ٹکٹ کو پڑھا ہوا نشان زد کر دیا گیا ہے۔
 TicketReadOn=پڑھیں
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 27f5d38652d..f5a1b7a55b0 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -145,6 +145,7 @@ Box=Vidjet
 Boxes=Vidjetlar
 MaxNbOfLinesForBoxes=Maks. vidjetlar uchun qatorlar soni
 AllWidgetsWereEnabled=Barcha mavjud vidjetlar yoqilgan
+WidgetAvailable=Widget available
 PositionByDefault=Standart buyurtma
 Position=Lavozim
 MenusDesc=Menyu menejerlari ikkita menyu satrining tarkibini belgilaydilar (gorizontal va vertikal).
@@ -374,7 +375,7 @@ DoTestSendHTML=HTML yuborish uchun sinov
 ErrorCantUseRazIfNoYearInMask=Xatolik, har yili {yy} yoki {yyyy} ketma-ketligi niqobda bo'lmasa, hisoblagichni tiklash uchun @ parametridan foydalanib bo'lmaydi.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Xato, agar {yy} {mm} yoki {yyyy} {mm} ketma-ketligi niqobda bo'lmasa @ parametridan foydalanib bo'lmaydi.
 UMask=Unix / Linux / BSD / Mac fayl tizimidagi yangi fayllar uchun UMask parametri.
-UMaskExplanation=Ushbu parametr serverda Dolibarr tomonidan yaratilgan fayllarda sukut bo'yicha o'rnatilgan ruxsatlarni aniqlashga imkon beradi (masalan, yuklash paytida). <br> Bu sakkizli qiymat bo'lishi kerak (masalan, 0666 hamma uchun o'qish va yozishni anglatadi). <br> Windows serverida ushbu parametr foydasiz.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Hissadorlar va ularning tashkilotlari ro'yxatini olish uchun Wiki sahifasini ko'rib chiqing
 UseACacheDelay= Bir necha soniya ichida eksportga javobni keshlash uchun kechikish (0 yoki bo'sh joy uchun bo'sh)
 DisableLinkToHelpCenter=Kirish sahifasida "<b> Yordam kerak yoki </b>" havolasini yashiring.
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind konversiyalari imkoniyatlari
 Module3200Name=O'zgarmas arxivlar
 Module3200Desc=O'zgarmas ishbilarmonlik voqealari jurnalini yoqing. Voqealar real vaqtda arxivlanadi. Jurnal eksport qilinishi mumkin bo'lgan zanjirli voqealar uchun faqat o'qish uchun mo'ljallangan jadvaldir. Ushbu modul ba'zi mamlakatlar uchun majburiy bo'lishi mumkin.
 Module3300Name=Module Builder
-Module3200Desc=O'zgarmas ishbilarmonlik voqealari jurnalini yoqing. Voqealar real vaqtda arxivlanadi. Jurnal eksport qilinishi mumkin bo'lgan zanjirli voqealar uchun faqat o'qish uchun mo'ljallangan jadvaldir. Ushbu modul ba'zi mamlakatlar uchun majburiy bo'lishi mumkin.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Ijtimoiy tarmoqlar
 Module3400Desc=Ijtimoiy tarmoqlarni uchinchi shaxslarga va manzillarga (skype, twitter, facebook, ...) qo'shish.
 Module4000Name=HRM
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Kam xotira rejimidan foydalaning
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Settings
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang
index de093348384..85fedccac39 100644
--- a/htdocs/langs/uz_UZ/interventions.lang
+++ b/htdocs/langs/uz_UZ/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Interventsiya yozuvlari uchun sana maydonidan tash
 InterventionStatistics=Ta'sirlarning statistikasi
 NbOfinterventions=Interventsiya kartalari soni
 NumberOfInterventionsByMonth=Oy bo'yicha aralashuv kartalarining soni (tasdiqlangan sana)
-AmountOfInteventionNotIncludedByDefault=Interventsiya miqdori sukut bo'yicha foydaga qo'shilmaydi (ko'p hollarda ish vaqt jadvallari sarflangan vaqtni hisoblash uchun ishlatiladi). 1-ga PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT variantini qo'shib qo'yish uchun ularni uyga o'rnatish-ga qo'shing.
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Interferentsiya id
 InterRef=Aralashish ref.
 InterDateCreation=Sana yaratishga aralashish
@@ -68,3 +68,5 @@ ConfirmReopenIntervention=Siz aralashuvni qayta ochishni xohlaysizmi <b> %s </b>
 GenerateInter=Interventsiya yarating
 FichinterNoContractLinked=Intervention %s bog'langan shartnomasiz yaratilgan.
 ErrorFicheinterCompanyDoesNotExist=Kompaniya mavjud emas. Intervensiya yaratilmagan.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index d3e3d75787e..331b9b855ea 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Kontaktlar joylashuvi bo'yicha
 MailingModuleDescEmailsFromFile=Fayldan elektron pochta xabarlari
 MailingModuleDescEmailsFromUser=Foydalanuvchi tomonidan kiritilgan elektron pochta xabarlari
 MailingModuleDescDolibarrUsers=Elektron pochta xabarlari bo'lgan foydalanuvchilar
-MailingModuleDescThirdPartiesByCategories=Uchinchi shaxslar (toifalar bo'yicha)
+MailingModuleDescThirdPartiesByCategories=Third parties
 SendingFromWebInterfaceIsNotAllowed=Veb-interfeysdan yuborishga yo'l qo'yilmaydi.
 EmailCollectorFilterDesc=Elektron pochta to'planishi uchun barcha filtrlar mos kelishi kerak
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=%s elektron pochtasidan elektron pochta yig'uvchis
 DefaultBlacklistMailingStatus=Yangi kontakt yaratishda "%s" maydonining standart qiymati
 DefaultStatusEmptyMandatory=Bo'sh, ammo majburiy
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/uz_UZ/ticket.lang b/htdocs/langs/uz_UZ/ticket.lang
index f3539ed954a..29bd3b5a0b5 100644
--- a/htdocs/langs/uz_UZ/ticket.lang
+++ b/htdocs/langs/uz_UZ/ticket.lang
@@ -26,7 +26,9 @@ Permission56002=Chiptalarni o'zgartirish
 Permission56003=Chiptalarni o'chirish
 Permission56004=Chiptalarni boshqarish
 Permission56005=Uchinchi tomonlarning chiptalarini ko'ring (tashqi foydalanuvchilar uchun samarali emas, har doim ular bog'liq bo'lgan uchinchi tomon bilan cheklaning)
+Permission56006=Export tickets
 
+Tickets=Tickets
 TicketDictType=Chipta - turlari
 TicketDictCategory=Chipta - guruhlar
 TicketDictSeverity=Chipta - jiddiyliklar
@@ -60,6 +62,8 @@ TypeContact_ticket_external_CONTRIBUTOR=Tashqi yordamchi
 OriginEmail=Muxbirning elektron pochtasi
 Notify_TICKET_SENTBYMAIL=Elektron pochta orqali chiptani yuboring
 
+ExportDataset_ticket_1=Tickets
+
 # Status
 Read=O'qing
 Assigned=Tayinlangan
@@ -149,6 +153,8 @@ TicketsAutoNotifyCloseHelp=Chiptani yopish paytida sizga uchinchi tomon kontaktl
 TicketWrongContact=Taqdim etilgan kontakt joriy chipta kontaktlarining bir qismi emas. Email yuborilmadi.
 TicketChooseProductCategory=Chiptalarni qo'llab-quvvatlash uchun mahsulot toifasi
 TicketChooseProductCategoryHelp=Chiptalarni qo'llab-quvvatlash mahsulot toifasini tanlang. Bu shartnomani chiptaga avtomatik bog'lash uchun ishlatiladi.
+TicketUseCaptchaCode=Use graphical code (CAPTCHA) when creating a ticket
+TicketUseCaptchaCodeHelp=Adds CAPTCHA verification when creating a new ticket.
 
 #
 # Index & list page
@@ -180,7 +186,7 @@ CreatedBy=Tomonidan yaratilgan
 NewTicket=Yangi chipta
 SubjectAnswerToTicket=Chipta javobi
 TicketTypeRequest=So'rov turi
-TicketCategory=Chiptalarni turkumlash
+TicketCategory=Ticket group
 SeeTicket=Chiptani ko'ring
 TicketMarkedAsRead=Chipta o'qilgan deb belgilandi
 TicketReadOn=O'qing
@@ -192,8 +198,7 @@ TicketAssigned=Endi chipta tayinlandi
 TicketChangeType=Turini o'zgartirish
 TicketChangeCategory=Analitik kodni o'zgartiring
 TicketChangeSeverity=Zo'ravonlikni o'zgartiring
-TicketAddMessage=Xabar qo'shing
-AddMessage=Xabar qo'shing
+TicketAddMessage=Add private message
 MessageSuccessfullyAdded=Chipta qo'shildi
 TicketMessageSuccessfullyAdded=Xabar muvaffaqiyatli qo'shildi
 TicketMessagesList=Xatlar ro'yxati
@@ -204,8 +209,8 @@ TicketSeverity=Jiddiylik
 ShowTicket=Chiptani ko'ring
 RelatedTickets=Tegishli chiptalar
 TicketAddIntervention=Aralashuvni yarating
-CloseTicket=Yoping | Chiptani hal qiling
-AbandonTicket=Chiptadan voz kechish
+CloseTicket=Close|Solve
+AbandonTicket=Abandon
 CloseATicket=Yoping | Chiptani hal qiling
 ConfirmCloseAticket=Chipta yopilishini tasdiqlang
 ConfirmAbandonTicket=Chiptaning "tashlab ketilgan" maqomiga yopilishini tasdiqlaysizmi?
@@ -219,18 +224,17 @@ SendMessageByEmail=Elektron pochta orqali xabar yuboring
 TicketNewMessage=Yangi xabar
 ErrorMailRecipientIsEmptyForSendTicketMessage=Qabul qiluvchi bo'sh. Elektron pochta xabarlari yo'q
 TicketGoIntoContactTab=Ularni tanlash uchun "Kontaktlar" yorlig'iga o'ting
-TicketMessageMailIntro=Kirish
+TicketMessageMailIntro=Message header
 TicketMessageMailIntroHelp=Ushbu matn faqat elektron pochta boshida qo'shiladi va saqlanmaydi.
-TicketMessageMailIntroLabelAdmin=Barcha chipta javoblari uchun kirish matni
 TicketMessageMailIntroText=Salom, <br> Siz kuzatayotgan chiptaga yangi javob qo'shildi. Bu xabar: <br>
 TicketMessageMailIntroHelpAdmin=Bu matn Dolibarrdan chiptaga javob berishda javob oldidan kiritiladi
-TicketMessageMailSignature=Imzo
-TicketMessageMailSignatureHelp=Ushbu matn faqat elektron pochta oxirida qo'shiladi va saqlanmaydi.
-TicketMessageMailSignatureText=Dolibarr orqali <b> %s </b> tomonidan yuborilgan xabar
-TicketMessageMailSignatureLabelAdmin=Javob elektron pochtasining imzosi
-TicketMessageMailSignatureHelpAdmin=Ushbu matn javob xabaridan keyin kiritiladi.
+TicketMessageMailFooter=Message footer
+TicketMessageMailFooterHelp=This text is added only at the end of the message sent by email and will not be saved.
+TicketMessageMailFooterText=Message sent by <b>%s</b> via Dolibarr
+TicketMessageMailFooterHelpAdmin=This text will be inserted after the response message.
 TicketMessageHelp=Faqat ushbu matn chipta kartasidagi xabarlar ro'yxatida saqlanadi.
 TicketMessageSubstitutionReplacedByGenericValues=O'zgartirish o'zgaruvchilari umumiy qiymatlar bilan almashtiriladi.
+ForEmailMessageWillBeCompletedWith=For email messages sent to external users, the message will be completed with
 TimeElapsedSince=O'shandan beri vaqt o'tgan
 TicketTimeToRead=O'qishdan oldin o'tgan vaqt
 TicketTimeElapsedBeforeSince=Oldin / keyin o'tgan vaqt
@@ -241,6 +245,7 @@ TicketMessageMailIntroAutoNewPublicMessage=%s mavzusida chiptada yangi xabar joy
 TicketAssignedToYou=Chipta tayinlandi
 TicketAssignedEmailBody=Sizga %s tomonidan # %s chiptasi tayinlangan
 MarkMessageAsPrivate=Xabarni shaxsiy sifatida belgilash
+TicketMessageSendEmailHelp=An email will be sent to all assigned contact (internal contacts, but also external contacts except if the option "%s" is checked)
 TicketMessagePrivateHelp=Ushbu xabar tashqi foydalanuvchilarga ko'rsatilmaydi
 TicketEmailOriginIssuer=Chiptalarning kelib chiqishi bo'yicha emitent
 InitialMessage=Dastlabki xabar
@@ -296,7 +301,7 @@ TicketNewEmailBodyInfosTrackUrlCustomer=Siz quyidagi havolani bosish orqali ma'l
 TicketCloseEmailBodyInfosTrackUrlCustomer=Quyidagi havolani bosish orqali ushbu chipta tarixi bilan tanishishingiz mumkin
 TicketEmailPleaseDoNotReplyToThisEmail=Iltimos, ushbu elektron pochtaga to'g'ridan-to'g'ri javob bermang! Interfeysga javob berish uchun havoladan foydalaning.
 TicketPublicInfoCreateTicket=Ushbu shakl sizning boshqaruv tizimimizda qo'llab-quvvatlash chiptasini yozib olishga imkon beradi.
-TicketPublicPleaseBeAccuratelyDescribe=Iltimos, muammoni aniq tasvirlab bering. Sizning so'rovingizni to'g'ri aniqlab olishimiz uchun imkon qadar ko'proq ma'lumotlarni taqdim eting.
+TicketPublicPleaseBeAccuratelyDescribe=Please accurately describe your question. Provide the most information possible to allow us to correctly identify your request.
 TicketPublicMsgViewLogIn=Iltimos, chiptani kuzatish guvohnomasini kiriting
 TicketTrackId=Ommaviy kuzatuv identifikatori
 OneOfTicketTrackId=Kuzatuv identifikatoringizdan biri
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index b3cf7176d1d..4c04406613e 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -64,7 +64,7 @@ IfModuleEnabled=Ghi chú: Yes chỉ có tác dụng nếu module <b>%s</b> đư
 RemoveLock=Xóa / đổi tên tệp <b>%s</b> nếu nó tồn tại, để cho phép sử dụng công cụ Cập nhật / Cài đặt.
 RestoreLock=Khôi phục tệp <b>%s</b> , chỉ với quyền đọc, để vô hiệu hóa bất kỳ việc sử dụng thêm công cụ Cập nhật / Cài đặt nào.
 SecuritySetup=Thiết lập an ninh
-PHPSetup=PHP setup
+PHPSetup=Thiết lập PHP
 OSSetup=OS setup
 SecurityFilesDesc=Xác định các tùy chọn ở đây liên quan đến bảo mật về việc tải lên các tệp.
 ErrorModuleRequirePHPVersion=Lỗi, module này yêu cầu phiên bản PHP %s hoặc mới hơn
@@ -145,6 +145,7 @@ Box=widget
 Boxes=widgets
 MaxNbOfLinesForBoxes=Số dòng tối đa cho widgets
 AllWidgetsWereEnabled=Tất cả các widgets có sẵn được kích hoạt
+WidgetAvailable=Widget available
 PositionByDefault=Trật tự mặc định
 Position=Chức vụ
 MenusDesc=Trình quản lý menu để thiết lập nội dung của hai thanh menu (ngang và dọc).
@@ -374,7 +375,7 @@ DoTestSendHTML=Kiểm tra gửi HTML
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
 UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=Hãy xem trang Wiki để biết danh sách những người đóng góp và tổ chức của họ
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
 DisableLinkToHelpCenter=Hide the link "<b>Need help or support</b>" on the login page
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind conversions capabilities
 Module3200Name=Lưu trữ không thể thay đổi
 Module3200Desc=Cho phép một bản ghi không thể thay đổi của các sự kiện kinh doanh. Các sự kiện được lưu trữ trong thời gian thực. Nhật ký là một bảng chỉ đọc các sự kiện được xâu chuỗi có thể được xuất dữ liệu. Mô-đun này có thể là bắt buộc đối với một số quốc gia.
 Module3300Name=Module Builder
-Module3200Desc=Cho phép một bản ghi không thể thay đổi của các sự kiện kinh doanh. Các sự kiện được lưu trữ trong thời gian thực. Nhật ký là một bảng chỉ đọc các sự kiện được xâu chuỗi có thể được xuất dữ liệu. Mô-đun này có thể là bắt buộc đối với một số quốc gia.
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=Mạng xã hội
 Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
 Module4000Name=Nhân sự
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook setup
 Settings = Cài đặt
 WebhookSetupPage = Webhook setup page
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/vi_VN/interventions.lang b/htdocs/langs/vi_VN/interventions.lang
index 410b4171765..14bee02d420 100644
--- a/htdocs/langs/vi_VN/interventions.lang
+++ b/htdocs/langs/vi_VN/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=Ẩn giờ và phút ra của trường ngày cho
 InterventionStatistics=Thống kê các can thiệp
 NbOfinterventions=Số lượng thẻ can thiệp
 NumberOfInterventionsByMonth=Số thẻ can thiệp theo tháng (ngày xác nhận)
-AmountOfInteventionNotIncludedByDefault=Số tiền can thiệp không được tính theo mặc định vào lợi nhuận (trong hầu hết các trường hợp, bảng chấm công được sử dụng để tính thời gian tiêu thụ). Thêm tùy chọn gồm PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT thành 1 vào Nhà - Thiết lập - Khác
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=Id Can thiệp
 InterRef=Tham chiếu Can thiệp.
 InterDateCreation=Ngày tạo Can thiệp
@@ -66,3 +66,7 @@ RepeatableIntervention=Mẫu can thiệp
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
 GenerateInter=Generate intervention
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 0c3fc622abd..f694b07cfd0 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=Liên lạc theo vị trí
 MailingModuleDescEmailsFromFile=Email từ tập tin
 MailingModuleDescEmailsFromUser=Email đầu vào của người dùng
 MailingModuleDescDolibarrUsers=Người dùng có email
-MailingModuleDescThirdPartiesByCategories=Các bên thứ ba (theo danh mục)
+MailingModuleDescThirdPartiesByCategories=Bên thứ ba
 SendingFromWebInterfaceIsNotAllowed=Gửi từ giao diện web không được phép.
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 4196012278c..f674c9f42f1 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -145,6 +145,7 @@ Box=插件
 Boxes=插件
 MaxNbOfLinesForBoxes=插件的最大行数
 AllWidgetsWereEnabled=全部可用的小工具都已启用
+WidgetAvailable=Widget available
 PositionByDefault=默认顺序
 Position=位置
 MenusDesc=菜单管理器定义两个菜单中的内容(横向和纵向菜单栏)。
@@ -374,7 +375,7 @@ DoTestSendHTML=测试发送 HTML
 ErrorCantUseRazIfNoYearInMask=错误，如果序列{yy}或{yyyy}不在掩码中，则不能使用选项@来重置计数器。
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=错误，如果序列 {yy}{mm} 或 {yyyy}{mm} 不在掩码中，则无法使用选项 @。
 UMask=Unix/Linux/BSD 文件系统下新文件的 umask 参数。
-UMaskExplanation=此参数允许您定义 Dolibarr 在服务器上创建的文件的默认权限（例如上传的文件）。 <br> 必须是八进制值（例如 0666 表示所有人都可以读写）。 <br> 此参数在 Windows 服务器上无效。
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=查看 Wiki 页面以获取贡献者及其组织的列表
 UseACacheDelay= 以秒为单位缓存导出响应的延迟（0 或空无缓存）
 DisableLinkToHelpCenter=在登录页面隐藏链接“<b> 需要帮助或支持 </b>”
@@ -663,7 +664,7 @@ Module2900Desc=Maxmind的GeoIP数据库的转换能力
 Module3200Name=不可更改的档案
 Module3200Desc=启用不可更改的商业活动日志。事件被实时存档。日志是只读的可以导出的链式事件表。对于某些国家/地区，此模块可能是强制性的。
 Module3300Name=Module Builder
-Module3200Desc=启用不可更改的商业活动日志。事件被实时存档。日志是只读的可以导出的链式事件表。对于某些国家/地区，此模块可能是强制性的。
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=社交网络
 Module3400Desc=启用第三方和地址的社交网络字段（skype、twitter、facebook、...）。
 Module4000Name=人力资源管理
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=使用低内存模式
 ExportUseLowMemoryModeHelp=使用低内存模式来生成转储文件 (压缩是通过管道而不是进入 PHP 内存)。这种方法不允许检查文件是否完整，如果失败也不能报告错误信息。如果你遇到内存不足的错误，请使用它。
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = 捕获 dolibarr 触发器并将其发送到某个 URL 的接口
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = Webhook 设置
 Settings = 设置
 WebhookSetupPage = Webhook 设置页面
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang
index 04f905bb97f..046ea284a13 100644
--- a/htdocs/langs/zh_CN/interventions.lang
+++ b/htdocs/langs/zh_CN/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=隐藏干预记录的日期字段的小时和分
 InterventionStatistics=干预统计
 NbOfinterventions=No. of intervention cards
 NumberOfInterventionsByMonth=No. of intervention cards by month (date of validation)
-AmountOfInteventionNotIncludedByDefault=默认情况下，干预金额不包括在利润中（在大多数情况下，时间表用于计算花费的时间）。将选项PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT添加到1到home-setup-other以包含它们。
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=干预身份
 InterRef=干预编号
 InterDateCreation=日期创建干预
@@ -66,3 +66,7 @@ RepeatableIntervention=Template of intervention
 ToCreateAPredefinedIntervention=To create a predefined or recurring intervention, create a common intervention and convert it into intervention template
 ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
 GenerateInter=Generate intervention
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 16b348e6de9..e361c9fa7fe 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=按职位联系
 MailingModuleDescEmailsFromFile=来自档案的电子邮件
 MailingModuleDescEmailsFromUser=用户输入的电子邮件
 MailingModuleDescDolibarrUsers=用户使用电子邮件
-MailingModuleDescThirdPartiesByCategories=第三方（按类别）
+MailingModuleDescThirdPartiesByCategories=合作方
 SendingFromWebInterfaceIsNotAllowed=不允许从Web界面发送。
 EmailCollectorFilterDesc=All filters must match to have an email being collected
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=Record created by the Email Collector %s from emai
 DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
 DefaultStatusEmptyMandatory=Empty but mandatory
 WarningLimitSendByDay=WARNING: The setup or contract of your instance limits your number of emails per day to <b>%s</b>. Trying to send more may result in having your instance slow down or suspended. Please contact your support if you need a higher quota.
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index cd05411e793..26c66592ff3 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -145,6 +145,7 @@ Box=小工具
 Boxes=小工具
 MaxNbOfLinesForBoxes=小工具最大行數
 AllWidgetsWereEnabled=所有可用小工具已啟用
+WidgetAvailable=Widget available
 PositionByDefault=預設排序
 Position=位置
 MenusDesc=選單管理器設定兩個選單欄的內容（水平和垂直）。
@@ -374,7 +375,7 @@ DoTestSendHTML=測試傳送HTML
 ErrorCantUseRazIfNoYearInMask=錯誤，若序列 {yy} 或 {yyyy} 在條件中，則不能使用 @ 以便每年重新計數。
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=錯誤，若序列 {yy}{mm} 或 {yyyy}{mm} 不在遮罩內則不能使用選項 @。
 UMask=在 Unix/Linux/BSD/Mac 的檔案系統中新檔案的 UMask 參數。
-UMaskExplanation=此參數允許您定義預設情況下對由Dolibarr在伺服器上建立檔案設定的權限（例如，在上傳過程中）。 <br>它必須是八進制值（例如，0666表示對所有人讀寫）。 <br>此參數在Windows伺服器上無用。
+UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone.). Recommended value is 0600 or 0660<br>This parameter is useless on a Windows server.
 SeeWikiForAllTeam=在Wiki頁面上查看貢獻者及其組織的清單
 UseACacheDelay= 快取匯出響應以秒為單位的延遲（0或為空表示沒有快取）
 DisableLinkToHelpCenter=在登入頁面上隱藏“ <b>需要幫助或支援</b>"連結
@@ -663,7 +664,7 @@ Module2900Desc=GeoIP Maxmind轉換功能
 Module3200Name=不可改變的檔案
 Module3200Desc=啟用不可更改的商業事件日誌。事件是即時存檔的。日誌是可以匯出的鍊式事件的唯讀表格。在某些國家/地區，此模組可能是必需的。
 Module3300Name=模組產生器
-Module3200Desc=啟用不可更改的商業事件日誌。事件是即時存檔的。日誌是可以匯出的鍊式事件的唯讀表格。在某些國家/地區，此模組可能是必需的。
+Module3300Desc=A RAD (Rapid Application Development - low-code and no-code) tool to help developers or advanced users to build their own module/application.
 Module3400Name=社群網路
 Module3400Desc=啟用合作方與地址的社群網路欄位 (skype, twitter, facebook, ...).
 Module4000Name=人資
@@ -2299,7 +2300,7 @@ ExportUseLowMemoryMode=使用低記憶體模式
 ExportUseLowMemoryModeHelp=Use the low memory mode to generate the dump file (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that the file is complete and error message can't be reported if it fails. Use it if you experience not enough memory errors.
 
 ModuleWebhookName = Webhook
-ModuleWebhookDesc = 捕獲 dolibarr 觸發器並將其傳送到 URL 的界面
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send data of the event to an URL
 WebhookSetup = 設定 Webhook
 Settings = 設定
 WebhookSetupPage = Webhook 設定頁
@@ -2372,3 +2373,6 @@ WarningModuleHasChangedLastVersionCheckParameter=Warning: the module %s has set
 WarningModuleHasChangedSecurityCsrfParameter=Warning: the module %s has disabled the CSRF security of your instance. This action is suspect and your installation may no more be secured. Please contact the author of the module for explanation.
 EMailsInGoingDesc=Incoming emails are managed by the module %s. You must enable and configure it if you need to support ingoing emails.
 MAIN_IMAP_USE_PHPIMAP=Use the PHP-IMAP library for IMAP instead of native PHP IMAP. This also allows the use of an OAuth2 connection for IMAP (module OAuth must also be activated).
+MAIN_CHECKBOX_LEFT_COLUMN=Show the column for field and line selection on the left (on the right by default)
+
+CSSPage=CSS Style
diff --git a/htdocs/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang
index 491df5da738..af9a37b2b12 100644
--- a/htdocs/langs/zh_TW/interventions.lang
+++ b/htdocs/langs/zh_TW/interventions.lang
@@ -50,7 +50,7 @@ UseDateWithoutHourOnFichinter=為干預記錄隱藏日期中的小時和分鐘
 InterventionStatistics=干預統計
 NbOfinterventions=干預卡數量
 NumberOfInterventionsByMonth=每月干預卡的數量（驗證日期）
-AmountOfInteventionNotIncludedByDefault=預設情況下，干預金額不包括在利潤中（在大多數情況下，時間表用於計算花費的時間）。將選項PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT加到首頁- 設定- 其他中並設定為1以包括它們。
+AmountOfInteventionNotIncludedByDefault=Amount of intervention is not included by default into profit (in most cases, timesheets are used to count time spent). You can use PROJECT_ELEMENTS_FOR_ADD_MARGIN and PROJECT_ELEMENTS_FOR_MINUS_MARGIN option into home-setup-other to complete list of element included into profit.
 InterId=干預ID
 InterRef=干預參考
 InterDateCreation=干預的建立日期
@@ -68,3 +68,5 @@ ConfirmReopenIntervention=您確定要打開干預<b> %s </b>嗎？
 GenerateInter=產生干預
 FichinterNoContractLinked=干預 %s 已在沒有連結合約的情況下建立。
 ErrorFicheinterCompanyDoesNotExist=公司不存在。干預尚未產生。
+NextDateToIntervention=Date for next intervention generation
+NoIntervention=No intervention
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index a3e96505632..471ed027775 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -91,7 +91,7 @@ MailingModuleDescContactsByFunction=依職位聯絡
 MailingModuleDescEmailsFromFile=來自檔案的電子郵件
 MailingModuleDescEmailsFromUser=用戶輸入的電子郵件
 MailingModuleDescDolibarrUsers=擁有電子郵件的用戶
-MailingModuleDescThirdPartiesByCategories=合作方（依類別）
+MailingModuleDescThirdPartiesByCategories=合作方
 SendingFromWebInterfaceIsNotAllowed=不允許從Web界面發送。
 EmailCollectorFilterDesc=所有過濾條件必須符合才能收集電子郵件
 
@@ -179,3 +179,4 @@ RecordCreatedByEmailCollector=由電子郵件收集器%s從電子郵件%s建立
 DefaultBlacklistMailingStatus=建立新聯絡人時欄位“%s”的預設值
 DefaultStatusEmptyMandatory=必填
 WarningLimitSendByDay=警告：實例的設定或合約將每天的電子郵件數量限制為 <b> %s </b> 。嘗試發送更多可能會導致您的實例變慢或暫停。如果您需要更高的配額，請聯絡您的服務人員。
+NoMoreRecipientToSendTo=No more recipient to send the email to
diff --git a/htdocs/langs/zh_TW/partnership.lang b/htdocs/langs/zh_TW/partnership.lang
index 8ae309f7f35..e73fa3287a9 100644
--- a/htdocs/langs/zh_TW/partnership.lang
+++ b/htdocs/langs/zh_TW/partnership.lang
@@ -29,7 +29,7 @@ PartnershipCheckBacklink=合作夥伴：檢查參考反向連結
 # Menu
 #
 NewPartnership=新合作夥伴
-NewPartnershipbyWeb= 您的伙伴關係已成功地新增。
+NewPartnershipbyWeb=Your partnership request has been added successfully. We may contact you soon...
 ListOfPartnerships=合作夥伴清單
 
 #
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index f348b5ae9aa..a5d8f119e2d 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -186,7 +186,7 @@ CreatedBy=建立者
 NewTicket=新服務單
 SubjectAnswerToTicket=服務單回應
 TicketTypeRequest=需求類型
-TicketCategory=服務單分類
+TicketCategory=Ticket group
 SeeTicket=查閱服務單
 TicketMarkedAsRead=服務單已標記為已讀
 TicketReadOn=繼續讀取
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index d0005533ee0..ec696db0ed6 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2291,7 +2291,7 @@ class Ticket extends CommonObject
 				$destfile = $destdir.'/'.$pathinfo['filename'].' - '.dol_print_date($now, 'dayhourlog').'.'.$pathinfo['extension'];
 			}
 
-			$res = dol_move($filepath[$i], $destfile, 0, 1);
+			$res = dol_move($filepath[$i], $destfile, 0, 1, 0, 1);
 
 			if (image_format_supported($destfile) == 1) {
 				// Create small thumbs for image (Ratio is near 16/9)
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 26adb3ef220..a55522f1c37 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -162,7 +162,7 @@ if ($rss) {
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
 		if ($result >= 0) {
-			if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+			if (dol_move($outputfiletmp, $outputfile, 0, 1, 0, 0)) {
 				$result = 1;
 			} else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;

From 3acd80924bcd85013923137515ad85e8e977210e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 10:46:42 +0100
Subject: [PATCH 215/300] Trans

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

diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index b6368a7d374..e94b6bbafe4 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Ethiopian
+Language_af_ZA=Afrikaans (South Africa)
 Language_ar_AR=Arabic
 Language_ar_DZ=Arabic (Algeria)
 Language_ar_EG=Arabic (Egypt)

From 0ddb4eb9b267125b550658f35eeae31355380d83 Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 2 Mar 2023 11:51:06 +0100
Subject: [PATCH 216/300] FIX: expense reports: error when selecting mileage
 fees expense type if MAIN_USE_EXPENSE_IK disabled

---
 htdocs/expensereport/card.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 20cd4f5227e..73bb84f5feb 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2594,8 +2594,8 @@ if ($action == 'create') {
 
 			print '</table>';
 			print '</div>';
-			//var_dump($object);
-			print '<script javascript>
+
+			print '<script>
 
 			/* JQuery for product free or predefined select */
 			jQuery(document).ready(function() {
@@ -2611,6 +2611,10 @@ if ($action == 'create') {
 						jQuery("#value_unit_ht").val("");
 					}
 				});
+            ';
+
+            if (! empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+                print '
 
                 /* unit price coéf calculation */
                 jQuery(".input_qty, #fk_c_type_fees, #select_fk_c_exp_tax_cat, #vatrate ").change(function(event) {
@@ -2656,6 +2660,10 @@ if ($action == 'create') {
 						jQuery("#value_unit_ht").val("");
 					}*/
 				});
+                ';
+            }
+
+            print '
 
 			});
 

From 82ac935d8e886997be5d5596e3cbe60f0db50bb1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 12:04:20 +0100
Subject: [PATCH 217/300] Merge branch '16.0' of
 git@github.com:Dolibarr/dolibarr.git into 17.0

---
 htdocs/user/passwordforgotten.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 6431c36b92f..c7739d6795f 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -146,6 +146,7 @@ if (empty($reshook)) {
 				$username = '';
 			} else {
 				if (empty($edituser->email)) {
+					usleep(20000);	// add delay to simulate setPassword and send_password actions delay
 					$message .= $messagewarning;
 				} else {
 					$newpassword = $edituser->setPassword($user, '', 1);

From 592451f4015ec625555163d0b8cdf4c8fee6e6a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 12:04:20 +0100
Subject: [PATCH 218/300] Add delay to emulate success actions

---
 htdocs/user/passwordforgotten.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 6431c36b92f..e8f5baf954c 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -142,10 +142,12 @@ if (empty($reshook)) {
 			$messagewarning .= '</div>';
 
 			if ($result <= 0 && $edituser->error == 'USERNOTFOUND') {
+				usleep(20000);	// add delay to simulate setPassword and send_password actions delay
 				$message .= $messagewarning;
 				$username = '';
 			} else {
 				if (empty($edituser->email)) {
+					usleep(20000);	// add delay to simulate setPassword and send_password actions delay
 					$message .= $messagewarning;
 				} else {
 					$newpassword = $edituser->setPassword($user, '', 1);

From c9f6c243686fb1b55833bfb6a2db58a8f161dd3a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 13:11:08 +0100
Subject: [PATCH 219/300] Debug v17

---
 .../contract/doc/pdf_strato.modules.php       | 173 ++++++++++++------
 1 file changed, 114 insertions(+), 59 deletions(-)

diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 8921425a8ac..a63c8d9a231 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -45,6 +45,11 @@ class pdf_strato extends ModelePDFContract
 	 */
 	public $db;
 
+	/**
+	 * @var int The environment ID when using a multicompany module
+	 */
+	public $entity;
+
 	/**
 	 * @var string model name
 	 */
@@ -114,7 +119,7 @@ class pdf_strato extends ModelePDFContract
 
 	/**
 	 * Issuer
-	 * @var Societe
+	 * @var Societe		Object that emits
 	 */
 	public $emetteur;
 
@@ -138,7 +143,7 @@ class pdf_strato extends ModelePDFContract
 		$this->description = $langs->trans("StandardContractsTemplate");
 		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 
-		// Page size for A4 format
+		// Dimension page
 		$this->type = 'pdf';
 		$formatarray = pdf_getFormat();
 
@@ -160,7 +165,7 @@ class pdf_strato extends ModelePDFContract
 		// Get source company
 		$this->emetteur = $mysoc;
 		if (empty($this->emetteur->country_code)) {
-			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if not defined
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 		}
 
 		// Define position of columns
@@ -182,7 +187,7 @@ class pdf_strato extends ModelePDFContract
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
 		// phpcs:enable
-		global $user, $langs, $conf, $hookmanager, $mysoc;
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
 		if (!is_object($outputlangs)) {
 			$outputlangs = $langs;
@@ -192,15 +197,30 @@ class pdf_strato extends ModelePDFContract
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
-		// Load traductions files required by page
+		// Load translation files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "contracts"));
 
-		if ($conf->contrat->dir_output) {
+		// Show Draft Watermark
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->CONTRACT_DRAFT_WATERMARK))) {
+			$this->watermark = $conf->global->CONTRACT_DRAFT_WATERMARK;
+		}
+
+		global $outputlangsbis;
+		$outputlangsbis = null;
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
+		}
+
+		$nblines = count($object->lines);
+
+		if ($conf->contract->multidir_output[$conf->entity]) {
 			$object->fetch_thirdparty();
 
 			// Definition of $dir and $file
 			if ($object->specimen) {
-				$dir = $conf->contrat->dir_output;
+				$dir = $conf->contract->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
@@ -210,7 +230,7 @@ class pdf_strato extends ModelePDFContract
 
 			if (!file_exists($dir)) {
 				if (dol_mkdir($dir) < 0) {
-					$this->error = $outputlangs->trans("ErrorCanNotCreateDir", $dir);
+					$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
@@ -226,15 +246,20 @@ class pdf_strato extends ModelePDFContract
 				global $action;
 				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
+				// Set nblines with the new command lines content after hook
+				$nblines = count($object->lines);
+
+				// Create pdf instance
 				$pdf = pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
+
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 9; // Height reserved to output the footer (value include bottom margin)
 				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
 					$heightforfooter += 6;
 				}
-				$pdf->SetAutoPageBreak(1, 0);
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
@@ -243,7 +268,11 @@ class pdf_strato extends ModelePDFContract
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
 				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
-					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$logodir = $conf->mycompany->dir_output;
+					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+						$logodir = $conf->mycompany->multidir_output[$object->entity];
+					}
+					$pagecount = $pdf->setSourceFile($logodir.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
 
@@ -252,10 +281,10 @@ class pdf_strato extends ModelePDFContract
 				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("ContractCard"));
+				$pdf->SetSubject($outputlangs->transnoentities("Contract"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("ContractCard")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Contract")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (getDolGlobalString('MAIN_DISABLE_PDF_COMPRESSION')) {
 					$pdf->SetCompression(false);
 				}
@@ -268,7 +297,7 @@ class pdf_strato extends ModelePDFContract
 					$pdf->useTemplate($tplidx);
 				}
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, (is_object($outputlangsbis) ? $outputlangsbis : null));
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
@@ -408,6 +437,7 @@ class pdf_strato extends ModelePDFContract
 						{
 							$pdf->commitTransaction();
 						}
+						$posYAfterDescription = $pdf->GetY();
 
 						$nexY = $pdf->GetY() + 2;
 						$pageposafter = $pdf->getPage();
@@ -417,7 +447,7 @@ class pdf_strato extends ModelePDFContract
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
 						// We suppose that a too long description is moved completely on next page
-						if ($pageposafter > $pageposbefore) {
+						if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
 							$pdf->setPage($pageposafter);
 							$curY = $tab_top_newpage;
 						}
@@ -483,10 +513,6 @@ class pdf_strato extends ModelePDFContract
 				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager)) {
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager = new HookManager($this->db);
-				}
 				$hookmanager->initHooks(array('pdfgeneration'));
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
@@ -502,13 +528,13 @@ class pdf_strato extends ModelePDFContract
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;
+				return 1; // No error
 			} else {
-				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		} else {
-			$this->error = $langs->trans("ErrorConstantNotDefined", "CONTRACT_OUTPUTDIR");
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "CONTRACT_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -536,7 +562,9 @@ class pdf_strato extends ModelePDFContract
 			$hidetop = -1;
 		}
 
+		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		/*
 		$pdf->SetXY($this->marge_gauche, $tab_top);
 		$pdf->MultiCell(190,8,$outputlangs->transnoentities("Description"),0,'L',0);
@@ -602,76 +630,97 @@ class pdf_strato extends ModelePDFContract
 	 *  @param  Contrat		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
+	 *  @param	string		$titlekey		Translation key to show as title of document
+	 *  @return	int                         Return topshift value
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null, $titlekey = "Contract")
 	{
-		global $conf, $langs;
+		// phpcs:enable
+		global $conf, $langs, $hookmanager;
 
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
+		$ltrdirection = 'L';
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
+			$ltrdirection = 'R';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "contract", "companies"));
 
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		//Affiche le filigrane brouillon - Print Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->CONTRACT_DRAFT_WATERMARK))) {
-			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->CONTRACT_DRAFT_WATERMARK);
-		}
-
-		//Prepare next
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-		$posx = $this->page_largeur - $this->marge_droite - 100;
+		$w = 100;
+
 		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo) {
-			if (is_readable($logo)) {
-				$height = pdf_getHeightForLogo($logo);
-				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO)) {
+			if ($this->emetteur->logo) {
+				$logodir = $conf->mycompany->dir_output;
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
+				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
+					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
+				} else {
+					$logo = $logodir.'/logos/'.$this->emetteur->logo;
+				}
+				if (is_readable($logo)) {
+					$height = pdf_getHeightForLogo($logo);
+					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+				} else {
+					$pdf->SetTextColor(200, 0, 0);
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+				}
 			} else {
-				$pdf->SetTextColor(200, 0, 0);
-				$pdf->SetFont('', 'B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+				$text = $this->emetteur->name;
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, $ltrdirection);
 			}
-		} else {
-			$text = $this->emetteur->name;
-			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$title = $outputlangs->transnoentities("ContractCard");
-		$pdf->MultiCell(100, 4, $title, '', 'R');
+		$title = $outputlangs->transnoentities($titlekey);
+		$title .= ' '.$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == $object::STATUS_DRAFT) {
+			$pdf->SetTextColor(128, 0, 0);
+			$title .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
+		$pdf->MultiCell($w, 3, $title, '', 'R');
 
-		$pdf->SetFont('', 'B', $default_font_size + 2);
+		$pdf->SetFont('', 'B', $default_font_size);
 
+		/*
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+		*/
 
-		$posy += 1;
-		$pdf->SetFont('', '', $default_font_size);
+		$posy += 3;
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_contrat, "day", false, $outputlangs, true), '', 'R');
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_contrat, "day", false, $outputlangs, true), '', 'R');
 
 		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		if ($showaddress) {
@@ -702,6 +751,7 @@ class pdf_strato extends ModelePDFContract
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetFillColor(230, 230, 230);
 				$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+				$pdf->SetTextColor(0, 0, 60);
 			}
 
 			// Show sender name
@@ -709,13 +759,13 @@ class pdf_strato extends ModelePDFContract
 				$pdf->SetXY($posx + 2, $posy + 3);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFont('', 'B', $default_font_size);
-				$pdf->MultiCell(80, 3, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+				$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
 				$posy = $pdf->getY();
 			}
 
 			// Show sender information
-			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 
@@ -738,14 +788,16 @@ class pdf_strato extends ModelePDFContract
 
 			$this->recipient->name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, (isset($object->contact) ? $object->contact : ''), $usecontact, 'target', $object);
+			$mode = 'target';
+			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, (isset($object->contact) ? $object->contact : ''), $usecontact, $mode, $object);
 
 			// Show recipient
-			$widthrecbox = 100;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
 			if ($this->page_largeur < 210) {
 				$widthrecbox = 84; // To work with US executive format
 			}
-			$posy = 42;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
 			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
 				$posx = $this->marge_gauche;
@@ -763,15 +815,18 @@ class pdf_strato extends ModelePDFContract
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $this->recipient->name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $this->recipient->name, 0, $ltrdirection);
 
 			$posy = $pdf->getY();
 
 			// Show recipient information
 			$pdf->SetFont('', '', $default_font_size - 1);
 			$pdf->SetXY($posx + 2, $posy);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, $ltrdirection);
 		}
+
+		$pdf->SetTextColor(0, 0, 0);
+		return $top_shift;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
@@ -787,6 +842,6 @@ class pdf_strato extends ModelePDFContract
 	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		$showdetails = getDolGlobalInt('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', 0);
-		return pdf_pagefoot($pdf, $outputlangs, 'CONTRACT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, 'CONTRACT_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 }

From 799482508690f58ccb4c329f0208b10cc7dfd1de Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 13:39:08 +0100
Subject: [PATCH 220/300] Update list.php

---
 htdocs/comm/action/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 8a75dbe9337..c9f0f31391f 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -412,7 +412,7 @@ if ($usergroup > 0) {
 }
 $sql .= " s.nom as societe, s.rowid as socid, s.client, s.email as socemail,";
 $sql .= " a.id, a.code, a.label, a.note, a.datep as dp, a.datep2 as dp2, a.fulldayevent, a.location,";
-$sql .= ' a.fk_user_author, a.fk_user_action,';
+$sql .= " a.fk_user_author, a.fk_user_action,";
 $sql .= " a.fk_contact, a.note, a.percent as percent,";
 $sql .= " a.fk_element, a.elementtype, a.datec, a.tms as datem,";
 $sql .= " c.code as type_code, c.libelle as type_label, c.color as type_color, c.type as type_type, c.picto as type_picto,";

From bf03d88fe8166f3c2adbb6e5cd8ba0db6913226a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 2 Mar 2023 13:40:30 +0100
Subject: [PATCH 221/300] restore comments

---
 htdocs/workstation/class/workstation.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index ae21431db83..3c54d670244 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -93,6 +93,7 @@ class Workstation extends CommonObject
 	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 
+	// BEGIN MODULEBUILDER PROPERTIES
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
@@ -129,6 +130,7 @@ class Workstation extends CommonObject
 	public $nb_operators_required;
 	public $thm_operator_estimated;
 	public $thm_machine_estimated;
+	// END MODULEBUILDER PROPERTIES
 
 	/**
 	 * @var int[] array of ID

From 17b37941e9d132581fc7d217fefdeb6fa97696fc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 13:49:44 +0100
Subject: [PATCH 222/300] Update stripe.class.php

---
 htdocs/stripe/class/stripe.class.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index c0d7f64a264..732c4a57326 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -365,11 +365,14 @@ class Stripe extends CommonObject
 			$stripeamount = $amount;
 		}
 
-		$fee = $amount * (getDolGlobalString("STRIPE_APPLICATION_FEE_PERCENT", '0') / 100) + getDolGlobalString("STRIPE_APPLICATION_FEE", '0');
-		if ($fee >= getDolGlobalString("STRIPE_APPLICATION_FEE_MAXIMAL", '0') && getDolGlobalString("STRIPE_APPLICATION_FEE_MAXIMAL", '0') > getDolGlobalString("STRIPE_APPLICATION_FEE_MINIMAL", '0')) {
-			$fee = getDolGlobalString("STRIPE_APPLICATION_FEE_MAXIMAL", '0');
-		} elseif ($fee < getDolGlobalString("STRIPE_APPLICATION_FEE_MINIMAL", '0')) {
-			$fee = getDolGlobalString("STRIPE_APPLICATION_FEE_MINIMAL", '0');
+		$fee = 0;
+		if (getDolGlobalString("STRIPE_APPLICATION_FEE_PERCENT")) {
+			$fee = $amount * ((float) getDolGlobalString("STRIPE_APPLICATION_FEE_PERCENT", '0') / 100) + (float) getDolGlobalString("STRIPE_APPLICATION_FEE", '0');
+		}
+		if ($fee >= (float) getDolGlobalString("STRIPE_APPLICATION_FEE_MAXIMAL", '0') && (float) getDolGlobalString("STRIPE_APPLICATION_FEE_MAXIMAL", '0') > (float) getDolGlobalString("STRIPE_APPLICATION_FEE_MINIMAL", '0')) {
+			$fee = (float) getDolGlobalString("STRIPE_APPLICATION_FEE_MAXIMAL", '0');
+		} elseif ($fee < (float) getDolGlobalString("STRIPE_APPLICATION_FEE_MINIMAL", '0')) {
+			$fee = (float) getDolGlobalString("STRIPE_APPLICATION_FEE_MINIMAL", '0');
 		}
 		if (!in_array($currency_code, $arrayzerounitcurrency)) {
 			$stripefee = round($fee * 100);

From de86f0ecaaa29d62317b9996c3052971a3921ce2 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Thu, 2 Mar 2023 12:52:12 +0000
Subject: [PATCH 223/300] Fixing style errors.

---
 htdocs/comm/propal/class/propal.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index a217f7c10e0..10b7000392f 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1600,7 +1600,7 @@ class Propal extends CommonObject
 				$this->ref_client           = $obj->ref_client;
 				$this->ref_ext           = $obj->ref_ext;
 
-        $this->remise               = $obj->remise;				// TODO deprecated
+				$this->remise               = $obj->remise;				// TODO deprecated
 				$this->remise_percent       = $obj->remise_percent;		// TODO deprecated
 				$this->remise_absolue       = $obj->remise_absolue;		// TODO deprecated
 				$this->total                = $obj->total_ttc;			// TODO deprecated

From 45207822a1ad4d8d22986206bf9289426a72dcd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Thu, 2 Mar 2023 14:13:17 +0100
Subject: [PATCH 224/300] restore tags

---
 htdocs/comm/action/class/actioncommreminder.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index 71b438b1a8a..909a7586025 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -72,6 +72,7 @@ class ActionCommReminder extends CommonObject
 	 *  'showoncombobox' if field must be shown into the label of combobox
 	 */
 
+	// BEGIN MODULEBUILDER PROPERTIES
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
@@ -140,6 +141,7 @@ class ActionCommReminder extends CommonObject
 	 * @var int Template Mail
 	 */
 	public $fk_email_template;
+	// END MODULEBUILDER PROPERTIES
 
 	/**
 	 * Constructor

From bc6ca67fcef64cacea75a0af4aa5dba4b8b9b966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charl=C3=A8ne=20Benke?=
 <1179011+defrance@users.noreply.github.com>
Date: Thu, 2 Mar 2023 14:30:20 +0100
Subject: [PATCH 225/300] $object left on hookmanager call

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

diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 7162bc7dd2a..b3f1888f505 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@altairis.fr>
  * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
- * Copyright (C) 2018		Charlene Benke			<charlie@patas-monkey.com>
+ * Copyright (C) 2018-2023	Charlene Benke			<charlene@patas-monkey.com>
  * Copyright (C) 2021		Alexandre Spangaro		<aspangaro@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -464,7 +464,7 @@ if (!empty($searchCategoryProductList)) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);

From 3e17a4737f630c5e39b56df2239cc40c88c4239b Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Thu, 2 Mar 2023 14:29:15 +0100
Subject: [PATCH 226/300] FIX: validation date for invoice was compared in all
 entities. They should be compared only in the same entity.

---
 htdocs/compta/facture/class/facture.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 265b5732f24..8c93bfb5459 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5768,6 +5768,7 @@ class Facture extends CommonInvoice
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
 		$sql .= " WHERE type = " . (int) $this->type ;
 		$sql .= " AND date_valid IS NOT NULL";
+		$sql .= " AND entity IN (".getEntity('invoice').")";
 		$sql .= " ORDER BY datef DESC LIMIT 1";
 
 		$result = $this->db->query($sql);

From b84e20d09f25166eabb5eb718ceca6a3453de86e Mon Sep 17 00:00:00 2001
From: Marc de Lima Lucio <68746600+marc-dll@users.noreply.github.com>
Date: Thu, 2 Mar 2023 14:52:56 +0100
Subject: [PATCH 227/300] FIX: whitespaces

---
 htdocs/expensereport/card.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 73bb84f5feb..eb1c93f609a 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2611,10 +2611,10 @@ if ($action == 'create') {
 						jQuery("#value_unit_ht").val("");
 					}
 				});
-            ';
+			';
 
-            if (! empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-                print '
+			if (! empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+				print '
 
                 /* unit price coéf calculation */
                 jQuery(".input_qty, #fk_c_type_fees, #select_fk_c_exp_tax_cat, #vatrate ").change(function(event) {
@@ -2660,10 +2660,10 @@ if ($action == 'create') {
 						jQuery("#value_unit_ht").val("");
 					}*/
 				});
-                ';
-            }
+				';
+			}
 
-            print '
+			print '
 
 			});
 

From 99a08402a531f400715249afb6961824c95fb9c6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 15:04:25 +0100
Subject: [PATCH 228/300] Debug v17

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

diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index eaabeee597b..010f6dd74ba 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -464,7 +464,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 }*/
 	// Author
 	if (!empty($object->email_msgid)) {
-		$morehtmlref .= $langs->trans("CreatedBy").' : ';
+		$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' ';
 
 		if ($object->fk_user_creat > 0) {
 			$fuser = new User($db);

From 93022a406c7a5292a63d8d8efb6ea1b487e97a6c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 15:25:12 +0100
Subject: [PATCH 229/300] NEW Keep a link between user created from recruitment
 and application

---
 .../install/mysql/migration/17.0.0-18.0.0.sql |  3 +
 ...ent_recruitmentcandidature-recruitment.sql |  1 +
 .../class/recruitmentcandidature.class.php    |  2 +
 .../recruitmentcandidature_card.php           | 67 ++++++++++---------
 4 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index 718863849a6..f12fd564831 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -93,3 +93,6 @@ ALTER TABLE llx_ecm_files ADD COLUMN share_pass varchar(32) after share;
 
 ALTER TABLE llx_prelevement_demande ADD COLUMN type varchar(12) DEFAULT '';
 UPDATE llx_prelevement_demande SET type = 'ban' WHERE ext_payment_id IS NULL AND type = '';
+
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN fk_user integer;
+
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature-recruitment.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature-recruitment.sql
index 8d5dd3bd14f..676d5ade157 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature-recruitment.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature-recruitment.sql
@@ -27,6 +27,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
 	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
+	fk_user integer, 						-- Id of user created from the job application
 	import_key varchar(14), 
 	model_pdf varchar(255), 
 	status smallint NOT NULL, 
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index 809b8d0cd54..6dae3e08388 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -129,6 +129,7 @@ class RecruitmentCandidature extends CommonObject
 		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>300, 'notnull'=>0, 'visible'=>3, 'cssview'=>'wordbreak'),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-4, 'csslist'=>'nowraponall'),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2, 'csslist'=>'nowraponall'),
+		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'LinkedToDolibarrUser', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflowmax100'),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'default'=>0, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Received', '3'=>'ContractProposed', '5'=>'ContractSigned', '8'=>'Refused', '9'=>'Canceled')),
@@ -144,6 +145,7 @@ class RecruitmentCandidature extends CommonObject
 	public $tms;
 	public $fk_user_creat;
 	public $fk_user_modif;
+	public $fk_user;
 	public $lastname;
 	public $firstname;
 	public $email;
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index 62f7ed5cc9b..50594489d8b 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -202,38 +202,46 @@ if (empty($reshook)) {
 
 	// Create user from a member
 	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer) {
-		if ($result > 0) {
-			$jobposition = new RecruitmentJobPosition($db);
-			$jobposition->fetch($object->fk_recruitmentjobposition);
+		$jobposition = new RecruitmentJobPosition($db);
+		$jobposition->fetch($object->fk_recruitmentjobposition);
 
-			// Creation user
-			$nuser = new User($db);
-			$nuser->login = GETPOST('login', 'alphanohtml');
-			$nuser->fk_soc = 0;
-			$nuser->employee = 1;
-			$nuser->firstname = $object->firstname;
-			$nuser->lastname = $object->lastname;
-			$nuser->email = '';
-			$nuser->personal_email = $object->email;
-			$nuser->personal_mobile = $object->phone;
-			$nuser->birth = $object->date_birth;
-			$nuser->salary = $object->remuneration_proposed;
-			$nuser->fk_user = $jobposition->fk_user_supervisor; // Supervisor
-			$nuser->email = $object->email;
+		$db->begin();
 
-			$result = $nuser->create($user);
+		// Creation user
+		$nuser = new User($db);
+		$nuser->login = GETPOST('login', 'alphanohtml');
+		$nuser->fk_soc = 0;
+		$nuser->employee = 1;
+		$nuser->firstname = $object->firstname;
+		$nuser->lastname = $object->lastname;
+		$nuser->email = '';
+		$nuser->personal_email = $object->email;
+		$nuser->personal_mobile = $object->phone;
+		$nuser->birth = $object->date_birth;
+		$nuser->salary = $object->remuneration_proposed;
+		$nuser->fk_user = $jobposition->fk_user_supervisor; // Supervisor
+		$nuser->email = $object->email;
 
-			if ($result < 0) {
-				$langs->load("errors");
-				setEventMessages($langs->trans($nuser->error), null, 'errors');
-				$action = 'create_user';
-			} else {
-				setEventMessages($langs->trans("NewUserCreated", $nuser->login), null, 'mesgs');
-				$action = '';
-			}
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
+		$result = $nuser->create($user);
+
+		if ($result < 0) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans($nuser->error), null, 'errors');
 			$action = 'create_user';
+		} else {
+			$object->fk_user = $result;
+
+			$object->update($user);
+		}
+
+		if (!$error) {
+			$db->commit();
+
+			setEventMessages($langs->trans("NewUserCreated", $nuser->login), null, 'mesgs');
+			$action = '';
+		} else {
+			$db->rollback();
 		}
 	}
 
@@ -572,8 +580,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Button to convert into a user
 			if ($object->status == $object::STATUS_CONTRACT_SIGNED) {
 				if ($user->rights->user->user->creer) {
-					// TODO Check if a user already exists
-					$useralreadyexists = 0;
+					$useralreadyexists = $object->fk_user;
 					if (empty($useralreadyexists)) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a></div>';
 					} else {

From 1b64068fc8ea36b8ab0fc7784ced61a7c491b656 Mon Sep 17 00:00:00 2001
From: "yann.droniou" <yann.droniou@photospace.fr>
Date: Thu, 2 Mar 2023 16:20:32 +0100
Subject: [PATCH 230/300] Fix PR for ldap is_ressource or is_object in unbind()

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

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 38220f7a17b..1d6e51c633d 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -396,7 +396,7 @@ class Ldap
 	public function unbind()
 	{
 		$this->result = true;
-		if (is_resource($this->connection)) {
+		if (is_resource($this->connection) || is_object($this->connection)) {
 			$this->result = @ldap_unbind($this->connection);
 		}
 		if ($this->result) {

From 71fd9f39d3955375ca56dc809d73130dc24f2a81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 17:39:10 +0100
Subject: [PATCH 231/300] Add comments to help understand what happen

---
 htdocs/accountancy/journal/sellsjournal.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index f67fd76b3f1..2854ba67606 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -248,6 +248,11 @@ if ($result) {
 			$tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
 		}
 
+		// Compensation of data for invoice situation by using $situation_ratio. This works (nearly) for invoice that was not correctly recorded
+		// but it may introduces an error for situation invoices that were correctly saved. There is still rounding problem that differs between
+		// real data we should have stored and result obtained with a compensation.
+		// It also seems that credit notes on situation invoices are correctly saved (but it depends on the version used in fact).
+		// For credit notes, we hope to have situation_ratio = 1 so the compensation has no effect to avoid introducing troubles with credit notes.
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
 		if (empty($line->tva_npr)) {
@@ -255,6 +260,8 @@ if ($result) {
 		}
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1 * $situation_ratio;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2 * $situation_ratio;
+
+
 		$tabcompany[$obj->rowid] = array(
 			'id' => $obj->socid,
 			'name' => $obj->name,
@@ -598,7 +605,8 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	foreach ($tabfac as $key => $val) {
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
-		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
+		$companystatic->code_compta = $tabcompany[$key]['code_compta'];				// deprecated
+		$companystatic->code_compta_client = $tabcompany[$key]['code_compta'];
 		$companystatic->code_client = $tabcompany[$key]['code_client'];
 		$companystatic->client = 3;
 

From 8c0a79b1a304b62be92bd3e089158562a11ba001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 2 Mar 2023 18:16:20 +0100
Subject: [PATCH 232/300] fix bad right

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

diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index f494dddb082..b1ba563da95 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -176,7 +176,7 @@ if ($elemid && $action == 'addintocategory' &&
 	 ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer) ||
 	 ($type == Categorie::TYPE_TICKET && $user->rights->ticket->write) ||
 	 ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer) ||
-	 ($type == Categorie::TYPE_MEMBER && $user->rights->projet->creer) ||
+	 ($type == Categorie::TYPE_MEMBER && $user->hasRight('adherent', 'creer')) ||
 	 ($type == Categorie::TYPE_CONTACT && $user->rights->societe->creer) ||
 	 ($type == Categorie::TYPE_USER && $user->rights->user->user->creer) ||
 	 ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)

From 3578adc3e6bdbea64e10f6ef416ff60ff16da9f6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 18:18:35 +0100
Subject: [PATCH 233/300] Merge pull request #23984 from Yanonix/develop

Fix LDAP Authentification failure with error 500
---
 htdocs/core/class/ldap.class.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index b3d5766daff..95d35b939e4 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -344,12 +344,7 @@ class Ldap
 	 */
 	public function close()
 	{
-		$r_type = get_resource_type($this->connection);
-		if ($this->connection && ($r_type === "Unknown" || !@ldap_close($this->connection))) {
-			return false;
-		} else {
-			return true;
-		}
+		return $this->unbind();
 	}
 
 	/**

From 17771c3990a59fe9ce30cf65b1e7685a07adc84b Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Thu, 2 Mar 2023 18:23:48 +0100
Subject: [PATCH 234/300] NEW : Authorize the link between OF and supplier
 order, even if the associated thirdparty is not the same

---
 htdocs/core/class/html.form.class.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 62fd1db45e6..fc20180737b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8862,8 +8862,7 @@ class Form
 					'perms'=>1,
 					'label'=>'LinkToContract',
 					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht
-							FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."contrat as t, ".$this->db->prefix()."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY s.rowid, s.nom, s.client, t.rowid, t.ref, t.ref_customer, t.ref_supplier'
-				),
+							FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."contrat as t, ".$this->db->prefix()."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY s.rowid, s.nom, s.client, t.rowid, t.ref, t.ref_customer, t.ref_supplier'),
 				'fichinter'=>array(
 					'enabled'=>isModEnabled('ficheinter'),
 					'perms'=>1,
@@ -8896,6 +8895,12 @@ class Form
 			);
 		}
 
+		if($object->table_element == 'commande_fournisseur') {
+			$possiblelinks['mo']['sql'] = "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.rowid, '0' as total_ht FROM ".$this->db->prefix()."societe as s INNER JOIN ".$this->db->prefix().'mrp_mo as t ON t.fk_soc = s.rowid  WHERE t.entity IN ('.getEntity('mo').')';
+		} elseif($object->table_element == 'mrp_mo') {
+			$possiblelinks['order_supplier']['sql'] = "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix().'commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.entity IN ('.getEntity('commande_fournisseur').')';
+		}
+
 		if (!empty($listofidcompanytoscan)) {  // If empty, we don't have criteria to scan the object we can link to
 			// Can complete the possiblelink array
 			$hookmanager->initHooks(array('commonobject'));

From 54bb784138b17cbd9120f9bde481ce3458d0277c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 19:40:28 +0100
Subject: [PATCH 235/300] Debug v18

---
 htdocs/adherents/list.php                     |   3 +-
 htdocs/adherents/subscription/list.php        |   5 +-
 htdocs/comm/propal/list.php                   |   2 +-
 htdocs/compta/bank/list.php                   |   3 +-
 htdocs/compta/bank/various_payment/list.php   | 966 +++++++++---------
 htdocs/compta/facture/list.php                |   2 +-
 htdocs/compta/localtax/list.php               |  11 +-
 htdocs/compta/paiement/cheque/list.php        |   5 +-
 htdocs/compta/prelevement/list.php            |   6 +-
 htdocs/compta/prelevement/orders_list.php     |   1 -
 htdocs/compta/sociales/list.php               |   6 +-
 htdocs/compta/tva/list.php                    |   6 +-
 htdocs/contrat/list.php                       |   1 -
 htdocs/don/list.php                           |   5 +-
 htdocs/expensereport/list.php                 |  12 +-
 htdocs/expensereport/payment/list.php         |   5 +-
 htdocs/fichinter/list.php                     |   3 +-
 htdocs/fourn/commande/list.php                |   2 +-
 htdocs/fourn/facture/list.php                 |   5 +-
 htdocs/holiday/list.php                       |   5 +-
 htdocs/hrm/evaluation_list.php                |   3 +-
 htdocs/hrm/skill_list.php                     |   5 +-
 htdocs/loan/list.php                          |   5 +-
 htdocs/mrp/mo_list.php                        |   5 +-
 htdocs/product/stock/list.php                 |   3 +-
 .../recruitmentcandidature_list.php           |  84 +-
 .../recruitmentjobposition_list.php           |  10 +-
 htdocs/salaries/list.php                      |   5 +-
 htdocs/salaries/payments.php                  |  10 +-
 htdocs/supplier_proposal/list.php             |   6 +-
 30 files changed, 622 insertions(+), 568 deletions(-)

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index b44abce662d..4acafa49b00 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -1014,7 +1014,8 @@ print "</tr>\n";
 $i = 0;
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < min($num, $limit)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $maxinloop) {
 	$obj = $db->fetch_object($resql);
 
 	$datefin = $db->jdate($obj->datefin);
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 45fbc99b816..4cd21775ae7 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -502,7 +502,8 @@ print "</tr>\n";
 
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < min($num, $limit)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($result);
 
 	$subscription->ref = $obj->crowid;
@@ -546,7 +547,7 @@ while ($i < min($num, $limit)) {
 		}
 		// Output Kanban
 		print $subscription->getKanbanView('');
-		if ($i == (min($num, $limit) - 1)) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index a6179f93417..5b0fd0bd105 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -1723,7 +1723,7 @@ if ($resql) {
 			$objectstatic->author = $userstatic->getNomUrl(1);
 			$objectstatic->fk_project = $projectstatic->getNomUrl(1);
 			print $objectstatic->getKanbanView('');
-			if ($i == (min($num, $limit) - 1)) {
+			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
 			}
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index bc2c2528d07..073e9de9a15 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -574,6 +574,7 @@ $total = array();
 $found = 0;
 $i = 0;
 $lastcurrencycode = '';
+$imaxinloop = ($limit ? min($num, $limit) : $num);
 
 foreach ($accounts as $key => $type) {
 	if ($i >= $limit) {
@@ -600,7 +601,7 @@ foreach ($accounts as $key => $type) {
 		}
 		// Output Kanban
 		print $objecttmp->getKanbanView('');
-		if ($i == (min($num, $limit) - 1)) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 204ea92041f..d72238e3fe6 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -85,9 +85,10 @@ $search_type_id = GETPOST('search_type_id', 'int');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) {
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
-}	 // If $page is not defined, or '' or -1
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -174,6 +175,14 @@ $result = restrictedArea($user, 'banque', '', '', '');
  * Actions
  */
 
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
@@ -183,6 +192,23 @@ if ($reshook < 0) {
 if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
+		}
+		$toselect = array();
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+			$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 }
 
 /*
@@ -282,7 +308,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		dol_print_error($db);
 	}
 
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller than paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -296,520 +322,526 @@ if ($limit) {
 }
 
 $resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
 
-	// Direct jump if only one record found
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
-		$obj = $db->fetch_object($resql);
-		$id = $obj->rowid;
-		header("Location: ".DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$id);
-		exit;
-	}
+$num = $db->num_rows($resql);
 
-	// must be place behind the last "header(...)" call
-	llxHeader('', $langs->trans("VariousPayments"));
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$id);
+	exit;
+}
 
-	$i = 0;
-	$total = 0;
+// must be place behind the last "header(...)" call
+llxHeader('', $langs->trans("VariousPayments"));
 
-	$param = '';
-	if (!empty($mode)) {
-		$param .= '&mode='.urlencode($mode);
-	}
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-		$param .= '&contextpage='.urlencode($contextpage);
-	}
-	if ($limit > 0 && $limit != $conf->liste_limit) {
-		$param .= '&limit='.urlencode($limit);
-	}
-	if ($search_ref) {
-		$param .= '&search_ref='.urlencode($search_ref);
-	}
-	if ($search_label) {
-		$param .= '&search_label='.urlencode($search_label);
-	}
-	if ($search_datep_start) {
-		$param .= '&search_datep_start='.urlencode($search_datep_start);
-	}
-	if ($search_datep_end) {
-		$param .= '&search_datep_end='.urlencode($search_datep_end);
-	}
-	if ($search_datev_start) {
-		$param .= '&search_datev_start='.urlencode($search_datev_start);
-	}
-	if ($search_datev_end) {
-		$param .= '&search_datev_end='.urlencode($search_datev_end);
-	}
-	if ($search_type_id > 0) {
-		$param .= '&search_type_id='.urlencode($search_type_id);
-	}
-	if ($search_amount_deb) {
-		$param .= '&search_amount_deb='.urlencode($search_amount_deb);
-	}
-	if ($search_amount_cred) {
-		$param .= '&search_amount_cred='.urlencode($search_amount_cred);
-	}
-	if ($search_bank_account > 0) {
-		$param .= '&search_account='.urlencode($search_bank_account);
-	}
-	if ($search_accountancy_account > 0) {
-		$param .= '&search_accountancy_account='.urlencode($search_accountancy_account);
-	}
-	if ($search_accountancy_subledger > 0) {
-		$param .= '&search_accountancy_subledger='.urlencode($search_accountancy_subledger);
-	}
-	if ($optioncss != '') {
-		$param .= '&optioncss='.urlencode($optioncss);
-	}
+$i = 0;
+$total = 0;
 
-	$url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create';
-	if (!empty($socid)) {
-		$url .= '&socid='.urlencode($socid);
-	}
-	$newcardbutton  = '';
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->modifier);
+$param = '';
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($search_ref) {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if ($search_label) {
+	$param .= '&search_label='.urlencode($search_label);
+}
+if ($search_datep_start) {
+	$param .= '&search_datep_start='.urlencode($search_datep_start);
+}
+if ($search_datep_end) {
+	$param .= '&search_datep_end='.urlencode($search_datep_end);
+}
+if ($search_datev_start) {
+	$param .= '&search_datev_start='.urlencode($search_datev_start);
+}
+if ($search_datev_end) {
+	$param .= '&search_datev_end='.urlencode($search_datev_end);
+}
+if ($search_type_id > 0) {
+	$param .= '&search_type_id='.urlencode($search_type_id);
+}
+if ($search_amount_deb) {
+	$param .= '&search_amount_deb='.urlencode($search_amount_deb);
+}
+if ($search_amount_cred) {
+	$param .= '&search_amount_cred='.urlencode($search_amount_cred);
+}
+if ($search_bank_account > 0) {
+	$param .= '&search_account='.urlencode($search_bank_account);
+}
+if ($search_accountancy_account > 0) {
+	$param .= '&search_accountancy_account='.urlencode($search_accountancy_account);
+}
+if ($search_accountancy_subledger > 0) {
+	$param .= '&search_accountancy_subledger='.urlencode($search_accountancy_subledger);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+$url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create';
+if (!empty($socid)) {
+	$url .= '&socid='.urlencode($socid);
+}
+$newcardbutton  = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->modifier);
 
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
-	print_barre_liste($langs->trans("MenuVariousPayment"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($langs->trans("MenuVariousPayment"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-	if ($search_all) {
-		foreach ($fieldstosearchall as $key => $val) {
-			$fieldstosearchall[$key] = $langs->trans($val);
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
+$moreforfilter= '';
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
+
+print '<tr class="liste_titre">';
+
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+}
+
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Ref
+if ($arrayfields['ref']['checked']) {
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" size="3" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Label
+if ($arrayfields['label']['checked']) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
+	print '</td>';
+}
+
+// Payment date
+if ($arrayfields['datep']['checked']) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_datep_start ? $search_datep_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_datep_end ? $search_datep_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
+	print '</td>';
+}
+
+// Value date
+if ($arrayfields['datev']['checked']) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_datev_start ? $search_datev_start : -1, 'search_date_value_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_datev_end ? $search_datev_end : -1, 'search_date_value_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
+	print '</td>';
+}
+
+// Payment type
+if ($arrayfields['type']['checked']) {
+	print '<td class="liste_titre center">';
+	print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth100', 1);
+	print '</td>';
+}
+
+// Project
+if ($arrayfields['project']['checked']) {
+	print '<td class="liste_titre">';
+	// TODO
+	print '</td>';
+}
+
+// Bank account
+if ($arrayfields['bank']['checked']) {
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_bank_account, 'search_account', 0, '', 1, '', 0, 'maxwidth100');
+	print '</td>';
+}
+
+// Bank entry
+if ($arrayfields['entry']['checked']) {
+	print '<td class="liste_titre left">';
+	print '<input name="search_bank_entry" class="flat maxwidth50" type="text" value="'.dol_escape_htmltag($search_bank_entry).'">';
+	print '</td>';
+}
+
+// Accounting account
+if (!empty($arrayfields['account']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<div class="nowrap">';
+	print $formaccounting->select_account($search_accountancy_account, 'search_accountancy_account', 1, array(), 1, 1, 'maxwidth200');
+	print '</div>';
+	print '</td>';
+}
+
+// Subledger account
+if (!empty($arrayfields['subledger']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<div class="nowrap">';
+	print $formaccounting->select_auxaccount($search_accountancy_subledger, 'search_accountancy_subledger', 1, 'maxwidth200');
+	print '</div>';
+	print '</td>';
+}
+
+// Debit
+if (!empty($arrayfields['debit']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input name="search_amount_deb" class="flat maxwidth50" type="text" value="'.dol_escape_htmltag($search_amount_deb).'">';
+	print '</td>';
+}
+
+// Credit
+if ($arrayfields['credit']['checked']) {
+	print '<td class="liste_titre right">';
+	print '<input name="search_amount_cred" class="flat maxwidth50" type="text" size="8" value="'.dol_escape_htmltag($search_amount_cred).'">';
+	print '</td>';
+}
+
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+}
+
+print '</tr>';
+
+
+print '<tr class="liste_titre">';
+
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
+}
+
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+}
+
+if ($arrayfields['ref']['checked']) {
+	print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], 'v.rowid', '', $param, '', $sortfield, $sortorder);
+}
+if ($arrayfields['label']['checked']) {
+	print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder);
+}
+if ($arrayfields['datep']['checked']) {
+	print_liste_field_titre($arrayfields['datep']['label'], $_SERVER["PHP_SELF"], 'v.datep,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if ($arrayfields['datev']['checked']) {
+	print_liste_field_titre($arrayfields['datev']['label'], $_SERVER["PHP_SELF"], 'v.datev,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if ($arrayfields['type']['checked']) {
+	print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if ($arrayfields['project']['checked']) {
+	print_liste_field_titre($arrayfields['project']['label'], $_SERVER["PHP_SELF"], 'fk_project', '', $param, '', $sortfield, $sortorder);
+}
+if ($arrayfields['bank']['checked']) {
+	print_liste_field_titre($arrayfields['bank']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+}
+if ($arrayfields['entry']['checked']) {
+	print_liste_field_titre($arrayfields['entry']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['account']['checked'])) {
+	print_liste_field_titre($arrayfields['account']['label'], $_SERVER["PHP_SELF"], 'v.accountancy_code', '', $param, '', $sortfield, $sortorder, 'left ');
+}
+if (!empty($arrayfields['subledger']['checked'])) {
+	print_liste_field_titre($arrayfields['subledger']['label'], $_SERVER["PHP_SELF"], 'v.subledger_account', '', $param, '', $sortfield, $sortorder, 'left ');
+}
+if ($arrayfields['debit']['checked']) {
+	print_liste_field_titre($arrayfields['debit']['label'], $_SERVER["PHP_SELF"], 'v.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+}
+if ($arrayfields['credit']['checked']) {
+	print_liste_field_titre($arrayfields['credit']['label'], $_SERVER["PHP_SELF"], 'v.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
+}
+print '</tr>';
+
+
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+$totalarray['val']['total_cred'] = 0;
+$totalarray['val']['total_deb'] = 0;
+
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
+	$obj = $db->fetch_object($resql);
+
+	$variousstatic->id = $obj->rowid;
+	$variousstatic->ref = $obj->rowid;
+	$variousstatic->label = $obj->label;
+	$variousstatic->datep = $obj->datep;
+	$variousstatic->type_payment = $obj->payment_code;
+	$bankline->fetch($obj->fk_bank);
+	$variousstatic->fk_bank = $bankline->getNomUrl(1);
+	$variousstatic->amount = $obj->amount;
+
+	$accountingaccount->fetch('', $obj->accountancy_code, 1);
+	$variousstatic->accountancy_code = $accountingaccount->getNomUrl(0, 0, 1, $obj->accountingaccount, 1);
+
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="12">';
+			print '<div class="box-flex-container kanban">';
 		}
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
-	}
-
-	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
-	$moreforfilter= '';
-
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
-
-	print '<tr class="liste_titre">';
-
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="liste_titre maxwidthsearch">';
-		$searchpicto = $form->showFilterAndCheckAddButtons(0);
-		print $searchpicto;
-		print '</td>';
-	}
-
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-
-	// Ref
-	if ($arrayfields['ref']['checked']) {
-		print '<td class="liste_titre left">';
-		print '<input class="flat" type="text" size="3" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-		print '</td>';
-	}
-
-	// Label
-	if ($arrayfields['label']['checked']) {
-		print '<td class="liste_titre">';
-		print '<input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
-		print '</td>';
-	}
-
-	// Payment date
-	if ($arrayfields['datep']['checked']) {
-		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
-		print $form->selectDate($search_datep_start ? $search_datep_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '<div class="nowrap">';
-		print $form->selectDate($search_datep_end ? $search_datep_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-		print '</div>';
-		print '</td>';
-	}
-
-	// Value date
-	if ($arrayfields['datev']['checked']) {
-		print '<td class="liste_titre center">';
-		print '<div class="nowrap">';
-		print $form->selectDate($search_datev_start ? $search_datev_start : -1, 'search_date_value_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-		print '</div>';
-		print '<div class="nowrap">';
-		print $form->selectDate($search_datev_end ? $search_datev_end : -1, 'search_date_value_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-		print '</div>';
-		print '</td>';
-	}
-
-	// Payment type
-	if ($arrayfields['type']['checked']) {
-		print '<td class="liste_titre center">';
-		print $form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth100', 1);
-		print '</td>';
-	}
-
-	// Project
-	if ($arrayfields['project']['checked']) {
-		print '<td class="liste_titre">';
-		// TODO
-		print '</td>';
-	}
-
-	// Bank account
-	if ($arrayfields['bank']['checked']) {
-		print '<td class="liste_titre">';
-		$form->select_comptes($search_bank_account, 'search_account', 0, '', 1, '', 0, 'maxwidth100');
-		print '</td>';
-	}
-
-	// Bank entry
-	if ($arrayfields['entry']['checked']) {
-		print '<td class="liste_titre left">';
-		print '<input name="search_bank_entry" class="flat maxwidth50" type="text" value="'.dol_escape_htmltag($search_bank_entry).'">';
-		print '</td>';
-	}
-
-	// Accounting account
-	if (!empty($arrayfields['account']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<div class="nowrap">';
-		print $formaccounting->select_account($search_accountancy_account, 'search_accountancy_account', 1, array(), 1, 1, 'maxwidth200');
-		print '</div>';
-		print '</td>';
-	}
-
-	// Subledger account
-	if (!empty($arrayfields['subledger']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<div class="nowrap">';
-		print $formaccounting->select_auxaccount($search_accountancy_subledger, 'search_accountancy_subledger', 1, 'maxwidth200');
-		print '</div>';
-		print '</td>';
-	}
-
-	// Debit
-	if (!empty($arrayfields['debit']['checked'])) {
-		print '<td class="liste_titre right">';
-		print '<input name="search_amount_deb" class="flat maxwidth50" type="text" value="'.dol_escape_htmltag($search_amount_deb).'">';
-		print '</td>';
-	}
-
-	// Credit
-	if ($arrayfields['credit']['checked']) {
-		print '<td class="liste_titre right">';
-		print '<input name="search_amount_cred" class="flat maxwidth50" type="text" size="8" value="'.dol_escape_htmltag($search_amount_cred).'">';
-		print '</td>';
-	}
-
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print '<td class="liste_titre maxwidthsearch">';
-		$searchpicto = $form->showFilterAndCheckAddButtons(0);
-		print $searchpicto;
-		print '</td>';
-	}
-
-	print '</tr>';
-
-
-	print '<tr class="liste_titre">';
-
-	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
-	}
-
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-		print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
-	}
-
-	if ($arrayfields['ref']['checked']) {
-		print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], 'v.rowid', '', $param, '', $sortfield, $sortorder);
-	}
-	if ($arrayfields['label']['checked']) {
-		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder);
-	}
-	if ($arrayfields['datep']['checked']) {
-		print_liste_field_titre($arrayfields['datep']['label'], $_SERVER["PHP_SELF"], 'v.datep,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if ($arrayfields['datev']['checked']) {
-		print_liste_field_titre($arrayfields['datev']['label'], $_SERVER["PHP_SELF"], 'v.datev,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if ($arrayfields['type']['checked']) {
-		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'center ');
-	}
-	if ($arrayfields['project']['checked']) {
-		print_liste_field_titre($arrayfields['project']['label'], $_SERVER["PHP_SELF"], 'fk_project', '', $param, '', $sortfield, $sortorder);
-	}
-	if ($arrayfields['bank']['checked']) {
-		print_liste_field_titre($arrayfields['bank']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
-	}
-	if ($arrayfields['entry']['checked']) {
-		print_liste_field_titre($arrayfields['entry']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
-	}
-	if (!empty($arrayfields['account']['checked'])) {
-		print_liste_field_titre($arrayfields['account']['label'], $_SERVER["PHP_SELF"], 'v.accountancy_code', '', $param, '', $sortfield, $sortorder, 'left ');
-	}
-	if (!empty($arrayfields['subledger']['checked'])) {
-		print_liste_field_titre($arrayfields['subledger']['label'], $_SERVER["PHP_SELF"], 'v.subledger_account', '', $param, '', $sortfield, $sortorder, 'left ');
-	}
-	if ($arrayfields['debit']['checked']) {
-		print_liste_field_titre($arrayfields['debit']['label'], $_SERVER["PHP_SELF"], 'v.amount', '', $param, '', $sortfield, $sortorder, 'right ');
-	}
-	if ($arrayfields['credit']['checked']) {
-		print_liste_field_titre($arrayfields['credit']['label'], $_SERVER["PHP_SELF"], 'v.amount', '', $param, '', $sortfield, $sortorder, 'right ');
-	}
-
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
-	}
-	print '</tr>';
-
-
-	$totalarray = array();
-	$totalarray['nbfield'] = 0;
-	$totalarray['val']['total_cred'] = 0;
-	$totalarray['val']['total_deb'] = 0;
-
-	while ($i < min($num, $limit)) {
-		$obj = $db->fetch_object($resql);
-
-		$variousstatic->id = $obj->rowid;
-		$variousstatic->ref = $obj->rowid;
-		$variousstatic->label = $obj->label;
-		$variousstatic->datep = $obj->datep;
-		$variousstatic->type_payment = $obj->payment_code;
-		$bankline->fetch($obj->fk_bank);
-		$variousstatic->fk_bank = $bankline->getNomUrl(1);
-		$variousstatic->amount = $obj->amount;
-
-		$accountingaccount->fetch('', $obj->accountancy_code, 1);
-		$variousstatic->accountancy_code = $accountingaccount->getNomUrl(0, 0, 1, $obj->accountingaccount, 1);
-
-		if ($mode == 'kanban') {
-			if ($i == 0) {
-				print '<tr><td colspan="12">';
-				print '<div class="box-flex-container kanban">';
+		// Output Kanban
+		print $variousstatic->getKanbanView('');
+		if ($i == ($imaxinloop) - 1) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td></td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-			// Output Kanban
+		}
 
-			print $variousstatic->getKanbanView('');
-			if ($i == (min($num, $limit) - 1)) {
-				print '</div>';
-				print '</td></tr>';
+		// No
+		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+			print '<td>'.(($offset * $limit) + $i).'</td>';
+		}
+
+		// Ref
+		if ($arrayfields['ref']['checked']) {
+			print '<td>'.$variousstatic->getNomUrl(1)."</td>";
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-		} else {
-			print '<tr class="oddeven">';
+		}
 
-			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td></td>';
+		// Label payment
+		if ($arrayfields['label']['checked']) {
+			print '<td class="tdoverflowmax150" title="'.$variousstatic->label.'">'.$variousstatic->label."</td>";
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
+		}
 
-			// No
-			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-				print '<td>'.(($offset * $limit) + $i).'</td>';
+		// Date payment
+		if ($arrayfields['datep']['checked']) {
+			print '<td class="center">'.dol_print_date($obj->datep, 'day')."</td>";
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
+		}
 
-			// Ref
-			if ($arrayfields['ref']['checked']) {
-				print '<td>'.$variousstatic->getNomUrl(1)."</td>";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
+
+		// Date value
+		if ($arrayfields['datev']['checked']) {
+			print '<td class="center">'.dol_print_date($obj->datev, 'day')."</td>";
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
+		}
 
-			// Label payment
-			if ($arrayfields['label']['checked']) {
-				print '<td class="tdoverflowmax150" title="'.$variousstatic->label.'">'.$variousstatic->label."</td>";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
+		// Type
+		if ($arrayfields['type']['checked']) {
+			print '<td class="center">';
+			if ($obj->payment_code) {
+				print $langs->trans("PaymentTypeShort".$obj->payment_code);
+				print ' ';
 			}
-
-			// Date payment
-			if ($arrayfields['datep']['checked']) {
-				print '<td class="center">'.dol_print_date($obj->datep, 'day')."</td>";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
+			print $obj->num_payment;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
+		}
 
-
-			// Date value
-			if ($arrayfields['datev']['checked']) {
-				print '<td class="center">'.dol_print_date($obj->datev, 'day')."</td>";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
+		// Project
+		if ($arrayfields['project']['checked']) {
+			print '<td class="nowraponall">';
+			if ($obj->fk_project > 0) {
+				$proj->fetch($obj->fk_project);
+				print $proj->getNomUrl(1);
 			}
-
-			// Type
-			if ($arrayfields['type']['checked']) {
-				print '<td class="center">';
-				if ($obj->payment_code) {
-					print $langs->trans("PaymentTypeShort".$obj->payment_code);
-					print ' ';
-				}
-				print $obj->num_payment;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
+		}
 
-			// Project
-			if ($arrayfields['project']['checked']) {
-				print '<td class="nowraponall">';
-				if ($obj->fk_project > 0) {
-					$proj->fetch($obj->fk_project);
-					print $proj->getNomUrl(1);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
+		// Bank account
+		if ($arrayfields['bank']['checked']) {
+			print '<td class="nowraponall">';
+			if ($obj->bid > 0) {
+				$accountstatic->id = $obj->bid;
+				$accountstatic->ref = $obj->bref;
+				$accountstatic->number = $obj->bnumber;
+
+				if (isModEnabled('accounting')) {
+					$accountstatic->account_number = $obj->bank_account_number;
+					$accountingjournal->fetch($obj->accountancy_journal);
+					$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
 				}
+
+				$accountstatic->label = $obj->blabel;
+				print $accountstatic->getNomUrl(1);
+			} else {
+				print '&nbsp;';
 			}
-
-			// Bank account
-			if ($arrayfields['bank']['checked']) {
-				print '<td class="nowraponall">';
-				if ($obj->bid > 0) {
-					$accountstatic->id = $obj->bid;
-					$accountstatic->ref = $obj->bref;
-					$accountstatic->number = $obj->bnumber;
-
-					if (isModEnabled('accounting')) {
-						$accountstatic->account_number = $obj->bank_account_number;
-						$accountingjournal->fetch($obj->accountancy_journal);
-						$accountstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-					}
-
-					$accountstatic->label = $obj->blabel;
-					print $accountstatic->getNomUrl(1);
-				} else {
-					print '&nbsp;';
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
+		}
 
-			// Bank entry
-			if ($arrayfields['entry']['checked']) {
-				$bankline->fetch($obj->fk_bank);
-				print '<td>'.$bankline->getNomUrl(1).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
+		// Bank entry
+		if ($arrayfields['entry']['checked']) {
+			$bankline->fetch($obj->fk_bank);
+			print '<td>'.$bankline->getNomUrl(1).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
+		}
 
-			// Accounting account
-			if (!empty($arrayfields['account']['checked'])) {
-				$accountingaccount->fetch('', $obj->accountancy_code, 1);
+		// Accounting account
+		if (!empty($arrayfields['account']['checked'])) {
+			$accountingaccount->fetch('', $obj->accountancy_code, 1);
 
-				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->accountancy_code.' '.$accountingaccount->label).'">'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->accountancy_code.' '.$accountingaccount->label).'">'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
+		}
 
-			// Accounting subledger account
-			if (!empty($arrayfields['subledger']['checked'])) {
-				print '<td class="tdoverflowmax150">'.length_accounta($obj->subledger_account).'</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
+		// Accounting subledger account
+		if (!empty($arrayfields['subledger']['checked'])) {
+			print '<td class="tdoverflowmax150">'.length_accounta($obj->subledger_account).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
+		}
 
-			// Debit
-			if ($arrayfields['debit']['checked']) {
-				print '<td class="nowrap right">';
-				if ($obj->sens == 0) {
-					print '<span class="amount">'.price($obj->amount).'</span>';
-					$totalarray['val']['total_deb'] += $obj->amount;
-				}
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'total_deb';
-				}
-				print '</td>';
-			}
-
-			// Credit
-			if ($arrayfields['credit']['checked']) {
-				print '<td class="nowrap right">';
-				if ($obj->sens == 1) {
-					print '<span class="amount">'.price($obj->amount).'</span>';
-					$totalarray['val']['total_cred'] += $obj->amount;
-				}
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'total_cred';
-				}
-				print '</td>';
-			}
-
-			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td></td>';
+		// Debit
+		if ($arrayfields['debit']['checked']) {
+			print '<td class="nowrap right">';
+			if ($obj->sens == 0) {
+				print '<span class="amount">'.price($obj->amount).'</span>';
+				$totalarray['val']['total_deb'] += $obj->amount;
 			}
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-
-			print '</tr>'."\n";
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_deb';
+			}
+			print '</td>';
 		}
-		$i++;
-	}
 
-	// Show total line
-	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+		// Credit
+		if ($arrayfields['credit']['checked']) {
+			print '<td class="nowrap right">';
+			if ($obj->sens == 1) {
+				print '<span class="amount">'.price($obj->amount).'</span>';
+				$totalarray['val']['total_cred'] += $obj->amount;
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_cred';
+			}
+			print '</td>';
+		}
 
-	// If no record found
-	if ($num == 0) {
-		$colspan = 1;
-		foreach ($arrayfields as $key => $val) {
-			if (!empty($val['checked'])) {
-				$colspan++;
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td></td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
 		}
-		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+
+		print '</tr>'."\n";
 	}
-
-	$db->free($resql);
-
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-	print '</table>'."\n";
-	print '</div>'."\n";
-
-	print '</form>'."\n";
-} else {
-	dol_print_error($db);
+	$i++;
 }
 
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
+
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 23c7d87f87a..5f9d0c507d3 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -1928,7 +1928,7 @@ if ($resql) {
 				$userstatic->fetch($obj->fk_user_author);
 				$facturestatic->fk_user_author = $userstatic->getNomUrl(1);
 				print $facturestatic->getKanbanView('');
-				if ($i == (min($num, $limit) - 1)) {
+				if ($i == ($imaxinloop - 1)) {
 					print '</div>';
 					print '</td></tr>';
 				}
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 23fd1186e0e..dbd3bdafdbf 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -28,15 +28,19 @@ require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
 // Load translation files required by the page
 $langs->load("compta");
 
+$limit = GETPOST('limit', 'int');
+
 // Security check
 $socid = GETPOST('socid', 'int');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 $ltt = GETPOST("localTaxType", 'int');
 $mode = GETPOST('mode', 'alpha');
 
+
 /*
  * View
  */
@@ -80,8 +84,9 @@ if ($result) {
 	print '<td class="nowrap" align="left">'.$langs->trans("DatePayment").'</td>';
 	print "<td align=\"right\">".$langs->trans("PayedByThisPayment")."</td>";
 	print "</tr>\n";
-	$var = 1;
-	while ($i < $num) {
+
+	$imaxinloop = ($limit ? min($num, $limit) : $num);
+	while ($i < $imaxinloop) {
 		$obj = $db->fetch_object($result);
 
 		$localtax_static->label = $obj->label;
@@ -100,7 +105,7 @@ if ($result) {
 			}
 			// Output Kanban
 			print $localtax_static->getKanbanView('');
-			if ($i == ($num - 1)) {
+			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
 			}
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 794db8df39b..3c617a2db0c 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -226,7 +226,8 @@ if ($resql) {
 	print "</tr>\n";
 
 	if ($num > 0) {
-		while ($i < min($num, $limit)) {
+		$imaxinloop = ($limit ? min($num, $limit) : $num);
+		while ($i < $imaxinloop) {
 			$objp = $db->fetch_object($resql);
 
 			$checkdepositstatic->id = $objp->rowid;
@@ -247,7 +248,7 @@ if ($resql) {
 				}
 				// Output Kanban
 				print $checkdepositstatic->getKanbanView('');
-				if ($i == (min($num, $limit) - 1)) {
+				if ($i == ($imaxinloop - 1)) {
 					print '</div>';
 					print '</td></tr>';
 				}
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index ad8570d9268..307a7239fe8 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -265,7 +265,8 @@ if ($result) {
 	print "</tr>\n";
 
 	if ($num) {
-		while ($i < min($num, $limit)) {
+		$imaxinloop = ($limit ? min($num, $limit) : $num);
+		while ($i < $imaxinloop) {
 			$obj = $db->fetch_object($result);
 
 			$bon->id = $obj->rowid;
@@ -285,9 +286,8 @@ if ($result) {
 					print '<div class="box-flex-container kanban">';
 				}
 				// Output Kanban
-
 				print $bon->getKanbanView('');
-				if ($i == (min($num, $limit) - 1)) {
+				if ($i == ($imaxinloop - 1)) {
 					print '</div>';
 					print '</td></tr>';
 				}
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index c2e8c5e4194..8dd056ed796 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -239,7 +239,6 @@ if ($result) {
 					print '<div class="box-flex-container kanban">';
 				}
 				// Output Kanban
-
 				print $directdebitorder->getKanbanView('');
 				if ($i == (min($num, $limit) - 1)) {
 					print '</div>';
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 498a28a54f5..297dc3f7de5 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -594,7 +594,8 @@ $i = 0;
 $totalarray = $TLoadedUsers = array();
 $totalarray['nbfield'] = 0;
 $totalarray['val']['totalttcfield'] = 0;
-while ($i < min($num, $limit)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 
 	$chargesociale_static->id = $obj->rowid;
@@ -617,10 +618,9 @@ while ($i < min($num, $limit)) {
 			print '<div class="box-flex-container kanban">';
 		}
 		// Output Kanban
-
 		$chargesociale_static->fk_project = $projectstatic->getNomUrl();
 		print $chargesociale_static->getKanbanView('');
-		if ($i == (min($num, $limit) - 1)) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 80f73c6fe44..44aa49361f9 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -475,7 +475,8 @@ $totalarray = array();
 $totalarray['nbfield'] = 0;
 $total = 0;
 
-while ($i < min($num, $limit)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 
 	$tva_static->id = $obj->rowid;
@@ -492,9 +493,8 @@ while ($i < min($num, $limit)) {
 			print '<div class="box-flex-container kanban">';
 		}
 		// Output Kanban
-
 		print $tva_static->getKanbanView('');
-		if ($i == (min($num, $limit) - 1)) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 03e65e18988..b55e09bd252 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -990,7 +990,6 @@ while ($i < $imaxinloop) {
 			print '<tr><td colspan="'.$savnbfield.'">';
 			print '<div class="box-flex-container kanban">';
 		}
-
 		// Output Kanban
 		$contracttmp->societe = $socstatic->getNomUrl();
 		$contracttmp->date_contrat = $obj->date_contrat;
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index a895db4f3a6..320c1616d22 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -289,7 +289,8 @@ if ($resql) {
 	}
 	print "</tr>\n";
 
-	while ($i < min($num, $limit)) {
+	$imaxinloop = ($limit ? min($num, $limit) : $num);
+	while ($i < $imaxinloop) {
 		$objp = $db->fetch_object($resql);
 		$donationstatic->setVarsFromFetchObj($objp);
 		$company = new Societe($db);
@@ -314,7 +315,7 @@ if ($resql) {
 			}
 
 			print $donationstatic->getKanbanView('');
-			if ($i == (min($num, $limit) - 1)) {
+			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
 			}
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index c093bbfd721..1edf6c0edca 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -732,6 +732,8 @@ if ($resql) {
 		$totalarray['val']['d.total_tva'] = 0;
 		$totalarray['val']['d.total_ttc'] = 0;
 		$totalarray['totalizable'] = array();
+
+		$imaxinloop = ($limit ? min($num, $limit) : $num);
 		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 
@@ -756,14 +758,12 @@ if ($resql) {
 				$expensereportstatic->fk_user_author = $usertmp->getNomUrl(1);
 
 				// Output Kanban
-				if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-					if ($massactionbutton || $massaction) {
-						$selected = 0;
+				if ($massactionbutton || $massaction) {
+					$selected = 0;
 
-						print $expensereportstatic->getKanbanView('');
-					}
+					print $expensereportstatic->getKanbanView('');
 				}
-				if ($i == (min($num, $limit) - 1)) {
+				if ($i == ($imaxinloop - 1)) {
 					print '</div>';
 					print '</td></tr>';
 				}
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
index c236e72d514..18420e7ac20 100644
--- a/htdocs/expensereport/payment/list.php
+++ b/htdocs/expensereport/payment/list.php
@@ -477,7 +477,8 @@ $i = 0;
 $savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < min($num, $limit)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$objp = $db->fetch_object($resql);
 
 	$paymentexpensereportstatic->id = $objp->rowid;
@@ -504,7 +505,7 @@ while ($i < min($num, $limit)) {
 		}
 		// Output Kanban
 		print $paymentexpensereportstatic->getKanbanView('');
-		if ($i == (min($num, $limit) - 1)) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index f3e88404f6d..86554408a23 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -714,9 +714,8 @@ while ($i < $imaxinloop) {
 		$objectstatic->duration = $obj->duree;
 		$objectstatic->socid = $companystatic->getNomUrl(1, '', 44);
 
-
 		print $objectstatic->getKanbanView('');
-		if ($i == (min($num, $limit) - 1)) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index b6e94712e0b..6f326a75250 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1686,7 +1686,7 @@ if ($resql) {
 			$objectstatic->socid = $thirdpartytmp->getNomUrl('supplier', 0, 0, -1);
 			// Output Kanban
 			print $objectstatic->getKanbanView('');
-			if ($i == (min($num, $limit) - 1)) {
+			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
 			}
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 043a92b0648..a5363fd6c19 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -1359,7 +1359,8 @@ if ($num > 0) {
 	$totalarray['val']['f.total_localtax1']=0;
 	$totalarray['val']['f.total_ttc']=0;
 
-	while ($i < min($num, $limit)) {
+	$imaxinloop = ($limit ? min($num, $limit) : $num);
+	while ($i < $imaxinloop) {
 		$obj = $db->fetch_object($resql);
 
 		$datelimit = $db->jdate($obj->datelimite);
@@ -1423,7 +1424,7 @@ if ($num > 0) {
 			$facturestatic->total_ht = $obj->total_ht;
 			$facturestatic->date = $obj->datef;
 			print $facturestatic->getKanbanView('');
-			if ($i == (min($num, $limit) - 1)) {
+			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
 			}
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 421da582e0d..3f8f9d69131 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -790,7 +790,8 @@ if ($resql) {
 		$totalarray = array();
 		$totalarray['nbfield'] = 0;
 		$totalduration = 0;
-		while ($i < min($num, $limit)) {
+		$imaxinloop = ($limit ? min($num, $limit) : $num);
+		while ($i < $imaxinloop) {
 			$obj = $db->fetch_object($resql);
 
 			// Leave request
@@ -852,7 +853,7 @@ if ($resql) {
 					$arraydata = array('user'=>$userstatic, 'labeltype'=>$labeltypeleavetoshow);
 					print $holidaystatic->getKanbanView('', $arraydata);
 				}
-				if ($i == (min($num, $limit) - 1)) {
+				if ($i == ($imaxinloop - 1)) {
 					print '</div>';
 					print '</td></tr>';
 				}
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index f39030cf3d5..b4c0ebe9f02 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -567,7 +567,8 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 $i = 0;
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index e9d3564c1a4..796c1abd57d 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -544,7 +544,8 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 $i = 0;
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxiloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -570,7 +571,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			}
 			print $object->getKanbanView('');
 		}
-		if ($i == (min($num, $limit) - 1)) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
diff --git a/htdocs/loan/list.php b/htdocs/loan/list.php
index d3eace18a88..57e5ef97d97 100644
--- a/htdocs/loan/list.php
+++ b/htdocs/loan/list.php
@@ -270,7 +270,8 @@ if ($resql) {
 	// --------------------------------------------------------------------
 	$i = 0;
 	$totalarray = array();
-	while ($i < ($limit ? min($num, $limit) : $num)) {
+	$imaxinloop = ($limit ? min($num, $limit) : $num);
+	while ($i < $imaxinloop) {
 		$obj = $db->fetch_object($resql);
 		if (empty($obj)) {
 			break; // Should not happen
@@ -294,7 +295,7 @@ if ($resql) {
 			$loan_static->totalpaid = $obj->paid;
 
 			print $loan_static->getKanbanView('');
-			if ($i == (min($num, $limit) - 1)) {
+			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
 			}
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index 36dbe6c120a..30b9d288562 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -596,7 +596,8 @@ $bom = new Bom($db);
 $i = 0;
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -619,7 +620,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 		// Output Kanban
 		print $object->getKanbanView('');
-		if ($i == (min($num, $limit) - 1)) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 56f83c26f03..b6291958144 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -619,7 +619,8 @@ $i = 0;
 
 $warehouse = new Entrepot($db);
 
-while ($i < min($num, $limit)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 8fcd62fc078..05524716cad 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -66,7 +66,7 @@ $pagenext = $page + 1;
 $object = new RecruitmentCandidature($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->recruitment->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('recruitmentcandidaturelist')); // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -102,6 +102,13 @@ foreach ($object->fields as $key => $val) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
+/*$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook > 0) {
+	$fieldstosearchall = $hookmanager->resArray['fieldstosearchall'];
+} elseif ($reshook == 0) {
+	$fieldstosearchall = array_merge($fieldstosearchall, $hookmanager->resArray['fieldstosearchall']);
+}*/
 
 // Definition of array of fields for columns
 $arrayfields = array();
@@ -226,6 +233,9 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
@@ -279,7 +289,7 @@ if (!empty($id)) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
@@ -304,7 +314,8 @@ $sql = preg_replace('/,\s*$/', '', $sql);
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	/* The fast and low memory method to get and count full list converts the sql into a sql count */
-	$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/Ui', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
 	$resql = $db->query($sqlforcount);
 	if ($resql) {
 		$objforcount = $db->fetch_object($resql);
@@ -313,7 +324,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		dol_print_error($db);
 	}
 
-	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller than the paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -500,7 +511,7 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 foreach ($search as $key => $val) {
-	if (is_array($search[$key]) && count($search[$key])) {
+	if (is_array($search[$key])) {
 		foreach ($search[$key] as $skey) {
 			if ($skey != '') {
 				$param .= '&search_'.$key.'[]='.urlencode($skey);
@@ -581,7 +592,7 @@ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_
 $moreforfilter.= '</div>';*/
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -604,10 +615,10 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 
 // Fields title search
 // --------------------------------------------------------------------
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-	print '<td class="liste_titre maxwidthsearch">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch center">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';
@@ -621,13 +632,13 @@ 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' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
 			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
@@ -652,11 +663,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-	print '<td class="liste_titre maxwidthsearch">';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
@@ -669,8 +680,9 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
 }
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
@@ -680,12 +692,12 @@ 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' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;
 	}
 }
@@ -693,13 +705,13 @@ foreach ($object->fields as $key => $val) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
 }
-$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
@@ -707,7 +719,7 @@ print '</tr>'."\n";
 $needToFetchEachLine = 0;
 if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
-		if (preg_match('/\$object/', $val)) {
+		if ($val && preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
 		}
 	}
@@ -739,14 +751,11 @@ while ($i < $imaxinloop) {
 		$recuitment->fetch($obj->fk_recruitmentjobposition);
 		$object->fk_recruitmentjobposition = $recuitment->getNomUrl();
 		$object->phone = $obj->phone;
-		// Output Kanban
-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			if ($massactionbutton || $massaction) {
-				$selected = 0;
-			}
-			// Output Kanban
-			print $object->getKanbanView('');
+		if ($massactionbutton || $massaction) {
+			$selected = 0;
 		}
+		// Output Kanban
+		print $object->getKanbanView('');
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
@@ -756,7 +765,7 @@ while ($i < $imaxinloop) {
 		$j = 0;
 		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
@@ -766,6 +775,9 @@ while ($i < $imaxinloop) {
 				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		foreach ($object->fields as $key => $val) {
 			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
@@ -787,7 +799,7 @@ while ($i < $imaxinloop) {
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
-				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '');
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
 				if (preg_match('/tdoverflow/', $cssforfield)) {
 					print ' title="'.dol_escape_htmltag($object->$key).'"';
 				}
@@ -821,10 +833,10 @@ while ($i < $imaxinloop) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
 		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
@@ -834,9 +846,9 @@ while ($i < $imaxinloop) {
 				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
-		}
-		if (!$i) {
-			$totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		print '</tr>'."\n";
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 8a0d3f06540..4cb2d845828 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -593,13 +593,11 @@ while ($i < $imaxinloop) {
 			print '<tr><td colspan="'.$savnbfield.'">';
 			print '<div class="box-flex-container kanban">';
 		}
-		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-			if ($massactionbutton || $massaction) {
-				$selected = 0;
-			}
-			// Output Kanban
-			print $object->getKanbanView('');
+		if ($massactionbutton || $massaction) {
+			$selected = 0;
 		}
+		// Output Kanban
+		print $object->getKanbanView('');
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 35e82e96da1..7ef8db376b7 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -537,7 +537,8 @@ $totalarray = array();
 $totalarray['nbfield'] = 0;
 $totalarray['val'] = array();
 $totalarray['val']['totalttcfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -574,7 +575,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}
 		// Output Kanban
 		print $salstatic->getKanbanView('');
-		if ($i == (min($num, $limit) - 1)) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 807ae82f9af..15b50c6dfc3 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -534,7 +534,7 @@ $i = 0;
 $total = 0;
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break;
@@ -544,8 +544,6 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-
-
 	$userstatic->id = $obj->uid;
 	$userstatic->lastname = $obj->lastname;
 	$userstatic->firstname = $obj->firstname;
@@ -570,18 +568,14 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$paymentsalstatic->fk_bank = $accountlinestatic->getNomUrl(1);
 	$paymentsalstatic->fk_user_author = $userstatic->getNomUrl(1);
 
-
-
 	if ($mode == 'kanban') {
 		if ($i == 0) {
 			print '<tr><td colspan="12">';
 			print '<div class="box-flex-container kanban">';
 		}
 		// Output Kanban
-
-
 		print $paymentsalstatic->getKanbanView('');
-		if ($i == (min($num, $limit) - 1)) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index b3f1888f505..226ddb55206 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -965,7 +965,9 @@ if ($resql) {
 	$totalarray['val']['sp.total_ht'] = 0;
 	$totalarray['val']['sp.total_tva'] = 0;
 	$totalarray['val']['sp.total_ttc'] = 0;
-	while ($i < min($num, $limit)) {
+
+	$imaxinloop = ($limit ? min($num, $limit) : $num);
+	while ($i < $imaxinloop) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->rowid;
@@ -992,7 +994,7 @@ if ($resql) {
 			$objectstatic->user_author_id = $userstatic->getNomUrl(1);
 			$objectstatic->delivery_date = $obj->dp;
 			print $objectstatic->getKanbanView('');
-			if ($i == (min($num, $limit) - 1)) {
+			if ($i == ($imaxinloop - 1)) {
 				print '</div>';
 				print '</td></tr>';
 			}

From 767ad3e366d1cc7fc5cce75070b37bc87417a440 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 20:49:38 +0100
Subject: [PATCH 236/300] Debug v17

---
 .../accountancy/journal/purchasesjournal.php  | 27 ++++++++++----
 htdocs/accountancy/journal/sellsjournal.php   | 35 +++++++++++++------
 htdocs/compta/facture/class/facture.class.php |  1 +
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 746383fef0b..d00a968571f 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -104,7 +104,7 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 }
 
 $sql = "SELECT f.rowid, f.ref as ref, f.type, f.datef as df, f.libelle,f.ref_supplier, f.date_lim_reglement as dlr, f.close_code,";
-$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code,";
+$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.tva as total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.vat_src_code, fd.info_bits,";
 $sql .= " s.rowid as socid, s.nom as name, s.fournisseur, s.code_client, s.code_fournisseur,";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
 	$sql .= " spe.accountancy_code_customer as code_compta,";
@@ -200,8 +200,8 @@ if ($result) {
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
 		}
 
-		$line = new SupplierInvoiceLine($db);
-		$line->fetch($obj->fdid);
+		//$line = new SupplierInvoiceLine($db);
+		//$line->fetch($obj->fdid);
 
 		$tabfac[$obj->rowid]["date"] = $db->jdate($obj->df);
 		$tabfac[$obj->rowid]["datereg"] = $db->jdate($obj->dlr);
@@ -233,7 +233,8 @@ if ($result) {
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
-		if (!empty($line->tva_npr)) {	// Add an entry for counterpart
+		$tva_npr = (($obj->info_bits & 1 == 1) ? 1 : 0);
+		if ($tva_npr) { // If NPR, we add an entry for counterpartWe into tabother
 			$tabother[$obj->rowid][$compta_counterpart_tva_npr] += $obj->total_tva;
 		}
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
@@ -824,7 +825,6 @@ if (empty($action) || $action == 'view') {
 	 */
 	print '<br>';
 
-	$i = 0;
 	print '<div class="div-table-responsive">';
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
@@ -837,7 +837,7 @@ if (empty($action) || $action == 'view') {
 	print '<td class="center">'.$langs->trans("AccountingCredit")."</td>";
 	print "</tr>\n";
 
-	$r = '';
+	$i = 0;
 
 	$invoicestatic = new FactureFournisseur($db);
 	$companystatic = new Fournisseur($db);
@@ -887,6 +887,7 @@ if (empty($action) || $action == 'view') {
 			print '<td class="right"></td>';
 			print "</tr>";
 
+			$i++;
 			continue;
 		}
 		if ($errorforinvoice[$key] == 'somelinesarenotbound') {
@@ -906,6 +907,8 @@ if (empty($action) || $action == 'view') {
 			print '<td class="right"></td>';
 			print '<td class="right"></td>';
 			print "</tr>";
+
+			$i++;
 		}
 
 		// Third party
@@ -936,6 +939,8 @@ if (empty($action) || $action == 'view') {
 			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 			print "</tr>";
+
+			$i++;
 		}
 
 		// Product / Service
@@ -972,6 +977,8 @@ if (empty($action) || $action == 'view') {
 			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 			print "</tr>";
+
+			$i++;
 		}
 
 		// VAT
@@ -1009,6 +1016,8 @@ if (empty($action) || $action == 'view') {
 					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 					print "</tr>";
+
+					$i++;
 				}
 			}
 		}
@@ -1037,11 +1046,17 @@ if (empty($action) || $action == 'view') {
 					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 					print "</tr>";
+
+					$i++;
 				}
 			}
 		}
 	}
 
+	if (!$i) {
+		print '<tr class="oddeven"><td colspan="7"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+	}
+
 	print "</table>";
 	print '</div>';
 
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 2854ba67606..2ae5bd77ab2 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -107,7 +107,7 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 }
 
 $sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code,";
-$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code,";
+$sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code, fd.info_bits,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur,";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
 	$sql .= " spe.accountancy_code_customer as code_compta,";
@@ -205,17 +205,17 @@ if ($result) {
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
 		}
 
-		$line = new FactureLigne($db);
-		$line->fetch($obj->fdid);
-
-		// Situation invoices handling
-		$prev_progress = $line->get_prev_progress($obj->rowid);
-
 		if ($obj->type == Facture::TYPE_SITUATION) {
 			// Avoid divide by 0
 			if ($obj->situation_percent == 0) {
 				$situation_ratio = 0;
 			} else {
+				$line = new FactureLigne($db);
+				$line->fetch($obj->fdid);
+
+				// Situation invoices handling
+				$prev_progress = $line->get_prev_progress($obj->rowid);
+
 				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
 			}
 		} else {
@@ -255,8 +255,9 @@ if ($result) {
 		// For credit notes, we hope to have situation_ratio = 1 so the compensation has no effect to avoid introducing troubles with credit notes.
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-		if (empty($line->tva_npr)) {
-			$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio; // We ignore line if VAT is a NPR
+		$tva_npr = (($obj->info_bits & 1 == 1) ? 1 : 0);
+		if (!$tva_npr) { // We ignore line if VAT is a NPR
+			$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
 		}
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1 * $situation_ratio;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2 * $situation_ratio;
@@ -775,7 +776,6 @@ if (empty($action) || $action == 'view') {
 	 */
 	print '<br>';
 
-	$i = 0;
 	print '<div class="div-table-responsive">';
 	print "<table class=\"noborder\" width=\"100%\">";
 	print "<tr class=\"liste_titre\">";
@@ -788,7 +788,7 @@ if (empty($action) || $action == 'view') {
 	print '<td class="center">'.$langs->trans("AccountingCredit")."</td>";
 	print "</tr>\n";
 
-	$r = '';
+	$i = 0;
 
 	$companystatic = new Client($db);
 	$invoicestatic = new Facture($db);
@@ -836,6 +836,7 @@ if (empty($action) || $action == 'view') {
 			print '<td class="right"></td>';
 			print "</tr>";
 
+			$i++;
 			continue;
 		}
 		if ($errorforinvoice[$key] == 'somelinesarenotbound') {
@@ -855,6 +856,8 @@ if (empty($action) || $action == 'view') {
 			print '<td class="right"></td>';
 			print '<td class="right"></td>';
 			print "</tr>";
+
+			$i++;
 		}
 
 		// Third party
@@ -885,6 +888,8 @@ if (empty($action) || $action == 'view') {
 			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 			print "</tr>";
+
+			$i++;
 		}
 
 		// Product / Service
@@ -921,6 +926,8 @@ if (empty($action) || $action == 'view') {
 			print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 			print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 			print "</tr>";
+
+			$i++;
 		}
 
 		// VAT
@@ -957,11 +964,17 @@ if (empty($action) || $action == 'view') {
 					print '<td class="right nowraponall amount">'.($mt < 0 ? price(-$mt) : '')."</td>";
 					print '<td class="right nowraponall amount">'.($mt >= 0 ? price($mt) : '')."</td>";
 					print "</tr>";
+
+					$i++;
 				}
 			}
 		}
 	}
 
+	if (!$i) {
+		print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+	}
+
 	print "</table>";
 	print '</div>';
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 2447db6af5d..045048e7395 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -6412,6 +6412,7 @@ class FactureLigne extends CommonInvoiceLine
 	{
 		// phpcs:enable
 		global $invoicecache;
+
 		if (is_null($this->fk_prev_id) || empty($this->fk_prev_id) || $this->fk_prev_id == "") {
 			return 0;
 		} else {

From 6f8b1108ca5ce51a93b78bb95e92c3ba90ab1e8b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 21:21:16 +0100
Subject: [PATCH 237/300] css

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

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 224d321a0cf..c19777c9007 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -1926,8 +1926,8 @@ if ($id > 0) {
 					if (!is_null($withentity)) {
 						print '<input type="hidden" name="entity" value="'.$withentity.'">';
 					}
-					print '<input type="submit" class="button button-edit" name="actionmodify" value="'.$langs->trans("Modify").'">';
-					print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+					print '<input type="submit" class="button button-edit small" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<input type="submit" class="button button-cancel small" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 					print '</td>';
 				} else {
 					$tmpaction = 'view';

From f763dbc91f3e5649476b280f9290e5ea9106d3ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 2 Mar 2023 23:03:56 +0100
Subject: [PATCH 238/300] fix infinite loop

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

diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 4acafa49b00..2399b9f5b83 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014-2016  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2021-2023	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
@@ -1015,7 +1015,7 @@ $i = 0;
 $totalarray = array();
 $totalarray['nbfield'] = 0;
 $imaxinloop = ($limit ? min($num, $limit) : $num);
-while ($i < $maxinloop) {
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 
 	$datefin = $db->jdate($obj->datefin);

From 10fff593579172295452ebbc52cf8a2b237f2c83 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 2 Mar 2023 23:19:37 +0100
Subject: [PATCH 239/300] Trans

---
 htdocs/core/modules/facture/doc/pdf_crabe.modules.php  | 2 +-
 htdocs/core/modules/facture/doc/pdf_sponge.modules.php | 2 +-
 htdocs/langs/en_US/bills.lang                          | 2 +-
 htdocs/langs/en_US/boxes.lang                          | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index e0599f0fcf0..174648dfa8c 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -1233,7 +1233,7 @@ class pdf_crabe extends ModelePDFFactures
 					$bac = new CompanyBankAccount($this->db);
 					$bac->fetch(0, $object->thirdparty->id);
 					$iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
-					$lib_mode_reg .= $outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
+					$lib_mode_reg .= ' '.$outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
 				}
 				$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
 
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index 57d7b75d12a..312115bb0c1 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -1326,7 +1326,7 @@ class pdf_sponge extends ModelePDFFactures
 					$bac = new CompanyBankAccount($this->db);
 					$bac->fetch(0, $object->thirdparty->id);
 					$iban= $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
-					$lib_mode_reg .= $outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
+					$lib_mode_reg .= ' '.$outputlangs->trans("PaymentTypePREdetails", dol_trunc($iban, 6, 'right', 'UTF-8', 1));
 				}
 
 				$pdf->MultiCell($posxend - $posxval, 5, $lib_mode_reg, 0, 'L');
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 183620c72da..7ad897ab0e2 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -450,7 +450,7 @@ ErrorPaymentConditionsNotEligibleToDepositCreation=The chose payment conditions
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
 PaymentTypePRE=Direct debit payment order
-PaymentTypePREdetails=(on account *-%s)
+PaymentTypePREdetails=(on account %s...)
 PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index e74539132f6..03840b9fab8 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -130,8 +130,8 @@ sendingindex=Home shippings
 receptionindex=Home receivings
 activityindex=Home activity
 proposalindex=Home proposal
-ordersindex=Home orders
-orderssuppliersindex=Home orders suppliers
+ordersindex=Home sale orders
+orderssuppliersindex=Home purchase orders
 contractindex=Home contracts
 interventionindex=Home interventions
 suppliersproposalsindex=Home suppliers proposals

From 05de1b419da11d60bb1461513c6f7c7e66afc372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 2 Mar 2023 23:25:09 +0100
Subject: [PATCH 240/300] can suggest end date of subscription

define option if needed
MEMBER_SUBSCRIPTION_SUGGEST_END_OF_MONTH
MEMBER_SUBSCRIPTION_SUGGEST_END_OF_YEAR
---
 htdocs/adherents/subscription.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index a1aa8b8baa9..ea2796ae910 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2012-2017  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2015-2016  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Thibault FOUCART        <support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -946,6 +946,8 @@ if ($rowid > 0) {
 
 		print '<tr>';
 		// Date start subscription
+		$currentyear = dol_print_date(time(), "%Y");
+		$currentmonth = dol_print_date(time(), "%m");
 		print '<td class="fieldrequired">'.$langs->trans("DateSubscription").'</td><td>';
 		if (GETPOST('reday')) {
 			$datefrom = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
@@ -955,7 +957,7 @@ if ($rowid > 0) {
 			if ($object->datefin > 0 && dol_time_plus_duree($object->datefin, $defaultdelay, $defaultdelayunit) > dol_now()) {
 				$datefrom = dol_time_plus_duree($object->datefin, 1, 'd');
 			} else {
-				$datefrom = dol_get_first_day(dol_print_date(time(), "%Y"));
+				$datefrom = dol_get_first_day($currentyear);
 			}
 		}
 		print $form->selectDate($datefrom, '', '', '', '', "subscription", 1, 1);
@@ -966,7 +968,13 @@ if ($rowid > 0) {
 			$dateto = dol_mktime(0, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
 		}
 		if (!$dateto) {
-			$dateto = -1; // By default, no date is suggested
+			if (getDolGlobalInt('MEMBER_SUBSCRIPTION_SUGGEST_END_OF_MONTH')) {
+				$dateto = dol_get_last_day($currentyear, $currentmonth);
+			} elseif (getDolGlobalInt('MEMBER_SUBSCRIPTION_SUGGEST_END_OF_YEAR')) {
+				$dateto = dol_get_last_day($currentyear);
+			} else {
+				$dateto = -1; // By default, no date is suggested
+			}
 		}
 		print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td>';
 		print $form->selectDate($dateto, 'end', '', '', '', "subscription", 1, 0);

From 4a042544cc9d3f62ddf101fd1ac442b34b9691c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 2 Mar 2023 23:39:22 +0100
Subject: [PATCH 241/300] fix module is not mandatory in mail_templates

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index c9434f216bb..47e4939ef82 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-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023  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
@@ -307,13 +307,7 @@ if (empty($reshook)) {
 		$ok = 1;
 		foreach ($listfield as $f => $value) {
 			// Not mandatory fields
-			if ($value == 'joinfiles') {
-				continue;
-			}
-			if ($value == 'content') {
-				continue;
-			}
-			if ($value == 'content_lines') {
+			if (in_array($value, ['joinfiles', 'content', 'content_lines', 'module'])) {
 				continue;
 			}
 

From ba230982dbd2c5cdbd1437ed62c288b4e5a6bea7 Mon Sep 17 00:00:00 2001
From: tnegre <tnegre@open-dsi.fr>
Date: Thu, 2 Mar 2023 14:29:15 +0100
Subject: [PATCH 242/300] FIX: validation date for invoice was compared in all
 entities. They should be compared only in the same entity.

---
 htdocs/compta/facture/class/facture.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 045048e7395..34e5377551e 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -5712,6 +5712,7 @@ class Facture extends CommonInvoice
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
 		$sql .= " WHERE type = " . (int) $this->type ;
 		$sql .= " AND date_valid IS NOT NULL";
+		$sql .= " AND entity IN (".getEntity('invoice').")";
 		$sql .= " ORDER BY datef DESC LIMIT 1";
 
 		$result = $this->db->query($sql);

From 87fa075ce0d27403051660cd645c359761683118 Mon Sep 17 00:00:00 2001
From: GregM <gregory.maza@atm-consulting.fr>
Date: Fri, 3 Mar 2023 10:20:45 +0100
Subject: [PATCH 243/300] Fix 16.0 propalestats

---
 htdocs/comm/propal/class/propalestats.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index e8f922fab44..84cd12b2811 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -248,13 +248,12 @@ class PropaleStats extends Stats
 		global $user;
 
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
-		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
+		$sql .= " FROM ".$this->from." INNER JOIN ".$this->from_line." ON p.rowid = tl.fk_propal INNER JOIN ".MAIN_DB_PREFIX."product as product ON tl.fk_product = product.rowid";
 		if (empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= "  INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
-		$sql .= " AND p.rowid = tl.fk_propal AND tl.fk_product = product.rowid";
 		$sql .= " AND ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
 		$sql .= " GROUP BY product.ref";
 		$sql .= $this->db->order('nb', 'DESC');

From 3e0689879d267fb4c04c4535094de475d884783a Mon Sep 17 00:00:00 2001
From: Adrien Raze <adrien.raze@atm-consulting.fr>
Date: Fri, 3 Mar 2023 10:25:23 +0100
Subject: [PATCH 244/300] FIX : stickler-ci

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index fc20180737b..d52b752802b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8895,9 +8895,9 @@ class Form
 			);
 		}
 
-		if($object->table_element == 'commande_fournisseur') {
+		if ($object->table_element == 'commande_fournisseur') {
 			$possiblelinks['mo']['sql'] = "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.rowid, '0' as total_ht FROM ".$this->db->prefix()."societe as s INNER JOIN ".$this->db->prefix().'mrp_mo as t ON t.fk_soc = s.rowid  WHERE t.entity IN ('.getEntity('mo').')';
-		} elseif($object->table_element == 'mrp_mo') {
+		} elseif ($object->table_element == 'mrp_mo') {
 			$possiblelinks['order_supplier']['sql'] = "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix().'commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.entity IN ('.getEntity('commande_fournisseur').')';
 		}
 

From ae83802f387298eab2ec65cdeaa794e0a287ce90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 3 Mar 2023 10:31:24 +0100
Subject: [PATCH 245/300] can set default values without overriding thirdparty
 defaults

---
 htdocs/comm/propal/card.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9437bbf0a92..1814221cf4f 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1856,13 +1856,16 @@ if ($action == 'create') {
 	// Terms of payment
 	print '<tr class="field_cond_reglement_id"><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	print img_picto('', 'paiment');
-	print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id', 'int') != 0) ? GETPOST('cond_reglement_id', 'int') : $soc->cond_reglement_id, 'cond_reglement_id', 1, 1, 0, '', (GETPOSTISSET('cond_reglement_id_deposit_percent') ? GETPOST('cond_reglement_id_deposit_percent', 'alpha') : $soc->deposit_percent));
+	// at last resort we take the payment term id which may be filled by default values set (if not getpostisset)
+	$paymentTermId = (GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id', 'int') != 0) ? GETPOST('cond_reglement_id', 'int') : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : GETPOST('cond_reglement_id', 'int'));
+	print $form->getSelectConditionsPaiements($paymentTermId, 'cond_reglement_id', 1, 1, 0, '', (GETPOSTISSET('cond_reglement_id_deposit_percent') ? GETPOST('cond_reglement_id_deposit_percent', 'alpha') : $soc->deposit_percent));
 	print '</td></tr>';
 
 	// Mode of payment
 	print '<tr class="field_mode_reglement_id"><td class="titlefieldcreate">'.$langs->trans('PaymentMode').'</td><td class="valuefieldcreate">';
 	print img_picto('', 'bank', 'class="pictofixedwidth"');
-	print $form->select_types_paiements((GETPOSTISSET('mode_reglement_id') && GETPOST('mode_reglement_id', 'int') != 0) ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
+	$paymentMethod = (GETPOSTISSET('mode_reglement_id') && GETPOST('mode_reglement_id', 'int') != 0) ? GETPOST('mode_reglement_id', 'int') : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : GETPOST('mode_reglement_id', 'int'));
+	print $form->select_types_paiements($paymentMethod, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
 	print '</td></tr>';
 
 	// Bank Account

From f560d060d08587b3e2a3dca8cf93c4689593eb5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 3 Mar 2023 11:18:42 +0100
Subject: [PATCH 246/300] pictos

---
 htdocs/comm/propal/card.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 1814221cf4f..8939519ef67 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1806,7 +1806,7 @@ if ($action == 'create') {
 		//$warehouse_id       = $soc->warehouse_id;
 	} else {
 		print '<td class="valuefieldcreate">';
-		print img_picto('', 'company').$form->select_company('', 'socid', '((s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
+		print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', '((s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
@@ -1829,7 +1829,7 @@ if ($action == 'create') {
 	if ($socid > 0) {
 		// Contacts (ask contact only if thirdparty already defined).
 		print '<tr class="field_contactid"><td class="titlefieldcreate">'.$langs->trans("DefaultContact").'</td><td class="valuefieldcreate">';
-		print img_picto('', 'contact');
+		print img_picto('', 'contact', 'class="pictofixedwidth"');
 		print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, '', '', 0, 'minwidth300');
 		print '</td></tr>';
 
@@ -1847,15 +1847,16 @@ if ($action == 'create') {
 
 	// Date
 	print '<tr class="field_addprop"><td class="titlefieldcreate fieldrequired">'.$langs->trans('DatePropal').'</td><td class="valuefieldcreate">';
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	print $form->selectDate('', '', '', '', '', "addprop", 1, 1);
 	print '</td></tr>';
 
 	// Validaty duration
-	print '<tr class="field_duree_validitee"><td class="titlefieldcreate fieldrequired">'.$langs->trans("ValidityDuration").'</td><td class="valuefieldcreate">'.img_picto('', 'clock', 'class="paddingright"').'<input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
+	print '<tr class="field_duree_validitee"><td class="titlefieldcreate fieldrequired">'.$langs->trans("ValidityDuration").'</td><td class="valuefieldcreate">'.img_picto('', 'clock', 'class="pictofixedwidth"').'<input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
 
 	// Terms of payment
 	print '<tr class="field_cond_reglement_id"><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
-	print img_picto('', 'paiment');
+	print img_picto('', 'payment', 'class="pictofixedwidth"');
 	// at last resort we take the payment term id which may be filled by default values set (if not getpostisset)
 	$paymentTermId = (GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id', 'int') != 0) ? GETPOST('cond_reglement_id', 'int') : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : GETPOST('cond_reglement_id', 'int'));
 	print $form->getSelectConditionsPaiements($paymentTermId, 'cond_reglement_id', 1, 1, 0, '', (GETPOSTISSET('cond_reglement_id_deposit_percent') ? GETPOST('cond_reglement_id_deposit_percent', 'alpha') : $soc->deposit_percent));
@@ -1914,6 +1915,7 @@ if ($action == 'create') {
 	// Delivery date (or manufacturing)
 	print '<tr class="field_date_livraison"><td class="titlefieldcreate">'.$langs->trans("DeliveryDate").'</td>';
 	print '<td class="valuefieldcreate">';
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	if (isset($conf->global->DATE_LIVRAISON_WEEK_DELAY) && is_numeric($conf->global->DATE_LIVRAISON_WEEK_DELAY)) {
 		$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
 		$syear = date("Y", $tmpdte);

From 215cd58827cd001837e006095d1b7b6238edb98a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 11:53:21 +0100
Subject: [PATCH 247/300] Fix for #24094

---
 htdocs/accountancy/class/accountancycategory.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index 942ae56f807..d6e0d675a0e 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -743,7 +743,7 @@ class AccountancyCategory // extends CommonObject
 				}
 				$listofaccount .= "'".$cptcursor."'";
 			}
-			$sql .= " AND t.numero_compte IN (".$this->db->sanitize($listofaccount).")";
+			$sql .= " AND t.numero_compte IN (".$this->db->sanitize($listofaccount, 1).")";
 		} else {
 			$sql .= " AND t.numero_compte = '".$this->db->escape($cpt)."'";
 		}

From 50d4f2d90fdfbd48ca8f3cc9ec343be4278d2b4d Mon Sep 17 00:00:00 2001
From: Nicolas <info@inovea-conseil.com>
Date: Fri, 3 Mar 2023 12:00:24 +0100
Subject: [PATCH 248/300] FIX select for task in event card

---
 htdocs/comm/action/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index e3923cfb8d0..f6ee64d3a6b 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1257,7 +1257,7 @@ if ($action == 'create') {
 		print "\n".'<script type="text/javascript">';
 		print '$(document).ready(function () {
 	               $("#projectid").change(function () {
-                        var url = "'.DOL_URL_ROOT.'/projet/ajax/projects.php?mode=gettasks&socid="+$("#projectid").val()+"&projectid="+$("#projectid").val();
+                        var url = "'.DOL_URL_ROOT.'/projet/ajax/projects.php?mode=gettasks&socid="+$("#search_socid").val()+"&projectid="+$("#projectid").val();
 						console.log("Call url to get new list of tasks: "+url);
                         $.get(url, function(data) {
                             console.log(data);

From 52856303d9fd3b9f0a53b400f407b5c7a94754ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 3 Mar 2023 12:06:27 +0100
Subject: [PATCH 249/300] add pictos on forms

---
 htdocs/comm/propal/card.php       |  2 +-
 htdocs/commande/card.php          |  6 ++++--
 htdocs/fourn/commande/card.php    | 10 +++++++---
 htdocs/supplier_proposal/card.php | 11 ++++++++---
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 8939519ef67..93cc8e52c77 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1898,7 +1898,7 @@ if ($action == 'create') {
 			$shipping_method_id = $soc->shipping_method_id;
 		}
 		print '<tr class="field_shipping_method_id"><td class="titlefieldcreate">'.$langs->trans('SendingMethod').'</td><td class="valuefieldcreate">';
-		print img_picto('', 'object_dollyrevert', 'class="pictofixedwidth"');
+		print img_picto('', 'dolly', 'class="pictofixedwidth"');
 		$form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 	}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 3a34594bbd8..2decb49f58c 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1785,7 +1785,7 @@ if ($action == 'create' && $usercancreate) {
 		print '</td>';
 	} else {
 		print '<td>';
-		print img_picto('', 'company').$form->select_company('', 'socid', '((s.client = 1 OR s.client = 2 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
+		print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', '((s.client = 1 OR s.client = 2 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
@@ -1828,6 +1828,7 @@ if ($action == 'create' && $usercancreate) {
 
 	// Date
 	print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	print $form->selectDate('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date
 	print '</td></tr>';
 
@@ -1835,6 +1836,7 @@ if ($action == 'create' && $usercancreate) {
 	print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 	print '<td colspan="3">';
 	$date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date);
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	print $form->selectDate($date_delivery ? $date_delivery : -1, 'liv_', 1, 1, 1);
 	print "</td>\n";
 	print '</tr>';
@@ -1867,7 +1869,7 @@ if ($action == 'create' && $usercancreate) {
 	// Shipping Method
 	if (isModEnabled('expedition')) {
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
-		print img_picto('', 'object_dolly', 'class="pictofixedwidth"');
+		print img_picto('', 'dolly', 'class="pictofixedwidth"');
 		$form->selectShippingMethod((GETPOSTISSET('shipping_method_id')?GETPOST('shipping_method_id'):$shipping_method_id), 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 	}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index fc392a69254..0923ef18493 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1693,7 +1693,7 @@ if ($action == 'create') {
 		print $societe->getNomUrl(1, 'supplier');
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
-		print img_picto('', 'company').$form->select_company((empty($socid) ? '' : $socid), 'socid', '(s.fournisseur=1 AND s.status=1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
+		print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company((empty($socid) ? '' : $socid), 'socid', '(s.fournisseur=1 AND s.status=1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
 		if (empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED)) {
 			print '<script>
@@ -1730,11 +1730,13 @@ if ($action == 'create') {
 
 	// Payment term
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
+	print img_picto('', 'payment', 'class="pictofixedwidth"');
 	print $form->getSelectConditionsPaiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	// Payment mode
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
+	print img_picto('', 'bank', 'class="pictofixedwidth"');
 	$form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
@@ -1747,6 +1749,7 @@ if ($action == 'create') {
 	if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
 		$usehourmin = 1;
 	}
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	print $form->selectDate($datelivraison ? $datelivraison : -1, 'liv_', $usehourmin, $usehourmin, '', "set");
 	print '</td></tr>';
 
@@ -1754,7 +1757,7 @@ if ($action == 'create') {
 	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && isModEnabled("banque")) {
 		$langs->load("bank");
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
-		print img_picto('', 'bank_account', 'class="paddingrightonly"');
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 		$form->select_comptes($fk_account, 'fk_account', 0, '', 1);
 		print '</td></tr>';
 	}
@@ -1765,7 +1768,7 @@ if ($action == 'create') {
 
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		print img_picto('', 'project').$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+		print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?action=create&status=1'.(!empty($societe->id) ? '&socid='.$societe->id : "").'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create'.(!empty($societe->id) ? '&socid='.$societe->id : "")).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td></tr>';
 	}
@@ -1786,6 +1789,7 @@ if ($action == 'create') {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="maxwidthonsmartphone">';
+		print img_picto('', 'currency', 'class="pictofixedwidth"');
 		print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
 		print '</td></tr>';
 	}
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 3887060d8a9..9baa56d8193 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1269,7 +1269,7 @@ if ($action == 'create') {
 		print '</td>';
 	} else {
 		print '<td colspan="2">';
-		print img_picto('', 'company').$form->select_company('', 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
+		print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company('', 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
 			print '<script>
@@ -1303,11 +1303,13 @@ if ($action == 'create') {
 
 	// Terms of payment
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	print img_picto('', 'payment', 'class="pictofixedwidth"');
 	print $form->getSelectConditionsPaiements(GETPOST('cond_reglement_id') > 0 ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);
 	print '</td></tr>';
 
 	// Mode of payment
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
+	print img_picto('', 'bank', 'class="pictofixedwidth"');
 	$form->select_types_paiements(GETPOST('mode_reglement_id') > 0 ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
@@ -1321,7 +1323,7 @@ if ($action == 'create') {
 	// Shipping Method
 	if (isModEnabled("expedition")) {
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td colspan="2">';
-		print img_picto('', 'object_dollyrevert', 'class="pictofixedwidth"');
+		print img_picto('', 'dolly', 'class="pictofixedwidth"');
 		$form->selectShippingMethod(GETPOST('shipping_method_id') > 0 ? GETPOST('shipping_method_id', 'int') : "", 'shipping_method_id', '', 1);
 		print '</td></tr>';
 	}
@@ -1329,6 +1331,7 @@ if ($action == 'create') {
 	// Delivery date (or manufacturing)
 	print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';
 	print '<td colspan="2">';
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	$datedelivery = dol_mktime(0, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
 	if (!empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) {
 		$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
@@ -1346,6 +1349,7 @@ if ($action == 'create') {
 	print '<tr>';
 	print '<td>'.$langs->trans("DefaultModel").'</td>';
 	print '<td colspan="2">';
+	print img_picto('', 'pdf', 'class="pictofixedwidth"');
 	$list = ModelePDFSupplierProposal::liste_modeles($db);
 	$preselected = (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT) ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT : $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF);
 	print $form->selectarray('model', $list, $preselected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
@@ -1363,7 +1367,7 @@ if ($action == 'create') {
 
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
-		print img_picto('', 'project').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
+		print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
 		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 
 		print '</td>';
@@ -1375,6 +1379,7 @@ if ($action == 'create') {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td colspan="3" class="maxwidthonsmartphone">';
+		print img_picto('', 'currency', 'class="pictofixedwidth"');
 		print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
 		print '</td></tr>';
 	}

From 5b65d7d3fbb1d7aff58687f7b00f027eb4b7723b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 12:08:12 +0100
Subject: [PATCH 250/300] Complete #24049. Reduce bad effect of option
 INVOICE_USE_SITUATION

---
 htdocs/accountancy/customer/index.php         |  68 ++++++---
 htdocs/accountancy/customer/lines.php         |  31 +++-
 htdocs/accountancy/customer/list.php          |  28 +++-
 htdocs/accountancy/journal/sellsjournal.php   |  28 ++--
 htdocs/admin/facture.php                      |   2 +-
 htdocs/compta/facture/class/facture.class.php |   4 +-
 htdocs/hrm/core/tpl/objectline_view.tpl.php   |   2 +-
 htdocs/takepos/invoice.php                    | 135 +++++++++---------
 8 files changed, 191 insertions(+), 107 deletions(-)

diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 393629ae505..0d74bf8a10a 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -142,8 +142,8 @@ if ($action == 'validatehistory') {
 	}*/
 
 	// Customer Invoice lines (must be same request than into page list.php for manual binding)
-	$sql = "SELECT f.rowid as facid, f.ref as ref, f.datef, f.type as ftype, f.fk_facture_source,";
-	$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
+	$sql = "SELECT f.rowid as facid, f.ref as ref, f.datef, f.type as ftype, f.situation_cycle_ref, f.fk_facture_source,";
+	$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.situation_percent, l.tva_tx as tva_tx_line, l.vat_src_code,";
 	$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tva_tx as tva_tx_prod,";
 	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 		$sql .= " ppe.accountancy_code_sell as code_sell, ppe.accountancy_code_sell_intra as code_sell_intra, ppe.accountancy_code_sell_export as code_sell_export,";
@@ -321,6 +321,10 @@ print '<span class="opacitymedium">'.$langs->trans("DescVentilCustomer").'</span
 print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("DescVentilMore", $langs->transnoentitiesnoconv("ValidateHistory"), $langs->transnoentitiesnoconv("ToBind")).'<br>';
 print '</span><br>';
 
+if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) {
+	print info_admin($langs->trans("SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices"));
+	print "<br>";
+}
 
 $y = $year_current;
 
@@ -395,6 +399,11 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 
 	while ($row = $db->fetch_row($resql)) {
+		// TODO When INVOICE_USE_SITUATION = 1, values here are wrong. There is no compensation on bad stored amounts
+		//$situation_ratio = 1;
+		//if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) {
+		//}
+
 		print '<tr class="oddeven">';
 		print '<td>';
 		if ($row[0] == 'tobind') {
@@ -512,6 +521,11 @@ if ($resql) {
 	$num = $db->num_rows($resql);
 
 	while ($row = $db->fetch_row($resql)) {
+		// TODO When INVOICE_USE_SITUATION = 1, values here are wrong. There is no compensation on bad stored amounts
+		//$situation_ratio = 1;
+		//if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) {
+		//}
+
 		print '<tr class="oddeven">';
 		print '<td>';
 		if ($row[0] == 'tobind') {
@@ -623,7 +637,6 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 	print "</table>\n";
 	print '</div>';
 
-
 	if (isModEnabled('margin')) {
 		print "<br>\n";
 		print '<div class="div-table-responsive-no-min">';
@@ -637,22 +650,41 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 			print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 		}
 		print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
-		$sql = "SELECT '".$db->escape($langs->trans("Vide"))."' AS marge,";
-		for ($i = 1; $i <= 12; $i++) {
-			$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-			if ($j > 12) {
-				$j -= 12;
-			}
-			$sql .= " SUM(".$db->ifsql("MONTH(f.datef)=".$j,
-						" (".$db->ifsql("fd.total_ht < 0",
-							" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",
-							"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))").")",
-						 0).") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
-		}
-		$sql .= "  SUM(".$db->ifsql("fd.total_ht < 0",
-							" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",
-							"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))").") as total";
 
+		if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) {
+			// With old situation invoice setup
+			$sql = "SELECT '".$db->escape($langs->trans("Vide"))."' AS marge,";
+			for ($i = 1; $i <= 12; $i++) {
+				$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+				if ($j > 12) {
+					$j -= 12;
+				}
+				$sql .= " SUM(".$db->ifsql("MONTH(f.datef)=".$j,
+							" (".$db->ifsql("fd.total_ht < 0",
+								" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",	// TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
+								"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))").")",
+							 0).") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+			}
+			$sql .= "  SUM(".$db->ifsql("fd.total_ht < 0",
+				" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",	// TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
+								"  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))").") as total";
+		} else {
+			$sql = "SELECT '".$db->escape($langs->trans("Vide"))."' AS marge,";
+			for ($i = 1; $i <= 12; $i++) {
+				$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+				if ($j > 12) {
+					$j -= 12;
+				}
+				$sql .= " SUM(".$db->ifsql("MONTH(f.datef)=".$j,
+					" (".$db->ifsql("fd.total_ht < 0",
+						" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty)))",
+						"  (fd.total_ht - (fd.buy_price_ht * fd.qty))").")",
+					0).") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
+			}
+			$sql .= "  SUM(".$db->ifsql("fd.total_ht < 0",
+				" (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty)))",
+				"  (fd.total_ht - (fd.buy_price_ht * fd.qty))").") as total";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 		$sql .= "  LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 		$sql .= " WHERE f.datef >= '".$db->idate($search_date_start)."'";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index b8df8890a01..888cc568cf8 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -189,8 +189,8 @@ print '<script type="text/javascript">
 /*
  * Customer Invoice lines
  */
-$sql = "SELECT f.rowid as facid, f.ref as ref, f.type as ftype, f.datef, f.ref_client,";
-$sql .= " fd.rowid, fd.description, fd.product_type as line_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.vat_src_code, fd.total_ttc,";
+$sql = "SELECT f.rowid as facid, f.ref as ref, f.type as ftype, f.situation_cycle_ref, f.datef, f.ref_client,";
+$sql .= " fd.rowid, fd.description, fd.product_type as line_type, fd.total_ht, fd.total_tva, fd.tva_tx, fd.vat_src_code, fd.total_ttc, fd.situation_percent,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client,";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
 	$sql .= " spe.accountancy_code_customer as code_compta_client,";
@@ -502,8 +502,33 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
 
-		print '<td class="right nowraponall amount">'.price($objp->total_ht).'</td>';
+		// Amount
+		print '<td class="right nowraponall amount">';
 
+		// Create a compensation rate for old situation invoice feature.
+		$situation_ratio = 1;
+		if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) {
+			if ($objp->situation_cycle_ref) {
+				// Avoid divide by 0
+				if ($objp->situation_percent == 0) {
+					$situation_ratio = 0;
+				} else {
+					$line = new FactureLigne($db);
+					$line->fetch($objp->rowid);
+
+					// Situation invoices handling
+					$prev_progress = $line->get_prev_progress($objp->facid);
+
+					$situation_ratio = ($objp->situation_percent - $prev_progress) / $objp->situation_percent;
+				}
+			}
+			print price($objp->total_ht * $situation_ratio);
+		} else {
+			print price($objp->total_ht);
+		}
+		print '</td>';
+
+		// Vat rate
 		print '<td class="right">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
 		// Thirdparty
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 35be32d6b34..8834ad69cf8 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -228,8 +228,8 @@ if (empty($chartaccountcode)) {
 }
 
 // Customer Invoice lines
-$sql = "SELECT f.rowid as facid, f.ref, f.datef, f.type as ftype, f.fk_facture_source,";
-$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
+$sql = "SELECT f.rowid as facid, f.ref, f.datef, f.type as ftype, f.situation_cycle_ref, f.fk_facture_source,";
+$sql .= " l.rowid, l.fk_product, l.description, l.total_ht, l.situation_percent, l.fk_code_ventilation, l.product_type as type_l, l.tva_tx as tva_tx_line, l.vat_src_code,";
 $sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as type, p.tva_tx as tva_tx_prod,";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 	$sql .= " ppe.accountancy_code_sell as code_sell, ppe.accountancy_code_sell_intra as code_sell_intra, ppe.accountancy_code_sell_export as code_sell_export,";
@@ -655,8 +655,30 @@ if ($result) {
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $facture_static_det->desc);
 		print '</td>';
 
+		// Amount
 		print '<td class="right nowraponall amount">';
-		print price($objp->total_ht);
+
+		// Create a compensation rate for old situation invoice feature.
+		$situation_ratio = 1;
+		if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) {
+			if ($objp->situation_cycle_ref) {
+				// Avoid divide by 0
+				if ($objp->situation_percent == 0) {
+					$situation_ratio = 0;
+				} else {
+					$line = new FactureLigne($db);
+					$line->fetch($objp->rowid);
+
+					// Situation invoices handling
+					$prev_progress = $line->get_prev_progress($objp->facid);
+
+					$situation_ratio = ($objp->situation_percent - $prev_progress) / $objp->situation_percent;
+				}
+			}
+			print price($objp->total_ht * $situation_ratio);
+		} else {
+			print price($objp->total_ht);
+		}
 		print '</td>';
 
 		// Vat rate
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 2ae5bd77ab2..e6d22dbe9a1 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -106,7 +106,7 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$sql = "SELECT f.rowid, f.ref, f.type, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code,";
+$sql = "SELECT f.rowid, f.ref, f.type, f.situation_cycle_ref, f.datef as df, f.ref_client, f.date_lim_reglement as dlr, f.close_code,";
 $sql .= " fd.rowid as fdid, fd.description, fd.product_type, fd.total_ht, fd.total_tva, fd.total_localtax1, fd.total_localtax2, fd.tva_tx, fd.total_ttc, fd.situation_percent, fd.vat_src_code, fd.info_bits,";
 $sql .= " s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur,";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
@@ -205,21 +205,23 @@ if ($result) {
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
 		}
 
-		if ($obj->type == Facture::TYPE_SITUATION) {
-			// Avoid divide by 0
-			if ($obj->situation_percent == 0) {
-				$situation_ratio = 0;
-			} else {
-				$line = new FactureLigne($db);
-				$line->fetch($obj->fdid);
+		// Create a compensation rate.
+		$situation_ratio = 1;
+		if (getDolGlobalInt('INVOICE_USE_SITUATION') == 1) {
+			if ($obj->situation_cycle_ref) {
+				// Avoid divide by 0
+				if ($obj->situation_percent == 0) {
+					$situation_ratio = 0;
+				} else {
+					$line = new FactureLigne($db);
+					$line->fetch($obj->fdid);
 
-				// Situation invoices handling
-				$prev_progress = $line->get_prev_progress($obj->rowid);
+					// Situation invoices handling
+					$prev_progress = $line->get_prev_progress($obj->rowid);
 
-				$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+					$situation_ratio = ($obj->situation_percent - $prev_progress) / $obj->situation_percent;
+				}
 			}
-		} else {
-			$situation_ratio = 1;
 		}
 
 		// Invoice lines
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index d82f4f0bde0..68e3192f5c6 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -629,7 +629,7 @@ if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) { // Hidden conf
 		Facture::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
 		Facture::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
 	);
-	if (!empty($conf->global->INVOICE_USE_SITUATION)) {
+	if (getDolGlobalInt('INVOICE_USE_SITUATION')) {
 		$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
 	}
 
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 045048e7395..cc3eedcc72d 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -6404,9 +6404,9 @@ class FactureLigne extends CommonInvoiceLine
 	 * Returns situation_percent of the previous line.
 	 * Warning: If invoice is a replacement invoice, this->fk_prev_id is id of the replaced line.
 	 *
-	 * @param  int     $invoiceid      Invoice id
+	 * @param  int     $invoiceid      			Invoice id
 	 * @param  bool    $include_credit_note		Include credit note or not
-	 * @return int                     >= 0
+	 * @return int                     			>= 0
 	 */
 	public function get_prev_progress($invoiceid, $include_credit_note = true)
 	{
diff --git a/htdocs/hrm/core/tpl/objectline_view.tpl.php b/htdocs/hrm/core/tpl/objectline_view.tpl.php
index ce436ca604a..21ed0c84561 100644
--- a/htdocs/hrm/core/tpl/objectline_view.tpl.php
+++ b/htdocs/hrm/core/tpl/objectline_view.tpl.php
@@ -104,7 +104,7 @@ global $permissiontoadd;
 if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlines') {
 	$situationinvoicelinewithparent = 0;
 	if ($line->fk_prev_id != null && in_array($object->element, array('facture', 'facturedet'))) {
-		if ($object->type == $object::TYPE_SITUATION) {	// The constant TYPE_SITUATION exists only for object invoice
+		if (!empty($object->situation_cycle_ref)) {
 			// Set constant to disallow editing during a situation cycle
 			$situationinvoicelinewithparent = 1;
 		}
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 4dcd9645350..c81e8f5787a 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -334,76 +334,79 @@ if (empty($reshook)) {
 			if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
 				$fk_parent_line = 0;
 			}
-			if ($invoice->type == Facture::TYPE_SITUATION) {
-				$source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
-				$line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
-				if (!empty($invoice->tab_previous_situation_invoice)) {
-					// search the last standard invoice in cycle and the possible credit note between this last and invoice
-					// TODO Move this out of loop of $invoice->lines
-					$tab_jumped_credit_notes = array();
-					$lineIndex = count($invoice->tab_previous_situation_invoice) - 1;
-					$searchPreviousInvoice = true;
-					while ($searchPreviousInvoice) {
-						if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1) {
-							$searchPreviousInvoice = false; // find, exit;
-							break;
-						} else {
-							if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_CREDIT_NOTE) {
-								$tab_jumped_credit_notes[$lineIndex] = $invoice->tab_previous_situation_invoice[$lineIndex]->id;
-							}
-							$lineIndex--; // go to previous invoice in cycle
-						}
-					}
 
-					$maxPrevSituationPercent = 0;
-					foreach ($invoice->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine) {
-						if ($prevLine->id == $source_fk_prev_id) {
-							$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
-
-							//$line->subprice  = $line->subprice - $prevLine->subprice;
-							$line->total_ht  = $line->total_ht - $prevLine->total_ht;
-							$line->total_tva = $line->total_tva - $prevLine->total_tva;
-							$line->total_ttc = $line->total_ttc - $prevLine->total_ttc;
-							$line->total_localtax1 = $line->total_localtax1 - $prevLine->total_localtax1;
-							$line->total_localtax2 = $line->total_localtax2 - $prevLine->total_localtax2;
-
-							$line->multicurrency_subprice  = $line->multicurrency_subprice - $prevLine->multicurrency_subprice;
-							$line->multicurrency_total_ht  = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;
-							$line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;
-							$line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;
-						}
-					}
-
-					// prorata
-					$line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
-
-					//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
-
-					// If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
-					$maxPrevSituationPercent = 0;
-					foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
-						foreach ($invoice->tab_previous_situation_invoice[$index]->lines as $prevLine) {
-							if ($prevLine->fk_prev_id == $source_fk_prev_id) {
-								$maxPrevSituationPercent = $prevLine->situation_percent;
-
-								$line->total_ht  -= $prevLine->total_ht;
-								$line->total_tva -= $prevLine->total_tva;
-								$line->total_ttc -= $prevLine->total_ttc;
-								$line->total_localtax1 -= $prevLine->total_localtax1;
-								$line->total_localtax2 -= $prevLine->total_localtax2;
-
-								$line->multicurrency_subprice  -= $prevLine->multicurrency_subprice;
-								$line->multicurrency_total_ht  -= $prevLine->multicurrency_total_ht;
-								$line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva;
-								$line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc;
+			if (getDolGlobalInt('INVOICE_USE_SITUATION')) {
+				if (!empty($invoice->situation_counter)) {
+					$source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
+					$line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
+					if (!empty($invoice->tab_previous_situation_invoice)) {
+						// search the last standard invoice in cycle and the possible credit note between this last and invoice
+						// TODO Move this out of loop of $invoice->lines
+						$tab_jumped_credit_notes = array();
+						$lineIndex = count($invoice->tab_previous_situation_invoice) - 1;
+						$searchPreviousInvoice = true;
+						while ($searchPreviousInvoice) {
+							if ($invoice->tab_previous_situation_invoice[$lineIndex]->situation_cycle_ref || $lineIndex < 1) {
+								$searchPreviousInvoice = false; // find, exit;
+								break;
+							} else {
+								if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_CREDIT_NOTE) {
+									$tab_jumped_credit_notes[$lineIndex] = $invoice->tab_previous_situation_invoice[$lineIndex]->id;
+								}
+								$lineIndex--; // go to previous invoice in cycle
 							}
 						}
+
+						$maxPrevSituationPercent = 0;
+						foreach ($invoice->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine) {
+							if ($prevLine->id == $source_fk_prev_id) {
+								$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
+
+								//$line->subprice  = $line->subprice - $prevLine->subprice;
+								$line->total_ht  = $line->total_ht - $prevLine->total_ht;
+								$line->total_tva = $line->total_tva - $prevLine->total_tva;
+								$line->total_ttc = $line->total_ttc - $prevLine->total_ttc;
+								$line->total_localtax1 = $line->total_localtax1 - $prevLine->total_localtax1;
+								$line->total_localtax2 = $line->total_localtax2 - $prevLine->total_localtax2;
+
+								$line->multicurrency_subprice  = $line->multicurrency_subprice - $prevLine->multicurrency_subprice;
+								$line->multicurrency_total_ht  = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;
+								$line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;
+								$line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;
+							}
+						}
+
+						// prorata
+						$line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
+
+						//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
+
+						// If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
+						$maxPrevSituationPercent = 0;
+						foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
+							foreach ($invoice->tab_previous_situation_invoice[$index]->lines as $prevLine) {
+								if ($prevLine->fk_prev_id == $source_fk_prev_id) {
+									$maxPrevSituationPercent = $prevLine->situation_percent;
+
+									$line->total_ht  -= $prevLine->total_ht;
+									$line->total_tva -= $prevLine->total_tva;
+									$line->total_ttc -= $prevLine->total_ttc;
+									$line->total_localtax1 -= $prevLine->total_localtax1;
+									$line->total_localtax2 -= $prevLine->total_localtax2;
+
+									$line->multicurrency_subprice  -= $prevLine->multicurrency_subprice;
+									$line->multicurrency_total_ht  -= $prevLine->multicurrency_total_ht;
+									$line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva;
+									$line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc;
+								}
+							}
+						}
+
+						// prorata
+						$line->situation_percent += $maxPrevSituationPercent;
+
+						//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
 					}
-
-					// prorata
-					$line->situation_percent += $maxPrevSituationPercent;
-
-					//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
 				}
 			}
 

From a0f5c2ec6e338d643974095e2a64b694a29b04ce Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 12:23:00 +0100
Subject: [PATCH 251/300] Better messages

---
 htdocs/core/menus/standard/eldy.lib.php | 7 ++++---
 htdocs/langs/en_US/accountancy.lang     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 7ad2fef730e..c64d4c9cbbc 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1677,7 +1677,7 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 				// Multi journal
 				$sql = "SELECT rowid, code, label, nature";
 				$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
-				$sql .= " WHERE entity = ".$conf->entity;
+				$sql .= " WHERE entity = ".((int) $conf->entity);
 				$sql .= " AND active = 1";
 				$sql .= " ORDER BY nature ASC, label DESC";
 
@@ -1728,11 +1728,12 @@ function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $lef
 								$langs->load('accountancy');
 								$journallabel = '';
 								if ($objp->label) {
+									$journallabelwithoutspan = $langs->transnoentities($objp->label);
 									$journallabel = '<span class="opacitymedium">('.$langs->transnoentities($objp->label).')</span>'; // Label of bank account in llx_accounting_journal
 								}
 
-								$key = $langs->trans("AccountingJournalType".strtoupper($objp->nature));
-								$transferlabel = ($objp->nature && $key != "AccountingJournalType".strtoupper($langs->trans($objp->nature)) ? $key.($journallabel != $key ? ' '.$journallabel : ''): $journallabel);
+								$key = $langs->trans("AccountingJournalType".$objp->nature);	// $objp->nature is 1, 2, 3 ...
+								$transferlabel = (($objp->nature && $key != "AccountingJournalType".$objp->nature) ? $key.($journallabelwithoutspan != $key ? ' '.$journallabel : ''): $journallabel);
 
 								$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $transferlabel, 2, $user->hasRight('accounting',  'comptarapport', 'lire'));
 							}
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 72524d359c2..1886435f8cd 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -442,7 +442,7 @@ NoJournalDefined=No journal defined
 Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Note: this module or page is not completely compatible with the experimental feature of situation invoices. Some data may be wrong.
 AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
 AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
 AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s

From c3c7a386d867d457464de6c9149d547d9097806b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Thu, 2 Mar 2023 23:39:22 +0100
Subject: [PATCH 252/300] fix module is not mandatory in mail_templates

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

diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 25a1ba101ad..cb90eea6508 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-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023  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
@@ -305,13 +305,7 @@ if (empty($reshook)) {
 		$ok = 1;
 		foreach ($listfield as $f => $value) {
 			// Not mandatory fields
-			if ($value == 'joinfiles') {
-				continue;
-			}
-			if ($value == 'content') {
-				continue;
-			}
-			if ($value == 'content_lines') {
+			if (in_array($value, ['joinfiles', 'content', 'content_lines', 'module'])) {
 				continue;
 			}
 

From a1540c92267c38e8953c7cb29c7ea67003358c22 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 13:15:43 +0100
Subject: [PATCH 253/300] NEW Add column ext_payment_site for societe_rib

---
 htdocs/install/mysql/migration/17.0.0-18.0.0.sql | 3 +++
 htdocs/install/mysql/tables/llx_societe_rib.sql  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index f12fd564831..d1a3e5dbba0 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -96,3 +96,6 @@ UPDATE llx_prelevement_demande SET type = 'ban' WHERE ext_payment_id IS NULL AND
 
 ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN fk_user integer;
 
+ALTER TABLE llx_societe_rib ADD COLUMN ext_payment_site varchar(128);
+UPDATE llx_societe_rib SET ext_payment_site = 'StripeTest' WHERE ext_payment_site IS NULL AND (stripe_account LIKE '%@sk_test%' OR stripe_account LIKE '%@pk_test%');
+UPDATE llx_societe_rib SET ext_payment_site = 'Stripe' WHERE ext_payment_site IS NULL AND (stripe_account LIKE '%@sk_live%' OR stripe_account LIKE '%@pk_live%');
diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql
index a798f6ac594..08366b0d711 100644
--- a/htdocs/install/mysql/tables/llx_societe_rib.sql
+++ b/htdocs/install/mysql/tables/llx_societe_rib.sql
@@ -69,9 +69,10 @@ create table llx_societe_rib
   starting_date date,
   total_amount_of_all_payments double(24,8),
 
-  --For Stripe
+  --For Stripe, Stancer, ...
   stripe_card_ref varchar(128),								-- 'card_...'
   stripe_account varchar(128),								-- 'pk_live_...'
+  ext_payment_site varchar(128),							-- 'Stripe', 'StripeTest', 'Stancer', 'StancerTest', ...
 
   comment        varchar(255),
   ipaddress      varchar(68),

From 511b19d27b5d4b413f9d8ecab26f81f08aea3350 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 13:19:40 +0100
Subject: [PATCH 254/300] Revert "NEW Add column ext_payment_site for
 societe_rib"

This reverts commit a1540c92267c38e8953c7cb29c7ea67003358c22.
---
 htdocs/install/mysql/migration/17.0.0-18.0.0.sql | 3 ---
 htdocs/install/mysql/tables/llx_societe_rib.sql  | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index d1a3e5dbba0..f12fd564831 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -96,6 +96,3 @@ UPDATE llx_prelevement_demande SET type = 'ban' WHERE ext_payment_id IS NULL AND
 
 ALTER TABLE llx_recruitment_recruitmentcandidature ADD COLUMN fk_user integer;
 
-ALTER TABLE llx_societe_rib ADD COLUMN ext_payment_site varchar(128);
-UPDATE llx_societe_rib SET ext_payment_site = 'StripeTest' WHERE ext_payment_site IS NULL AND (stripe_account LIKE '%@sk_test%' OR stripe_account LIKE '%@pk_test%');
-UPDATE llx_societe_rib SET ext_payment_site = 'Stripe' WHERE ext_payment_site IS NULL AND (stripe_account LIKE '%@sk_live%' OR stripe_account LIKE '%@pk_live%');
diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql
index 08366b0d711..a798f6ac594 100644
--- a/htdocs/install/mysql/tables/llx_societe_rib.sql
+++ b/htdocs/install/mysql/tables/llx_societe_rib.sql
@@ -69,10 +69,9 @@ create table llx_societe_rib
   starting_date date,
   total_amount_of_all_payments double(24,8),
 
-  --For Stripe, Stancer, ...
+  --For Stripe
   stripe_card_ref varchar(128),								-- 'card_...'
   stripe_account varchar(128),								-- 'pk_live_...'
-  ext_payment_site varchar(128),							-- 'Stripe', 'StripeTest', 'Stancer', 'StancerTest', ...
 
   comment        varchar(255),
   ipaddress      varchar(68),

From f24a2608d2da74d878742e131171eb9497dd0252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 3 Mar 2023 14:04:16 +0100
Subject: [PATCH 255/300] add pictos

---
 htdocs/comm/propal/card.php    |  1 +
 htdocs/commande/card.php       |  1 +
 htdocs/compta/facture/card.php | 12 ++++++++----
 htdocs/contrat/card.php        |  2 ++
 htdocs/fourn/commande/card.php |  1 +
 htdocs/fourn/facture/card.php  | 13 +++++++++----
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 93cc8e52c77..f504cf84cd9 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1943,6 +1943,7 @@ if ($action == 'create') {
 		print '<tr class="field_incoterm_id">';
 		print '<td class="titlefieldcreate"><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->label_incoterms, 1).'</label></td>';
 		print '<td  class="valuefieldcreate maxwidthonsmartphone">';
+		print img_picto('', 'incoterm', 'class="pictofixedwidth"');
 		print $form->select_incoterms((!empty($soc->fk_incoterms) ? $soc->fk_incoterms : ''), (!empty($soc->location_incoterms) ? $soc->location_incoterms : ''));
 		print '</td></tr>';
 	}
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 2decb49f58c..97b3e017505 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1913,6 +1913,7 @@ if ($action == 'create' && $usercancreate) {
 			$incoterm_id = (!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : $soc->fk_incoterms);
 			$incoterm_location = (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : $soc->location_incoterms);
 		}
+		print img_picto('', 'incoterm', 'class="pictofixedwidth"');
 		print $form->select_incoterms($incoterm_id, $incoterm_location);
 		print '</td></tr>';
 	}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index d2117f426ca..1b9b3671db7 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -14,7 +14,7 @@
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2014-2019  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2015-2016  Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2022       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -3200,7 +3200,7 @@ if ($action == 'create') {
 	} else {
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
-		print img_picto('', 'company').$form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status = 1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
+		print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status = 1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
 		// Option to reload page to retrieve customer informations.
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
@@ -3656,18 +3656,21 @@ if ($action == 'create') {
 
 	// Date invoice
 	print '<tr><td class="fieldrequired">'.$langs->trans('DateInvoice').'</td><td colspan="2">';
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	print $form->selectDate($newdateinvoice ? $newdateinvoice : $dateinvoice, '', '', '', '', "add", 1, 1);
 	print '</td></tr>';
 
 	// Date point of tax
 	if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 		print '<tr><td class="fieldrequired">'.$langs->trans('DatePointOfTax').'</td><td colspan="2">';
+		print img_picto('', 'action', 'class="pictofixedwidth"');
 		print $form->selectDate($date_pointoftax ? $date_pointoftax : -1, 'date_pointoftax', '', '', '', "add", 1, 1);
 		print '</td></tr>';
 	}
 
 	// Payment term
 	print '<tr><td class="nowrap fieldrequired">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">';
+	print img_picto('', 'payment', 'class="pictofixedwidth"');
 	print $form->getSelectConditionsPaiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id', 'int') : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
@@ -3724,7 +3727,7 @@ if ($action == 'create') {
 
 	// Payment mode
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
-	print img_picto('', 'payment', 'class="pictofixedwidth"');
+	print img_picto('', 'bank', 'class="pictofixedwidth"');
 	print $form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
 	print '</td></tr>';
 
@@ -3740,7 +3743,7 @@ if ($action == 'create') {
 	if (isModEnabled('project')) {
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
-		print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+		print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id.($fac_rec ? '&fac_rec='.$fac_rec : '')).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td></tr>';
 	}
@@ -3756,6 +3759,7 @@ if ($action == 'create') {
 			$incoterm_id = (!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : $soc->fk_incoterms);
 			$incoterm_location = (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : $soc->location_incoterms);
 		}
+		print img_picto('', 'incoterm', 'class="pictofixedwidth"');
 		print $form->select_incoterms($incoterm_id, $incoterm_location);
 		print '</td></tr>';
 	}
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index e2765f37adc..8afbc4b1f68 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1209,6 +1209,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	print '<tr><td><span class="fieldrequired">'.$langs->trans("Date").'</span></td><td>';
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	print $form->selectDate($datecontrat, '', 0, 0, '', "contrat");
 	print "</td></tr>";
 
@@ -1219,6 +1220,7 @@ if ($action == 'create') {
 		$formproject = new FormProjets($db);
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
+		print img_picto('', 'project', 'class="pictofixedwidth"');
 		$formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, "projectid", 0, 0, 1, 1);
 		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print "</td></tr>";
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0923ef18493..1e99141c95c 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1780,6 +1780,7 @@ if ($action == 'create') {
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
 		print '<td class="maxwidthonsmartphone">';
+		print img_picto('', 'incoterm', 'class="pictofixedwidth"');
 		print $form->select_incoterms($fkincoterms, $locincoterms);
 		print '</td></tr>';
 	}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index a8d9f38ac12..47bf2a6d66a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016  Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2016-2022	Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2023  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Ferran Marcet	        <fmarcet@2byte.es>
  * Copyright (C) 2022       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
@@ -756,8 +756,8 @@ if (empty($reshook)) {
 				$object->date_echeance = $datedue;
 				$object->note_public = GETPOST('note_public', 'restricthtml');
 				$object->note_private = GETPOST('note_private', 'restricthtml');
-				$object->cond_reglement_id	= GETPOST('cond_reglement_id', 'int');
-				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
+				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
 				$object->fk_account			= GETPOST('fk_account', 'int');
 				$object->fk_project			= ($tmpproject > 0) ? $tmpproject : null;
 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
@@ -2175,7 +2175,7 @@ if ($action == 'create') {
 		print $societe->getNomUrl(1, 'supplier');
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
-		print img_picto('', 'company').$form->select_company(empty($societe->id) ? 0 : $societe->id, 'socid', '(s.fournisseur = 1 AND s.status = 1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 widthcentpercentminusxx maxwidth500');
+		print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company(empty($societe->id) ? 0 : $societe->id, 'socid', '(s.fournisseur = 1 AND s.status = 1)', 'SelectThirdParty', 1, 0, null, 0, 'minwidth175 widthcentpercentminusxx maxwidth500');
 		// reload page to retrieve supplier informations
 		if (empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
@@ -2517,16 +2517,19 @@ if ($action == 'create') {
 
 	// Date invoice
 	print '<tr><td class="fieldrequired">'.$langs->trans('DateInvoice').'</td><td>';
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	print $form->selectDate($dateinvoice, '', '', '', '', "add", 1, 1);
 	print '</td></tr>';
 
 	// Payment term
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
+	print img_picto('', 'payment', 'class="pictofixedwidth"');
 	print $form->getSelectConditionsPaiements(GETPOSTISSET('cond_reglement_id') ?GETPOST('cond_reglement_id', 'int') : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	// Due date
 	print '<tr><td>'.$langs->trans('DateMaxPayment').'</td><td>';
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	print $form->selectDate($datedue, 'ech', '', '', '', "add", 1, 1);
 	print '</td></tr>';
 
@@ -2559,6 +2562,7 @@ if ($action == 'create') {
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), !empty($objectsrc->label_incoterms) ? $objectsrc->label_incoterms : '', 1).'</label></td>';
 		print '<td colspan="3" class="maxwidthonsmartphone">';
+		print img_picto('', 'incoterm', 'class="pictofixedwidth"');
 		print $form->select_incoterms(GETPOSTISSET('incoterm_id') ? GETPOST('incoterm_id', 'alphanohtml') : (!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), GETPOSTISSET('location_incoterms') ? GETPOST('location_incoterms', 'alphanohtml') : (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : ''));
 		print '</td></tr>';
 	}
@@ -2568,6 +2572,7 @@ if ($action == 'create') {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="maxwidthonsmartphone">';
+		print img_picto('', 'currency', 'class="pictofixedwidth"');
 		print $form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ?GETPOST('multicurrency_code', 'alpha') : $currency_code), 'multicurrency_code');
 		print '</td></tr>';
 	}

From 8ed361b917d5add464381984f93ef2462bd1a054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 3 Mar 2023 14:36:34 +0100
Subject: [PATCH 256/300] add pictos

---
 htdocs/contact/card.php           | 18 +++++++++---------
 htdocs/margin/customerMargins.php |  2 +-
 htdocs/margin/productMargins.php  |  2 +-
 htdocs/product/card.php           |  4 ++--
 htdocs/product/stock/card.php     |  4 ++--
 htdocs/projet/card.php            |  4 ++--
 htdocs/ticket/card.php            |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index d241bb02e9e..2c2d8df7d80 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -697,7 +697,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '</td></tr>';
 				} else {
 					print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-					print img_picto('', 'company').$form->select_company($socid, 'socid', '', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
+					print img_picto('', 'company', 'class="pictofixedwidth"').$form->select_company($socid, 'socid', '', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
 					print '</td></tr>';
 				}
 			}
@@ -749,7 +749,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Country
 			print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
-			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+			print img_picto('', 'globe-americas', 'class="pictofixedwidth"');
 			print $form->select_country((GETPOST("country_id", 'alpha') ? GETPOST("country_id", 'alpha') : $object->country_id), 'country_id');
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -783,26 +783,26 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Phone / Fax
 			print '<tr><td>'.$form->editfieldkey('PhonePro', 'phone_pro', '', $object, 0).'</td>';
 			print '<td>';
-			print img_picto('', 'object_phoning');
+			print img_picto('', 'object_phoning', 'class="pictofixedwidth"');
 			print '<input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" value="'.(GETPOSTISSET('phone_pro') ? GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
 			print '<td>'.$form->editfieldkey('PhonePerso', 'phone_perso', '', $object, 0).'</td>';
 			print '<td>';
-			print img_picto('', 'object_phoning');
+			print img_picto('', 'object_phoning', 'class="pictofixedwidth"');
 			print '<input type="text" name="phone_perso" id="phone_perso" class="maxwidth200" value="'.(GETPOSTISSET('phone_perso') ? GETPOST('phone_perso', 'alpha') : $object->phone_perso).'"></td></tr>';
 
 			print '<tr><td>'.$form->editfieldkey('PhoneMobile', 'phone_mobile', '', $object, 0).'</td>';
 			print '<td>';
-			print img_picto('', 'object_phoning_mobile');
+			print img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"');
 			print '<input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
 			if ($conf->browser->layout == 'phone') {
 				print '</tr><tr>';
 			}
 			print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
 			print '<td>';
-			print img_picto('', 'object_phoning_fax');
+			print img_picto('', 'object_phoning_fax', 'class="pictofixedwidth"');
 			print '<input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
 			print '</tr>';
 
@@ -813,7 +813,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Email
 			print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '').'</td>';
 			print '<td>';
-			print img_picto('', 'object_email');
+			print img_picto('', 'object_email', 'class="pictofixedwidth"');
 			print '<input type="text" name="email" id="email" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'alpha') : $object->email).'"></td>';
 			print '</tr>';
 
@@ -869,7 +869,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 				print '<tr><td>'.$form->editfieldkey('Categories', 'contcats', '', $object, 0).'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, 'parent', null, null, 1);
-				print img_picto('', 'category').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, null, null, '90%');
+				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('contcats', $cate_arbo, GETPOST('contcats', 'array'), null, null, null, null, '90%');
 				print "</td></tr>";
 			}
 
@@ -1166,7 +1166,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
-				print img_picto('', 'category').$form->multiselectarray('contcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
+				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('contcats', $cate_arbo, $arrayselected, '', 0, '', 0, '90%');
 				print "</td></tr>";
 			}
 
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index df040e68bdb..d6ace40ad16 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -162,7 +162,7 @@ $TCats = $form->select_all_categories('product', array(), '', 64, 0, 1);
 print '<tr>';
 print '<td class="titlefield">'.$langs->trans('Category').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
-print img_picto('', 'category').$form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'quatrevingtpercent widthcentpercentminusx');
+print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'quatrevingtpercent widthcentpercentminusx');
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/margin/productMargins.php b/htdocs/margin/productMargins.php
index 634d0ca50ca..da973c2467e 100644
--- a/htdocs/margin/productMargins.php
+++ b/htdocs/margin/productMargins.php
@@ -126,7 +126,7 @@ $TCats = $form->select_all_categories('product', array(), '', 64, 0, 1);
 print '<tr>';
 print '<td class="titlefield">'.$langs->trans('Category').'</td>';
 print '<td class="maxwidthonsmartphone" colspan="4">';
-print img_picto('', 'category').$form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'quatrevingtpercent widthcentpercentminusx');
+print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $TCats, $TSelectedCats, 0, 0, 'quatrevingtpercent widthcentpercentminusx');
 print '</td>';
 print '</tr>';
 
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 197626d69f3..7594e107995 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1636,7 +1636,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Categories
 			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
-			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+			print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 			print "</td></tr>";
 		}
 
@@ -2200,7 +2200,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						$arrayselected[] = $cat;
 					}
 				}
-				print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 586408d1e5e..ee67248c939 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -383,7 +383,7 @@ if ($action == 'create') {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
-		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+		print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 	print '</table>';
@@ -945,7 +945,7 @@ if ($action == 'create') {
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
-				print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+				print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 				print "</td></tr>";
 			}
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 42d5404f3c9..36bc7b87961 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -816,7 +816,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_PROJECT, '', 'parent', 64, 0, 1);
 		$arrayselected = GETPOST('categories', 'array');
-		print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+		print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 		print "</td></tr>";
 	}
 
@@ -1196,7 +1196,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			foreach ($cats as $cat) {
 				$arrayselected[] = $cat->id;
 			}
-			print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, '0');
+			print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, $arrayselected, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, '0');
 			print "</td></tr>";
 		}
 
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 5bd24b7406e..f542adac005 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -1179,7 +1179,7 @@ if ($action == 'create' || $action == 'presend') {
 						$arrayselected[] = $cat->id;
 					}
 
-					print img_picto('', 'category').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+					print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $cate_arbo, $arrayselected, '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
 					print '<input type="submit" class="button button-edit small" value="'.$langs->trans('Save').'">';
 					print '</form>';
 					print "</td>";

From fd93a3fe15a34abf0c73faa9601d67b7a5c26a64 Mon Sep 17 00:00:00 2001
From: Maximilien Rozniecki <mrozniecki@easya.solutions>
Date: Fri, 3 Mar 2023 14:53:06 +0100
Subject: [PATCH 257/300] not adding the closed contact

---
 htdocs/core/class/html.formticket.class.php |  4 +-
 htdocs/ticket/card.php                      |  2 +-
 htdocs/ticket/class/ticket.class.php        | 87 +++++++--------------
 3 files changed, 32 insertions(+), 61 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index e8187fe7290..8ca26430438 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1470,8 +1470,8 @@ class FormTicket
 			print '<tr class="email_line"><td>'.$langs->trans('MailRecipients').'</td><td>';
 			if ($res) {
 				// Retrieve email of all contacts (internal and external)
-				$contacts = $ticketstat->getInfosTicketInternalContact();
-				$contacts = array_merge($contacts, $ticketstat->getInfosTicketExternalContact());
+				$contacts = $ticketstat->getInfosTicketInternalContact(1);
+				$contacts = array_merge($contacts, $ticketstat->getInfosTicketExternalContact(1));
 
 				$sendto = array();
 
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 5bd24b7406e..1147e07d6e1 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -802,7 +802,7 @@ if ($action == 'create' || $action == 'presend') {
 
 		// Confirmation close
 		if ($action == 'close') {
-			$thirdparty_contacts = $object->getInfosTicketExternalContact();
+			$thirdparty_contacts = $object->getInfosTicketExternalContact(1);
 			$contacts_select = array(
 				'-2' => $langs->trans('TicketNotifyAllTiersAtClose'),
 				'-3' => $langs->trans('TicketNotNotifyTiersAtClose')
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 896eefb2b41..21fc03998f2 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -2039,13 +2039,14 @@ class Ticket extends CommonObject
 	}
 
 	/**
-	 * Retrieve informations about internal contacts
+	 *  Retrieve informations about internal contacts
 	 *
-	 *  @return array       Array with datas : firstname, lastname, socid (-1 for internal users), email, code, libelle, status
+	 *  @param    int     $status     Status of user or company
+	 *  @return array                 Array with datas : firstname, lastname, socid (-1 for internal users), email, code, libelle, status
 	 */
-	public function getInfosTicketInternalContact()
+	public function getInfosTicketInternalContact($status = -1)
 	{
-		return $this->listeContact(-1, 'internal');
+		return $this->listeContact(-1, 'internal', 0, '', $status);
 	}
 
 	/**
@@ -2061,11 +2062,12 @@ class Ticket extends CommonObject
 	/**
 	 * Retrieve informations about external contacts
 	 *
-	 *  @return array       Array with datas : firstname, lastname, socid (-1 for internal users), email, code, libelle, status
+	 *  @param    int     $status     Status of user or company
+	 *  @return array                 Array with datas : firstname, lastname, socid (-1 for internal users), email, code, libelle, status
 	 */
-	public function getInfosTicketExternalContact()
+	public function getInfosTicketExternalContact($status = -1)
 	{
-		return $this->listeContact(-1, 'external');
+		return $this->listeContact(-1, 'external', 0, '', $status);
 	}
 
 	/**
@@ -2129,13 +2131,14 @@ class Ticket extends CommonObject
 	 *    Get array of all contacts for a ticket
 	 *    Override method of file commonobject.class.php to add phone number
 	 *
-	 *    @param	int    	$status 	Status of lines to get (-1=all)
-	 *    @param	string 	$source 	Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
-	 *    @param	int    	$list   	0:Return array contains all properties, 1:Return array contains just id
-	 *    @param    string  $code       Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
-	 *    @return 	array|int      		Array of contacts
+	 *    @param    int     $statusoflink   Status of lines to get (-1=all)
+	 *    @param    string  $source         Source of contact: external or thirdparty (llx_socpeople) or internal (llx_user)
+	 *    @param    int     $list           0:Return array contains all properties, 1:Return array contains just id
+	 *    @param    string  $code           Filter on this code of contact type ('SHIPPING', 'BILLING', ...)
+	 *    @param    int     $status         Status of user or company
+	 *    @return   array|int               Array of contacts
 	 */
-	public function listeContact($status = -1, $source = 'external', $list = 0, $code = '')
+	public function listeContact($statusoflink = -1, $source = 'external', $list = 0, $code = '', $status = -1)
 	{
 		global $langs;
 
@@ -2175,10 +2178,16 @@ class Ticket extends CommonObject
 		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";
 		if ($source == 'internal') {
 			$sql .= " AND tc.source = 'internal'";
+			if ($status >= 0) {
+				$sql .= " AND t.statut = ".((int) $status);
+			}
 		}
 
 		if ($source == 'external' || $source == 'thirdparty') {
 			$sql .= " AND tc.source = 'external'";
+			if ($status >= 0) {
+				$sql .= " AND t.statut = ".((int) $status);
+			}
 		}
 
 		if (!empty($code)) {
@@ -2186,8 +2195,8 @@ class Ticket extends CommonObject
 		}
 
 		$sql .= " AND tc.active=1";
-		if ($status >= 0) {
-			$sql .= " AND ec.statut = ".((int) $status);
+		if ($statusoflink >= 0) {
+			$sql .= " AND ec.statut = ".((int) $statusoflink);
 		}
 
 		$sql .= " ORDER BY t.lastname ASC";
@@ -2498,7 +2507,7 @@ class Ticket extends CommonObject
 					 */
 					if (!empty($conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED)) {
 						// Retrieve internal contact datas
-						$internal_contacts = $object->getInfosTicketInternalContact();
+						$internal_contacts = $object->getInfosTicketInternalContact(1);
 
 						$assigned_user_dont_have_email = '';
 
@@ -2588,7 +2597,7 @@ class Ticket extends CommonObject
 					 */
 					if ($send_email > 0) {
 						// Retrieve internal contact datas
-						$internal_contacts = $object->getInfosTicketInternalContact();
+						$internal_contacts = $object->getInfosTicketInternalContact(1);
 
 						$sendto = array();
 						if (is_array($internal_contacts) && count($internal_contacts) > 0) {
@@ -2657,7 +2666,7 @@ class Ticket extends CommonObject
 						 */
 						if (empty($object->private)) {
 							// Retrieve email of all contacts (external)
-							$external_contacts = $object->getInfosTicketExternalContact();
+							$external_contacts = $object->getInfosTicketExternalContact(1);
 
 							// If no contact, get email from thirdparty
 							if (is_array($external_contacts) && count($external_contacts) === 0) {
@@ -2802,8 +2811,8 @@ class Ticket extends CommonObject
 
 		// If no receiver defined, load all ticket linked contacts
 		if (!is_array($array_receiver) || !count($array_receiver) > 0) {
-			$array_receiver = $this->getInfosTicketInternalContact();
-			$array_receiver = array_merge($array_receiver, $this->getInfosTicketExternalContact());
+			$array_receiver = $this->getInfosTicketInternalContact(1);
+			$array_receiver = array_merge($array_receiver, $this->getInfosTicketExternalContact(1));
 		}
 
 		if ($send_internal_cc) {
@@ -2812,7 +2821,6 @@ class Ticket extends CommonObject
 
 		$from = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM;
 		$is_sent = false;
-		$array_receiver = $this->removeClosedContact($array_receiver);
 		if (is_array($array_receiver) && count($array_receiver) > 0) {
 			foreach ($array_receiver as $key => $receiver) {
 				$deliveryreceipt = 0;
@@ -3029,43 +3037,6 @@ class Ticket extends CommonObject
 		$return .= '</div>';
 		return $return;
 	}
-
-	/**
-	 * Remove the closed contact
-	 *
-	 * @param   array      $to        Array of receiver. exemple array('john@doe.com' => 'John Doe <john@doe.com>', etc...)
-	 * @return  array                 array of email => name
-	 */
-	public function removeClosedContact($to)
-	{
-		global $langs;
-		$langs->load("ticket");
-
-		if (isset($this->id)) {
-			$sql = "SELECT IF(tc.source = 'external', sc.email, u.email)";
-			$sql .= " FROM ".MAIN_DB_PREFIX."element_contact ec";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_type_contact tc on (ec.element_id = ". $this->id ." AND ec.fk_c_type_contact = tc.rowid)";
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople sc on (ec.fk_socpeople = sc.rowid AND tc.source = 'external')";
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u on (ec.fk_socpeople = u.rowid AND tc.source = 'internal')";
-			$sql .= " WHERE IF(tc.source = 'external', sc.statut = 1, u.statut = 1)";
-			$resql = $this->db->query($sql);
-			if ($resql) {
-				$num = $this->db->num_rows($resql);
-				for ($i = 0; $num > $i; $i++) {
-					$non_closed_contacts[] = $this->db->fetch_row($resql);
-				}
-			}
-			$to = array_filter($to, function ($v, $k) use ($non_closed_contacts, $langs) {
-				foreach ($non_closed_contacts as $non_closed_contact) {
-					if ($k == $non_closed_contact[0])
-						return true;
-				}
-				setEventMessages($langs->trans('WarningMailNotSendContactIsClosed', str_replace(array('>', '<'), '', $v)), null, 'warnings');
-				return false;
-			}, ARRAY_FILTER_USE_BOTH);
-		}
-		return $to;
-	}
 }
 
 

From 2f663706cffbd1e7771f0de73d911addba326029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 3 Mar 2023 15:26:32 +0100
Subject: [PATCH 258/300] add pictos

---
 htdocs/expedition/card.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index aac19c7da76..9b565954c1b 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -944,7 +944,7 @@ if ($action == 'create') {
 				$langs->load("projects");
 				print '<tr>';
 				print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
-				print img_picto('', 'project');
+				print img_picto('', 'project', 'class="pictofixedwidth"');
 				$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid', 0);
 				print ' <a class="paddingleft" href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 				print '</td>';
@@ -954,6 +954,7 @@ if ($action == 'create') {
 			// Date delivery planned
 			print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 			print '<td colspan="3">';
+			print img_picto('', 'action', 'class="pictofixedwidth"');
 			$date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date); // $date_delivery comes from GETPOST
 			print $form->selectDate($date_delivery ? $date_delivery : -1, 'date_delivery', 1, 1, 1);
 			print "</td>\n";
@@ -978,7 +979,9 @@ if ($action == 'create') {
 			// Weight
 			print '<tr><td>';
 			print $langs->trans("Weight");
-			print '</td><td colspan="3"><input name="weight" size="4" value="'.GETPOST('weight', 'int').'"> ';
+			print '</td><td colspan="3">';
+			print img_picto('', 'fa-balance-scale', 'class="pictofixedwidth"');
+			print '<input name="weight" size="4" value="'.GETPOST('weight', 'int').'"> ';
 			$text = $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOST('weight_units', 'int'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
 			print $form->textwithpicto($text, $htmltext);
@@ -986,7 +989,9 @@ if ($action == 'create') {
 			// Dim
 			print '<tr><td>';
 			print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
-			print ' </td><td colspan="3"><input name="sizeW" size="4" value="'.GETPOST('sizeW', 'int').'">';
+			print ' </td><td colspan="3">';
+			print img_picto('', 'fa-ruler', 'class="pictofixedwidth"');
+			print '<input name="sizeW" size="4" value="'.GETPOST('sizeW', 'int').'">';
 			print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH', 'int').'">';
 			print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS', 'int').'">';
 			print ' ';
@@ -999,6 +1004,7 @@ if ($action == 'create') {
 			print "<tr><td>".$langs->trans("DeliveryMethod")."</td>";
 			print '<td colspan="3">';
 			$expe->fetch_delivery_methods();
+			print img_picto('', 'dolly', 'class="pictofixedwidth"');
 			print $form->selectarray("shipping_method_id", $expe->meths, GETPOST('shipping_method_id', 'int'), 1, 0, 0, "", 1);
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
@@ -1008,6 +1014,7 @@ if ($action == 'create') {
 			// Tracking number
 			print "<tr><td>".$langs->trans("TrackingNumber")."</td>";
 			print '<td colspan="3">';
+			print img_picto('', 'barcode', 'class="pictofixedwidth"');
 			print '<input name="tracking_number" size="20" value="'.GETPOST('tracking_number', 'alpha').'">';
 			print "</td></tr>\n";
 
@@ -1030,6 +1037,7 @@ if ($action == 'create') {
 				print '<tr>';
 				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
+				print img_picto('', 'incoterm', 'class="pictofixedwidth"');
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''));
 				print '</td></tr>';
 			}
@@ -1040,6 +1048,7 @@ if ($action == 'create') {
 			if (count($list) > 1) {
 				print "<tr><td>".$langs->trans("DefaultModel")."</td>";
 				print '<td colspan="3">';
+				print img_picto('', 'pdf', 'class="pictofixedwidth"');
 				print $form->selectarray('model', $list, $conf->global->EXPEDITION_ADDON_PDF);
 				print "</td></tr>\n";
 			}

From 1692a0832234746dc2d4d96eba1ebaa50f81db03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 3 Mar 2023 15:38:01 +0100
Subject: [PATCH 259/300] add pictos

---
 htdocs/product/card.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 7594e107995..241aec60d8e 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1445,6 +1445,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
 				$tmpcode = $modBarCodeProduct->getNextValue($object, $fk_barcode_type);
 			}
+			print img_picto('', 'barcode', 'class="pictofixedwidth"');
 			print '<input class="maxwidth100" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';
 			print '</td></tr>';
 		}
@@ -1504,6 +1505,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Duration
 		if ($type == 1) {
 			print '<tr><td>'.$langs->trans("Duration").'</td><td>';
+			print img_picto('', 'clock', 'class="pictofixedwidth"');
 			print '<input name="duration_value" size="4" value="'.GETPOST('duration_value', 'int').'">';
 			print $formproduct->selectMeasuringUnits("duration_unit", "time", (GETPOSTISSET('duration_value') ? GETPOST('duration_value', 'alpha') : 'h'), 0, 1);
 
@@ -1531,6 +1533,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if (empty($conf->global->PRODUCT_DISABLE_WEIGHT)) {
 				// Brut Weight
 				print '<tr><td>'.$langs->trans("Weight").'</td><td>';
+				print img_picto('', 'fa-balance-scale', 'class="pictofixedwidth"');
 				print '<input name="weight" size="4" value="'.GETPOST('weight').'">';
 				print $formproduct->selectMeasuringUnits("weight_units", "weight", GETPOSTISSET('weight_units') ?GETPOST('weight_units', 'alpha') : (empty($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? 0 : $conf->global->MAIN_WEIGHT_DEFAULT_UNIT), 0, 2);
 				print '</td></tr>';
@@ -1539,6 +1542,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Brut Length
 			if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {
 				print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td>';
+				print img_picto('', 'fa-ruler', 'class="pictofixedwidth"');
 				print '<input name="size" class="width50" value="'.GETPOST('size').'"> x ';
 				print '<input name="sizewidth" class="width50" value="'.GETPOST('sizewidth').'"> x ';
 				print '<input name="sizeheight" class="width50" value="'.GETPOST('sizeheight').'">';
@@ -1584,7 +1588,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Origin country
 			print '<tr><td>'.$langs->trans("CountryOrigin").'</td>';
 			print '<td>';
-			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+			print img_picto('', 'globe-americas', 'class="pictofixedwidth"');
 			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx maxwidth500');
 			if ($user->admin) {
 				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

From 5ec36ead7fae6f8efd2989bed3f1bd3e7925830b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= <frederic.france@free.fr>
Date: Fri, 3 Mar 2023 15:46:49 +0100
Subject: [PATCH 260/300] add pictos

---
 htdocs/projet/tasks.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 8949c324fbc..7be9a3c93f5 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -755,7 +755,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	// Project
 	print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfProjectTask").'</td><td>';
-	print img_picto('', 'project');
+	print img_picto('', 'project', 'class="pictofixedwidth"');
 	if ($projectoktoentertime) {
 		$formother->selectProjectTasks(GETPOST('task_parent'), empty($projectid) ? $object->id : $projectid, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500 widthcentpercentminusxx');
 	} else {
@@ -767,6 +767,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	// Assigned to
 	print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
+	print img_picto('', 'user', 'class="pictofixedwidth"');
 	if (is_array($contactsofproject) && count($contactsofproject)) {
 		print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
 	} else {
@@ -780,21 +781,25 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	// Date start task
 	print '<tr><td>'.$langs->trans("DateStart").'</td><td>';
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	print $form->selectDate((!empty($date_start) ? $date_start : ''), 'dateo', 1, 1, 0, '', 1, 1);
 	print '</td></tr>';
 
 	// Date end task
 	print '<tr><td>'.$langs->trans("DateEnd").'</td><td>';
+	print img_picto('', 'action', 'class="pictofixedwidth"');
 	print $form->selectDate((!empty($date_end) ? $date_end : -1), 'datee', -1, 1, 0, '', 1, 1);
 	print '</td></tr>';
 
 	// Planned workload
 	print '<tr><td>'.$langs->trans("PlannedWorkload").'</td><td>';
+	print img_picto('', 'clock', 'class="pictofixedwidth"');
 	print $form->select_duration('planned_workload', !empty($planned_workload) ? $planned_workload : 0, 0, 'text');
 	print '</td></tr>';
 
 	// Progress
 	print '<tr><td>'.$langs->trans("ProgressDeclared").'</td><td colspan="3">';
+	print img_picto('', 'fa-percent', 'class="pictofixedwidth"');
 	print $formother->select_percent($progress, 'progress', 0, 5, 0, 100, 1);
 	print '</td></tr>';
 
@@ -814,8 +819,9 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Budget").'</td>';
-	print '<td><input size="5" type="text" name="budget_amount" value="'.dol_escape_htmltag(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : '').'"></td>';
+	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+	print img_picto('', 'currency', 'class="pictofixedwidth"');
+	print '<input size="8" type="text" name="budget_amount" value="'.dol_escape_htmltag(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : '').'"></td>';
 	print '</tr>';
 
 	// Other options

From 2bc158a2bb2140f3c2057ee241e3c6cac974f031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9=20Courtier?= <noe.courtier@scopen.fr>
Date: Fri, 3 Mar 2023 16:08:17 +0100
Subject: [PATCH 261/300] FIX: Resolve error message due to missing arguments

---
 htdocs/fourn/facture/card.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index fe952a31893..8fe4d59aeca 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -884,8 +884,12 @@ if (empty($reshook)) {
 						$totalcreditnotes = $facture_source->getSumCreditNotesUsed();
 						$totaldeposits = $facture_source->getSumDepositsUsed();
 						$remain_to_pay = abs($facture_source->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits);
+						$desc = $langs->trans('invoiceAvoirLineWithPaymentRestAmount');
+						$retAddLine = $object->addline($desc, $remain_to_pay, 0, 0, 0, 1, 0, 0, '', '', 0, '', 'TTC');
 
-						$object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'), $remain_to_pay, 0, 0, 0, 1, 0, 0, '', '', 'TTC');
+						if ($retAddLine < 0) {
+							$error++;
+						}
 					}
 				}
 			}

From 799df44172b6209fc25c620f9b114bcbd04c2600 Mon Sep 17 00:00:00 2001
From: Maximilien Rozniecki <mrozniecki@easya.solutions>
Date: Fri, 3 Mar 2023 16:11:44 +0100
Subject: [PATCH 262/300] added textwithpicto to explain if needed that only
 active user are added as Recipient

---
 htdocs/core/class/html.formticket.class.php | 6 ++++--
 htdocs/langs/en_US/ticket.lang              | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 8ca26430438..9095805489f 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -1277,7 +1277,7 @@ class FormTicket
 		}
 
 		// Load translation files required by the page
-		$langs->loadLangs(array('other', 'mails'));
+		$langs->loadLangs(array('other', 'mails', 'ticket'));
 
 		// Clear temp files. Must be done at beginning, before call of triggers
 		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
@@ -1467,7 +1467,9 @@ class FormTicket
 			print '</td></tr>';
 
 			// Recipients / adressed-to
-			print '<tr class="email_line"><td>'.$langs->trans('MailRecipients').'</td><td>';
+			print '<tr class="email_line"><td>'.$langs->trans('MailRecipients');
+			print ' '.$form->textwithpicto('', $langs->trans("TicketMessageRecipientsHelp"), 1, 'help');
+			print '</td><td>';
 			if ($res) {
 				// Retrieve email of all contacts (internal and external)
 				$contacts = $ticketstat->getInfosTicketInternalContact(1);
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index d48b2c9beb2..570e7c127aa 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -223,7 +223,6 @@ TicketUpdated=Ticket updated
 SendMessageByEmail=Send message by email
 TicketNewMessage=New message
 ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-WarningMailNotSendContactIsClosed=E-mail to %s refused for shipment as this contact is closed
 TicketGoIntoContactTab=Please go into "Contacts" tab to select them
 TicketMessageMailIntro=Message header
 TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
@@ -248,6 +247,7 @@ TicketAssignedEmailBody=You have been assigned the ticket #%s by %s
 MarkMessageAsPrivate=Mark message as private
 TicketMessageSendEmailHelp=An email will be sent to all assigned contact (internal contacts, but also external contacts except if the option "%s" is checked)
 TicketMessagePrivateHelp=This message will not display to external users
+TicketMessageRecipientsHelp=Recipient field completed with active contacts linked to the ticket
 TicketEmailOriginIssuer=Issuer at origin of the tickets
 InitialMessage=Initial Message
 LinkToAContract=Link to a contract

From 6992fec6c57f26367f153cbb2226664e7a53d0e4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 16:32:31 +0100
Subject: [PATCH 263/300] Fix php 7.0 compatibility

---
 .../php-imap/vendor/symfony/polyfill-php80/bootstrap.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/includes/webklex/php-imap/vendor/symfony/polyfill-php80/bootstrap.php b/htdocs/includes/webklex/php-imap/vendor/symfony/polyfill-php80/bootstrap.php
index e5f7dbc1a45..0f8a9e3565f 100644
--- a/htdocs/includes/webklex/php-imap/vendor/symfony/polyfill-php80/bootstrap.php
+++ b/htdocs/includes/webklex/php-imap/vendor/symfony/polyfill-php80/bootstrap.php
@@ -26,13 +26,13 @@ if (!function_exists('preg_last_error_msg')) {
     function preg_last_error_msg(): string { return p\Php80::preg_last_error_msg(); }
 }
 if (!function_exists('str_contains')) {
-    function str_contains(?string $haystack, ?string $needle): bool { return p\Php80::str_contains($haystack ?? '', $needle ?? ''); }
+    function str_contains($haystack, $needle): bool { return p\Php80::str_contains($haystack ?? '', $needle ?? ''); }
 }
 if (!function_exists('str_starts_with')) {
-    function str_starts_with(?string $haystack, ?string $needle): bool { return p\Php80::str_starts_with($haystack ?? '', $needle ?? ''); }
+    function str_starts_with($haystack, $needle): bool { return p\Php80::str_starts_with($haystack ?? '', $needle ?? ''); }
 }
 if (!function_exists('str_ends_with')) {
-    function str_ends_with(?string $haystack, ?string $needle): bool { return p\Php80::str_ends_with($haystack ?? '', $needle ?? ''); }
+    function str_ends_with($haystack, $needle): bool { return p\Php80::str_ends_with($haystack ?? '', $needle ?? ''); }
 }
 if (!function_exists('get_debug_type')) {
     function get_debug_type($value): string { return p\Php80::get_debug_type($value); }

From f497f4d6e920baef854dc700d9c8a6ea4d23756c Mon Sep 17 00:00:00 2001
From: hystepik <lucas.marcouiller@gmail.com>
Date: Fri, 3 Mar 2023 16:45:21 +0100
Subject: [PATCH 264/300] Fix : php 8.0 warnings

---
 .../compta/paiement/class/paiement.class.php  |  5 ++--
 .../conferenceorboothattendee_card.php        | 13 +++++----
 .../conferenceorboothattendee_list.php        | 28 +++++++++----------
 htdocs/projet/element.php                     |  2 +-
 htdocs/projet/tasks/task.php                  |  1 +
 htdocs/user/group/list.php                    |  1 +
 6 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 373fa2d5175..a473f06cd04 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -275,9 +275,8 @@ class Paiement extends CommonObject
 				return -1;
 			}
 			if (empty($currencyofpayment)) {
-				$currencyofpayment = $this->multicurrency_code[$key];
-			}
-			if ($currencyofpayment != $this->multicurrency_code[$key]) {
+				$currencyofpayment = isset($this->multicurrency_code[$key]) ? $this->multicurrency_code[$key] : "";
+			} else if ($currencyofpayment != $this->multicurrency_code[$key]) {
 				// If we have invoices with different currencies in the payment, we stop here
 				$this->error = 'ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment';
 				return -1;
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index 9bab2a7f49d..cb31eb4ac62 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -47,7 +47,8 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothattendeecard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-//$lineid   = GETPOST('lineid', 'int');
+$lineid   = GETPOST('lineid', 'int');
+$mode = GETPOST('mode', 'alpha');
 
 $conf_or_booth_id = GETPOST('conforboothid', 'int');
 $fk_project = GETPOST('fk_project', 'int');
@@ -233,7 +234,7 @@ if (!empty($withproject)) {
 	// Title
 	$morehtmlref .= $projectstatic->title;
 	// Thirdparty
-	if ($projectstatic->thirdparty->id > 0) {
+	if (!empty($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
 		$morehtmlref .= '<br>'.$projectstatic->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref .= '</div>';
@@ -384,7 +385,7 @@ if (!empty($withproject)) {
 	//print '</span>';
 	print '</td><td>';
 	$linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.$projectstatic->id;
-	$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$projectstatic->id, 'md5');
+	$encodedsecurekey = dol_hash(getDolGlobalString("EVENTORGANIZATION_SECUREKEY").'conferenceorbooth'.$projectstatic->id, 'md5');
 	$linksuggest .= '&securekey='.urlencode($encodedsecurekey);
 	//print '<div class="urllink">';
 	//print '<input type="text" value="'.$linksuggest.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
@@ -401,7 +402,7 @@ if (!empty($withproject)) {
 	//print '</span>';
 	print '</td><td>';
 	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.$projectstatic->id.'&type=global';
-	$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$projectstatic->id, 'md5');
+	$encodedsecurekey = dol_hash(getDolGlobalString("EVENTORGANIZATION_SECUREKEY").'conferenceorbooth'.$projectstatic->id, 'md5');
 	$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 	//print '<div class="urllink">';
 	//print '<input type="text" value="'.$linkregister.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
@@ -563,7 +564,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.dol_buildpath('/eventorganization/conferenceorboothattendee_list.php', 1).'?restore_lastsearch_values=1'.($confOrBooth->id > 0 ? '&conforboothid='.((int) $confOrBooth->id) : '').$moreparam.'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.dol_buildpath('/eventorganization/conferenceorboothattendee_list.php', 1).'?restore_lastsearch_values=1'.(!empty($confOrBooth->id) && $confOrBooth->id > 0 ? '&conforboothid='.((int) $confOrBooth->id) : '').$moreparam.'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
 
@@ -610,7 +611,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.(!empty($confOrBooth->id)?'&conforboothid='.$confOrBooth->id:'').(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:'').'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// Clone
-			print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken().(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:''), '', $permissiontoadd);
+			print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&token='.newToken().(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:''), '', $permissiontoadd);
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
 			print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:''), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index 1bc9c12d4f6..b9037a366c3 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -57,6 +57,7 @@ $toselect    = GETPOST('toselect', 'array');   // Array of ids of elements selec
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothattendeelist';   // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha');   // Go back to a dedicated page
 $optioncss   = GETPOST('optioncss', 'aZ');   // Option for the css output (always '' except when 'print')
+$mode        = GETPOST('mode', 'alpha');
 
 $id = GETPOST('id', 'int');
 $conf_or_booth_id = GETPOST('conforboothid', 'int');
@@ -239,11 +240,6 @@ $now = dol_now();
 
 //$help_url="EN:Module_ConferenceOrBoothAttendee|FR:Module_ConferenceOrBoothAttendee_FR|ES:Módulo_ConferenceOrBoothAttendee";
 $help_url = '';
-if ($confOrBooth->id > 0) {
-	$title = $langs->trans('ListOfAttendeesPerConference');
-} else {
-	$title = $langs->trans('ListOfAttendeesOfEvent');
-}
 $morejs = array();
 $morecss = array();
 
@@ -377,7 +373,11 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 	exit;
 }
 
-
+if ($confOrBooth->id > 0) {
+	$title = $langs->trans('ListOfAttendeesPerConference');
+} else {
+	$title = $langs->trans('ListOfAttendeesOfEvent');
+}
 
 llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
 
@@ -412,7 +412,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		// Title
 		$morehtmlref .= $projectstatic->title;
 		// Thirdparty
-		if ($projectstatic->thirdparty->id > 0) {
+		if (!empty($projectstatic->thirdparty->id) && $projectstatic->thirdparty->id > 0) {
 			$morehtmlref .= '<br>'.$projectstatic->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref .= '</div>';
@@ -591,7 +591,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		//print '</span>';
 		print '</td><td>';
 		$linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.$projectstatic->id;
-		$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$projectstatic->id, 'md5');
+		$encodedsecurekey = dol_hash(getDolUserString("EVENTORGANIZATION_SECUREKEYEVENTORGANIZATION_SECUREKEY").'conferenceorbooth'.$projectstatic->id, 'md5');
 		$linksuggest .= '&securekey='.urlencode($encodedsecurekey);
 		//print '<div class="urllink">';
 		//print '<input type="text" value="'.$linksuggest.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
@@ -608,7 +608,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		//print '</span>';
 		print '</td><td>';
 		$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.$projectstatic->id.'&type=global';
-		$encodedsecurekey = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$projectstatic->id, 'md5');
+		$encodedsecurekey = dol_hash(getDolUserString("EVENTORGANIZATION_SECUREKEY").'conferenceorbooth'.$projectstatic->id, 'md5');
 		$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
 		//print '<div class="urllink">';
 		//print '<input type="text" value="'.$linkregister.'" id="linkregister" class="quatrevingtpercent paddingrightonly">';
@@ -630,7 +630,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		if (empty($confOrBooth->id)) {
 			$head = conferenceorboothProjectPrepareHead($projectstatic);
 			$tab = 'attendees';
-			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($project->public ? 'projectpub' : 'project'), 0, '', 'reposition');
+			print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, (!empty($project->public) ? 'projectpub' : 'project'), 0, '', 'reposition');
 		}
 	}
 
@@ -797,11 +797,11 @@ foreach ($object->fields as $key => $val) {
 	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'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
 		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.(isset($search[$key]) ? dol_escape_htmltag($search[$key]) : "").'">';
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -872,6 +872,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -880,7 +881,6 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
-
 	// Show here line of result
 	print '<tr class="oddeven">';
 	foreach ($object->fields as $key => $val) {
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 935275bfe54..7d6d33be834 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -793,7 +793,7 @@ foreach ($listofreferent as $key => $value) {
 			for ($i = 0; $i < $num; $i++) {
 				$tmp = explode('_', $elementarray[$i]);
 				$idofelement = $tmp[0];
-				$idofelementuser = $tmp[1];
+				$idofelementuser = !empty($tmp[1]) ? $tmp[1] : "";
 
 				$element->fetch($idofelement);
 				if ($idofelementuser) {
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index dfa26202a2d..8a0d976b379 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -46,6 +46,7 @@ $taskref = GETPOST("taskref", 'alpha'); // task ref
 $withproject = GETPOST('withproject', 'int');
 $project_ref = GETPOST('project_ref', 'alpha');
 $planned_workload = ((GETPOST('planned_workloadhour', 'int') != '' || GETPOST('planned_workloadmin', 'int') != '') ? (GETPOST('planned_workloadhour', 'int') > 0 ?GETPOST('planned_workloadhour', 'int') * 3600 : 0) + (GETPOST('planned_workloadmin', 'int') > 0 ?GETPOST('planned_workloadmin', 'int') * 60 : 0) : '');
+$mode = GETPOST('mode', 'alpha');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskcard', 'globalcard'));
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 05adcf15059..94331d44d3d 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -45,6 +45,7 @@ $mode       = GETPOST('mode', 'aZ');
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_group = GETPOST('search_group');
+$search = array();
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;

From 21aa69b11afd87ccbe05ab2aa3fb396e3657e221 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Fri, 3 Mar 2023 15:46:13 +0000
Subject: [PATCH 265/300] Fixing style errors.

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

diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index a473f06cd04..e16834e5707 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -276,7 +276,7 @@ class Paiement extends CommonObject
 			}
 			if (empty($currencyofpayment)) {
 				$currencyofpayment = isset($this->multicurrency_code[$key]) ? $this->multicurrency_code[$key] : "";
-			} else if ($currencyofpayment != $this->multicurrency_code[$key]) {
+			} elseif ($currencyofpayment != $this->multicurrency_code[$key]) {
 				// If we have invoices with different currencies in the payment, we stop here
 				$this->error = 'ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment';
 				return -1;

From 49c9700da10a7c3830a23a29a1f66b15ea7dfd15 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 17:03:36 +0100
Subject: [PATCH 266/300] Debug v17

---
 htdocs/admin/emailcollector_card.php                 | 4 ++--
 htdocs/emailcollector/class/emailcollector.class.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index d140dd39ce2..d2a904fecf8 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -35,8 +35,6 @@ include_once DOL_DOCUMENT_ROOT.'/emailcollector/class/emailcollectorfilter.class
 include_once DOL_DOCUMENT_ROOT.'/emailcollector/class/emailcollectoraction.class.php';
 include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php';
 
-// use Webklex\PHPIMAP;
-require DOL_DOCUMENT_ROOT.'/includes/webklex/php-imap/vendor/autoload.php';
 use Webklex\PHPIMAP\ClientManager;
 use Webklex\PHPIMAP\Exceptions\ConnectionFailedException;
 use Webklex\PHPIMAP\Exceptions\InvalidWhereQueryCriteriaException;
@@ -403,6 +401,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($action == 'scan') {
 		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+			require_once DOL_DOCUMENT_ROOT.'/includes/webklex/php-imap/vendor/autoload.php';
+
 			if ($object->acces_type == 1) {
 				// Mode OAUth2 with PHP-IMAP
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 19cd890ccd6..46a73e38b36 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -44,9 +44,6 @@ require_once DOL_DOCUMENT_ROOT .'/ticket/class/ticket.class.php';
 //require_once DOL_DOCUMENT_ROOT .'/holiday/class/holiday.class.php';                    // Holidays (leave request)
 
 
-// use Webklex\PHPIMAP;
-require DOL_DOCUMENT_ROOT .'/includes/webklex/php-imap/vendor/autoload.php';
-
 use Webklex\PHPIMAP\ClientManager;
 use Webklex\PHPIMAP\Exceptions\ConnectionFailedException;
 use Webklex\PHPIMAP\Exceptions\InvalidWhereQueryCriteriaException;
@@ -1026,6 +1023,9 @@ class EmailCollector extends CommonObject
 		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+		if (!empty($conf->global->MAIN_IMAP_USE_PHPIMAP)) {
+			require_once DOL_DOCUMENT_ROOT.'/includes/webklex/php-imap/vendor/autoload.php';
+		}
 
 		dol_syslog("EmailCollector::doCollectOneCollector start for id=".$this->id." - ".$this->ref, LOG_DEBUG);
 

From 34223cd392f215d5ffb8c74b2bdf417753534eb7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 17:14:07 +0100
Subject: [PATCH 267/300] Debug v17

---
 htdocs/admin/emailcollector_card.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index d2a904fecf8..23ccea552e1 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -448,8 +448,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 						// We have to save the token because Google give it only once
 						$refreshtoken = $tokenobj->getRefreshToken();
+
 						//var_dump($tokenobj);
-						$tokenobj = $apiService->refreshAccessToken($tokenobj);
+						try {
+							$tokenobj = $apiService->refreshAccessToken($tokenobj);
+						} catch (Exception $e) {
+							throw new Exception("Failed to refresh access token: ".$e->getMessage());
+						}
 
 						$tokenobj->setRefreshToken($refreshtoken);
 						$storage->storeAccessToken($OAUTH_SERVICENAME, $tokenobj);
@@ -496,6 +501,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					'authentication' => "login",
 				]);
 			}
+
 			if (!$error) {
 				try {
 					// To emulate the command connect, you can run
@@ -571,7 +577,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$morehtml .= '<a class="flat" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=scan&token='.newToken().'">'.img_picto('', 'refresh', 'class="paddingrightonly"').$langs->trans("Refresh").'</a>';
 	}
 
-	$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
+	$morehtml .= $form->textwithpicto('', 'Connect string = '.$connectstringserver.'<br>Option MAIN_IMAP_USE_PHPIMAP = '.getDolGlobalInt('MAIN_IMAP_USE_PHPIMAP'));
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref.'<div class="refidno">'.$morehtml.'</div>', '', 0, '', '', 0, '');
 

From 4616d2b9e60ec47f205addbd19c74db50d85bbf3 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 18:02:56 +0100
Subject: [PATCH 268/300] Clean code

---
 htdocs/core/lib/functions.lib.php |  1 +
 htdocs/stripe/admin/stripe.php    | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 7859bf9f456..db604dd4ce6 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1125,6 +1125,7 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 				}
 				continue;
 			}
+			$regs = array();
 			preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?'
 			if (!empty($regs[1])) {
 				//print $key.'-'.$dirroot.'/'.$path.'-'.$conf->file->dol_url_root[$type].'<br>'."\n";
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 11fb6c6e442..eb8c36fe4ba 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -232,8 +232,11 @@ if (empty($conf->stripeconnect->enabled)) {
 		print '<br>';
 	}
 	print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.getDolGlobalString('STRIPE_TEST_WEBHOOK_KEY').'" placeholder="'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx">';
-	  $out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForTestWebhook").'</span> ';
-	$url = dol_buildpath('/public/stripe/ipn.php?test', 3);
+	$out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForTestWebhook").'</span> ';
+	$url = dol_buildpath('/public/stripe/ipn.php', 3);
+	$url .= '?test=1';
+	//global $dolibarr_main_instance_unique_id;
+	//$url .= '&securitykey='.dol_hash('stripeipn-'.$dolibarr_main_instance_unique_id.'-'.$conf->global->STRIPE_TEST_PUBLISHABLE_KEY, 'md5');
 	$out .= '<input type="text" id="onlinetestwebhookurl" class="minwidth500" value="'.$url.'" disabled>';
 	$out .= ajax_autoselect("onlinetestwebhookurl", 0);
 	print '<br>'.$out;
@@ -250,7 +253,7 @@ if (empty($conf->stripeconnect->enabled)) {
 					$endpoint->disabled = false;
 				}
 			}
-			$endpoint->url = dol_buildpath('/public/stripe/ipn.php?test', 3);
+			$endpoint->url = $url;
 			$endpoint->save();
 			if ($endpoint->status == 'enabled') {
 				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';
@@ -296,6 +299,8 @@ if (empty($conf->stripeconnect->enabled)) {
 	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.getDolGlobalString('STRIPE_LIVE_WEBHOOK_KEY').'" placeholder="'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx">';
 	$out = img_picto('', 'globe', 'class="pictofixedwidth"').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForLiveWebhook").'</span> ';
 	$url = dol_buildpath('/public/stripe/ipn.php', 3);
+	//global $dolibarr_main_instance_unique_id;
+	//$url .= '?securitykey='.dol_hash('stripeipn-'.$dolibarr_main_instance_unique_id.'-'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY, 'md5');
 	$out .= '<input type="text" id="onlinelivewebhookurl" class="minwidth500" value="'.$url.'" disabled>';
 	$out .= ajax_autoselect("onlinelivewebhookurl", 0);
 	print '<br>'.$out;
@@ -312,7 +317,7 @@ if (empty($conf->stripeconnect->enabled)) {
 					$endpoint->disabled = false;
 				}
 			}
-			$endpoint->url = dol_buildpath('/public/stripe/ipn.php', 3);
+			$endpoint->url = $url;
 			$endpoint->save();
 			if ($endpoint->status == 'enabled') {
 				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=ipn&webhook='.$endpoint->id.'&status=0">';

From 412a1e14531c91dd2a2d4dd64d61d070d1467661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NASSIET?=
 <109105553+comaiteseb@users.noreply.github.com>
Date: Fri, 3 Mar 2023 18:26:00 +0100
Subject: [PATCH 269/300] FIX impossible to edit user if you are admin

Line 128 surcharged the line 111 even if you ard admin ou user->user->write.
So I was impossible to update user card if it was not yours...
---
 htdocs/user/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 08c2defd546..af1e198dcc3 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -125,7 +125,7 @@ if ($user->id != $id && !$canreaduser) {
 // Define value to know what current user can do on properties of edited user
 if ($id > 0) {
 	// $user is the current logged user, $id is the user we want to edit
-	$canedituser = (($user->id == $id) && $user->hasRight("user", "self", "write"));	// can edit myself
+	$canedituser = (($user->id == $id) && $user->hasRight("user", "self", "write")) || (!empty($user->admin) || $user->hasRight("user", "user", "write"));  // can edit myself
 	$caneditfield = ((($user->id == $id) && $user->hasRight("user", "self", "write")) || (($user->id != $id) && $user->hasRight("user", "user", "write")));
 	$caneditpassword = ((($user->id == $id) && $user->hasRight("user", "self", "password")) || (($user->id != $id) && $user->hasRight("user", "user", "password")));
 }

From 7de2219e07b75b7711fd30fb1ac6f2724d59b0b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 18:46:29 +0100
Subject: [PATCH 270/300] Add log for IPN file

---
 htdocs/public/stripe/ipn.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index a194e88627b..4012d664119 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -100,9 +100,17 @@ if (!empty($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS)) {
  */
 
 $payload = @file_get_contents("php://input");
-$sig_header = $_SERVER["HTTP_STRIPE_SIGNATURE"];
+$sig_header = empty($_SERVER["HTTP_STRIPE_SIGNATURE"]) ? $_SERVER["HTTP_STRIPE_SIGNATURE"] : '';
 $event = null;
 
+$fh = fopen(DOL_DATA_ROOT.'/dolibarr_stripe.log', 'w+');
+if ($fh) {
+	fwrite($fh, 'HTTP_STRIPE_SIGNATURE='.$sig_header."\n");
+	fwrite($fh, $payload);
+	fclose($fh);
+	dolChmod(DOL_DATA_ROOT.'/dolibarr_stripe.log');
+}
+
 $error = 0;
 
 try {
@@ -112,6 +120,8 @@ try {
 	httponly_accessforbidden('Invalid payload', 400);
 } catch (\Stripe\Error\SignatureVerification $e) {
 	httponly_accessforbidden('Invalid signature', 400);
+} catch (Exception $e) {
+	httponly_accessforbidden('Error '.$e->getMessage(), 400);
 }
 
 // Do something with $event

From 7846641af226061f4c3d210da370d2d3a33b5479 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 18:47:11 +0100
Subject: [PATCH 271/300] Fix warning

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

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 4012d664119..5ff79f7011c 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -100,7 +100,7 @@ if (!empty($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS)) {
  */
 
 $payload = @file_get_contents("php://input");
-$sig_header = empty($_SERVER["HTTP_STRIPE_SIGNATURE"]) ? $_SERVER["HTTP_STRIPE_SIGNATURE"] : '';
+$sig_header = empty($_SERVER["HTTP_STRIPE_SIGNATURE"]) ? '' : $_SERVER["HTTP_STRIPE_SIGNATURE"];
 $event = null;
 
 $fh = fopen(DOL_DATA_ROOT.'/dolibarr_stripe.log', 'w+');

From 3533c8a4c3b370f16b65772b92e88c9886fa19bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 19:19:56 +0100
Subject: [PATCH 272/300] NEW Add STRIPE_DEBUG, a way to log Stripe IPN

---
 htdocs/public/stripe/ipn.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 5ff79f7011c..e0c1780c2c9 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -103,12 +103,14 @@ $payload = @file_get_contents("php://input");
 $sig_header = empty($_SERVER["HTTP_STRIPE_SIGNATURE"]) ? '' : $_SERVER["HTTP_STRIPE_SIGNATURE"];
 $event = null;
 
-$fh = fopen(DOL_DATA_ROOT.'/dolibarr_stripe.log', 'w+');
-if ($fh) {
-	fwrite($fh, 'HTTP_STRIPE_SIGNATURE='.$sig_header."\n");
-	fwrite($fh, $payload);
-	fclose($fh);
-	dolChmod(DOL_DATA_ROOT.'/dolibarr_stripe.log');
+if (getDolGlobalString('STRIPE_DEBUG')) {
+	$fh = fopen(DOL_DATA_ROOT.'/dolibarr_stripe.log', 'w+');
+	if ($fh) {
+		fwrite($fh, dol_print_date(dol_now('gmt'), 'standard').' HTTP_STRIPE_SIGNATURE='.$sig_header."\n");
+		fwrite($fh, $payload);
+		fclose($fh);
+		dolChmod(DOL_DATA_ROOT.'/dolibarr_stripe.log');
+	}
 }
 
 $error = 0;

From 71da2c80f03adce408f7e29d1eb25ea9cf4abd99 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 19:58:04 +0100
Subject: [PATCH 273/300] Add log

---
 htdocs/core/lib/payments.lib.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 29947dda57c..3d7aa95f8ca 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -251,6 +251,8 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 	$urltouse = DOL_MAIN_URL_ROOT;
+	dol_syslog("getOnlinePaymentUrl DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT);
+
 	if ($localorexternal) {
 		$urltouse = $urlwithroot;
 	}

From 3d51fb2f7e0e5c35b657a8a900ad3d9dd2701a65 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 3 Mar 2023 20:55:07 +0100
Subject: [PATCH 274/300] Doc

---
 htdocs/core/lib/payments.lib.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 3d7aa95f8ca..3dfccc88ea5 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -250,8 +250,8 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 	$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
 
-	$urltouse = DOL_MAIN_URL_ROOT;
-	dol_syslog("getOnlinePaymentUrl DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT);
+	$urltouse = DOL_MAIN_URL_ROOT;						// Should be "https://www.mydomain.com/mydolibarr" for example
+	//dol_syslog("getOnlinePaymentUrl DOL_MAIN_URL_ROOT=".DOL_MAIN_URL_ROOT);
 
 	if ($localorexternal) {
 		$urltouse = $urlwithroot;

From d9a399226aee1ed6d6c53420cb6eef71799db457 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Mar 2023 12:16:38 +0100
Subject: [PATCH 275/300] Work on Stripe SEPA payments

---
 htdocs/compta/facture/prelevement.php     | 37 ++++++++++++++++----
 htdocs/core/class/commoninvoice.class.php | 41 +++++++++++++----------
 2 files changed, 55 insertions(+), 23 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index ae2209acacc..5224d5e7f09 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -141,8 +141,23 @@ if (empty($reshook)) {
 	}
 
 	// Make payment with Direct Debit Stripe
-	if ($action == 'sepastripepayment' && $usercancreate) {
+	if ($action == 'sepastripedirectdebit' && $usercancreate) {
 		$result = $object->makeStripeSepaRequest($user, GETPOST('did', 'int'), 'direct-debit', 'facture');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		} else {
+			// We refresh object data
+			$ret = $object->fetch($id, $ref);
+			$isdraft = (($object->statut == Facture::STATUS_DRAFT) ? 1 : 0);
+			if ($ret > 0) {
+				$object->fetch_thirdparty();
+			}
+		}
+	}
+
+	// Make payment with Direct Debit Stripe
+	if ($action == 'sepastripecredittransfer' && $usercancreate) {
+		$result = $object->makeStripeSepaRequest($user, GETPOST('did', 'int'), 'bank-transfer', 'supplier_invoice');
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
@@ -886,12 +901,22 @@ if ($object->id > 0) {
 				print $withdrawreceipt->getNomUrl(1);
 			}
 
-			if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
-				$langs->load("stripe");
-				if ($obj->fk_prelevement_bons > 0) {
-					print ' &nbsp; ';
+			if ($type != 'bank-transfer') {
+				if (!empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+					$langs->load("stripe");
+					if ($obj->fk_prelevement_bons > 0) {
+						print ' &nbsp; ';
+					}
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=sepastripedirectdebit&paymentservice=stripesepa&token='.newToken().'&did='.$obj->rowid.'&id='.$object->id.'&type='.urlencode($type).'">'.img_picto('', 'stripe', 'class="pictofixedwidth"').$langs->trans("RequestDirectDebitWithStripe").'</a>';
+				}
+			} else {
+				if (!empty($conf->global->STRIPE_SEPA_CREDIT_TRANSFER)) {
+					$langs->load("stripe");
+					if ($obj->fk_prelevement_bons > 0) {
+						print ' &nbsp; ';
+					}
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=sepastripecredittransfer&paymentservice=stripesepa&token='.newToken().'&did='.$obj->rowid.'&id='.$object->id.'&type='.urlencode($type).'">'.img_picto('', 'stripe', 'class="pictofixedwidth"').$langs->trans("RequestDirectDebitWithStripe").'</a>';
 				}
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=sepastripepayment&paymentservice=stripesepa&token='.newToken().'&did='.$obj->rowid.'&id='.$object->id.'&type='.urlencode($type).'">'.img_picto('', 'stripe', 'class="pictofixedwidth"').$langs->trans("RequestDirectDebitWithStripe").'</a>';
 			}
 			print '</td>';
 
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 34eaf847f2c..e7e31cc9398 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -877,8 +877,7 @@ abstract class CommonInvoice extends CommonObject
 
 
 	/**
-	 *	Create a payment order for a prelevement_demande
-	 *  Then send the payment order to Stripe (for a direct debit order or a credit transfer order).
+	 *	Create a payment order into prelevement_demande then send the payment order to Stripe (for a direct debit order or a credit transfer order).
 	 *
 	 *	@param      User	$fuser      	User asking the direct debit transfer
 	 *  @param		int		$did			ID of unitary payment request to pay
@@ -890,8 +889,10 @@ abstract class CommonInvoice extends CommonObject
 	{
 		global $conf, $mysoc, $user, $langs;
 
-		if (empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
-			//exit
+		if ($type != 'bank-transfer' && empty($conf->global->STRIPE_SEPA_DIRECT_DEBIT)) {
+			return 0;
+		}
+		if ($type != 'direct-debit' && empty($conf->global->STRIPE_SEPA_CREDIT_TRANSFER)) {
 			return 0;
 		}
 
@@ -915,7 +916,12 @@ abstract class CommonInvoice extends CommonObject
 			$sql = "SELECT rowid, date_demande, amount, fk_facture, fk_facture_fourn, fk_prelevement_bons";
 			$sql .= " FROM ".$this->db->prefix()."prelevement_demande";
 			$sql .= " WHERE rowid = ".((int) $did);
-			$sql .= " AND fk_facture = ".((int) $this->id);		// Add a protection to not pay another invoice than current one
+			if ($type != 'direct-debit') {
+				$sql .= " AND fk_facture = ".((int) $this->id);		// Add a protection to not pay another invoice than current one
+			}
+			if ($type != 'credit-transfer') {
+				$sql .= " AND fk_facture_fourn = ".((int) $this->id);		// Add a protection to not pay another invoice than current one
+			}
 			$sql .= " AND traite = 0";	// Add a protection to not process twice
 
 			dol_syslog(get_class($this)."::makeStripeSepaRequest load requests to process", LOG_DEBUG);
@@ -936,7 +942,7 @@ abstract class CommonInvoice extends CommonObject
 					$companypaymentmode->fetch($bac->id);
 
 					// Start code for Stripe
-					// TODO This must come from a parameter ? or the method may not work as expected when used from a batch ?
+					// TODO We may have this coming as a parameter from the caller.
 					$service = 'StripeTest';
 					$servicestatus = 0;
 					if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
@@ -974,7 +980,7 @@ abstract class CommonInvoice extends CommonObject
 						$amountstripe = $amountstripe * 100;
 					}
 
-					$fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');
+					$fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');		// Bank account used for SEPA direct debit or credit transfer. Must be the Stripe account in Dolibarr.
 					if (!($fk_bank_account > 0)) {
 						$error++;
 						$errorforinvoice++;
@@ -989,7 +995,7 @@ abstract class CommonInvoice extends CommonObject
 					if (!$error) {
 						if (empty($obj->fk_prelevement_bons)) {
 							// This create record into llx_prelevment_bons and update link with llx_prelevement_demande
-							$nbinvoices = $bon->create(0, 0, 'real', 'ALL', '', 0, 'direct-debit', $did, $fk_bank_account);
+							$nbinvoices = $bon->create(0, 0, 'real', 'ALL', '', 0, $type, $did, $fk_bank_account);
 							if ($nbinvoices <= 0) {
 								$error++;
 								$errorforinvoice++;
@@ -1052,14 +1058,15 @@ abstract class CommonInvoice extends CommonObject
 
 								if ($resultthirdparty > 0 && !empty($customer)) {
 									if (!$error) {	// Payment was not canceled
-										$sepaMode = false;
 										$stripecard = null;
 										if ($companypaymentmode->type == 'ban') {
-											$sepaMode = true;
 											// Check into societe_rib if a payment mode for Stripe and ban payment exists
 											// To make a Stripe SEPA payment request, we must have the payment mode source already saved into societe_rib and retreived with ->sepaStripe
 											// The payment mode source is created when we create the bank account on Stripe with paymentmodes.php?action=create
 											$stripecard = $stripe->sepaStripe($customer, $companypaymentmode, $stripeacc, $servicestatus, 0);
+										} else {
+											$error++;
+											$this->error = 'The payment mode type is not "ban"';
 										}
 
 										if ($stripecard) {  // Can be src_... (for sepa) or pm_... (new card mode). Note that card_... (old card mode) should not happen here.
@@ -1153,9 +1160,9 @@ abstract class CommonInvoice extends CommonObject
 												$postactionmessages[] = $errmsg . ' (' . $stripearrayofkeys['publishable_key'] . ')';
 												$this->errors[] = $errmsg;
 											} else {
-												dol_syslog('Successfuly request direct debit ' . $stripecard->id);
+												dol_syslog('Successfuly request '.$type.' '.$stripecard->id);
 
-												$postactionmessages[] = 'Success to request direct debit (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
+												$postactionmessages[] = 'Success to request '.$type.' (' . $charge->id . ' with ' . $stripearrayofkeys['publishable_key'] . ')';
 
 												// Save a stripe payment was done in realy life so later we will be able to force a commit on recorded payments
 												// even if in batch mode (method doTakePaymentStripe), we will always make all action in one transaction with a forced commit.
@@ -1180,12 +1187,12 @@ abstract class CommonInvoice extends CommonObject
 										} else {
 											$error++;
 											$errorforinvoice++;
-											dol_syslog("No direct debit payment method found for this stripe customer " . $customer->id, LOG_WARNING);
+											dol_syslog("No ban payment method found for this stripe customer " . $customer->id, LOG_WARNING);
 											$this->errors[] = 'Failed to get direct debit payment method for stripe customer = ' . $customer->id;
 
-											$description = 'Failed to find or use the payment mode - no credit card defined for the customer account';
+											$description = 'Failed to find or use the payment mode - no ban defined for the thirdparty account';
 											$stripefailurecode = 'BADPAYMENTMODE';
-											$stripefailuremessage = 'Failed to find or use the payment mode - no credit card defined for the customer account';
+											$stripefailuremessage = 'Failed to find or use the payment mode - no ban defined for the thirdparty account';
 											$postactionmessages[] = $description . ' (' . $stripearrayofkeys['publishable_key'] . ')';
 
 											$object = $this;
@@ -1207,10 +1214,10 @@ abstract class CommonInvoice extends CommonObject
 								} else {	// Else of the   if ($resultthirdparty > 0 && ! empty($customer)) {
 									if ($resultthirdparty <= 0) {
 										dol_syslog('SellYourSaasUtils Failed to load customer for thirdparty_id = ' . $thirdparty->id, LOG_WARNING);
-										$this->errors[] = 'Failed to load customer for thirdparty_id = ' . $thirdparty->id;
+										$this->errors[] = 'Failed to load Stripe account for thirdparty_id = ' . $thirdparty->id;
 									} else { // $customer stripe not found
 										dol_syslog('SellYourSaasUtils Failed to get Stripe customer id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'], LOG_WARNING);
-										$this->errors[] = 'Failed to get Stripe customer id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'];
+										$this->errors[] = 'Failed to get Stripe account id for thirdparty_id = ' . $thirdparty->id . " in mode " . $servicestatus . " in Stripe env " . $stripearrayofkeysbyenv[$servicestatus]['publishable_key'];
 									}
 									$error++;
 									$errorforinvoice++;

From 31fa765d22389764ce7029c8ebd923bfd9a3918f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Mar 2023 13:09:25 +0100
Subject: [PATCH 276/300] css

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

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index eae1174e965..36ea1c42bea 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -974,7 +974,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			}
 
 			// Picto + Name of module
-			print '  <td class="tdoverflowmax300" title="'.dol_escape_htmltag($objMod->getName()).'">';
+			print '  <td class="tdoverflowmax300 maxwidth300" title="'.dol_escape_htmltag($objMod->getName()).'">';
 			$alttext = '';
 			//if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
 			//if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);

From 3b0b731eee9161e4c99c6b80be236712547f8f0a Mon Sep 17 00:00:00 2001
From: Florian HENRY <florian.henry@open-concept.pro>
Date: Sat, 4 Mar 2023 13:50:14 +0100
Subject: [PATCH 277/300] fix: mathod call with default value

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

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 5efbdeae8e1..4f78ae6c5b0 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -4054,7 +4054,7 @@ class Form
 	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1)
 	{
 		// phpcs:enable
-		print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss, $deposit_percent = -1);
+		print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss, $deposit_percent);
 	}
 
 

From 39ddd5368e939c4d04344511a1cf5c0df41756a7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 4 Mar 2023 15:02:04 +0100
Subject: [PATCH 278/300] Update card.php

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

diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index af1e198dcc3..2a6b8a813be 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -125,7 +125,7 @@ if ($user->id != $id && !$canreaduser) {
 // Define value to know what current user can do on properties of edited user
 if ($id > 0) {
 	// $user is the current logged user, $id is the user we want to edit
-	$canedituser = (($user->id == $id) && $user->hasRight("user", "self", "write")) || (!empty($user->admin) || $user->hasRight("user", "user", "write"));  // can edit myself
+	$canedituser = (($user->id == $id) && $user->hasRight("user", "self", "write")) || (($user->id != $id) && $user->hasRight("user", "user", "write"));
 	$caneditfield = ((($user->id == $id) && $user->hasRight("user", "self", "write")) || (($user->id != $id) && $user->hasRight("user", "user", "write")));
 	$caneditpassword = ((($user->id == $id) && $user->hasRight("user", "self", "password")) || (($user->id != $id) && $user->hasRight("user", "user", "password")));
 }

From 90e436eaa34022f75aff94dff734811f3407a2a6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Mar 2023 13:06:55 +0100
Subject: [PATCH 279/300] Doc

---
 ChangeLog | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 59281317804..0e965aaf4a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,8 +29,7 @@ NEW: #22546 can now set user supervisors using mass action in htdocs/user
 NEW: #22594 can chose if VAT ID is unique or not for third parties
 NEW: #22622 all partnerships displayed on tab partnership of a thirdparty and member
 NEW: #22676 massaction for updating product prices
-NEW: #22735 Massaction to affect users on projects
-NEW: #25594 can chose if VAT ID is unique or not for third parties
+NEW: #22735 Massaction to assign users on projects
 NEW: #4482 adding js to hide/show advanced option on the export data page
 NEW: Accountancy - Add a graphic option to enable lettering function - FPC21
 NEW: Accountancy - Add a way to clean some words when you generate thirdparty accounting account

From 48286a141dc51cd1fa99215e0eb0c3aeab1fe25d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Mar 2023 13:38:36 +0100
Subject: [PATCH 280/300] Doc

---
 ChangeLog | 33 +++++++++++++++------------------
 README.md |  2 +-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0e965aaf4a0..f1f874d2777 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,6 @@ For users:
 
 NEW: Minimal PHP version is now PHP 7.0 instead of PHP 5.6
 NEW: #21780 Add pid field to Cronjob class and store PID on job execution
-NEW: #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD to automatically have uploaded files shared publicly by a link
 NEW: #20650 can move the checkbox column on left (experimental option MAIN_CHECKBOX_LEFT_COLUMN)
 NEW: #21000 Added columns 'alias_name' on project, supplier invoice, supplier order, supplier proposals and task list
 NEW: #21395 Added option for dark theme mode in display - color and theme
@@ -58,10 +57,8 @@ NEW: add margin infos to takepos invoice lines
 NEW: Add max size send for "backup and link to mail" option
 NEW: Add method httponly_accessforbidden()
 NEW: Add more advices into the Setup security page
-NEW: Add new global variable for keeping the previous signature information on proposale (case of reopen a proposale)
-NEW: Add objectLink on expedition
-NEW: Add oldcopy to Ticket so triggers intercepting TICKET_MODIFY have access to old values of the updated properties
-NEW: Add option FICHINTER_ALLOW_EXTERNAL_DOWNLOAD
+NEW: Add new global variable for keeping the previous signature information on proposal (case of reopening a proposal)
+NEW: Add objectLink on shipment
 NEW: Add option --force on CLI cron_run_jobs.php
 NEW: Add option "Show price on the generated documents for receptions"
 NEW: Add performance index (name for company and contact) and llx_bank_url(url_id)
@@ -74,29 +71,27 @@ NEW: Add the SMTP header References on ticket email created by email
 NEW: Add the thirdparty column to the time list (projet/tasks/time.php)
 NEW: Add trigger to record the event of sending an email from a project #20912
 NEW: Allow download link option in module configuration (propal,invoice,supplier proposal, order)
-NEW: Bank - Add salaries & vat in tab planned entries
 NEW: Bulk action to remove a category in list/search website pages
 NEW: Can copy/paste images into emails sent.
 NEW: Can edit label of an emailing even once sent
 NEW: Can edit property css, cssview, csslist on extrafields
-NEW: Can enter the unit price including the vat
+NEW: Can enter the unit price including the vat when adding new product lines on invoices, orders, proposals, ...
 NEW: Can invoice task time per different services
 NEW: Can join several files by default on email form
 NEW: Can send an email on scheduled job error
 NEW: Can set a commercial discount by entering amount including VAT
 NEW: Can set a monthly frequency (or multiple) in cron tasks.
 NEW: Can set start and end dates and comment on button "Activate all services"
-NEW: can sort and preselected best supplier price
+NEW: Can sort on preselected best supplier price
 NEW: Can use products categories to make inventory
 NEW: Change filter type on tickets list into a multiselect combo
 NEW: conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line
 NEW: constant PROPAL_NEW_AS_SIGNED
 NEW: show date delivery planned on orders linked to company and product
-NEW: Default template of contract is not mandatory
-NEW: Default values in extrafields are not more limited to 255 char.
+NEW: Default doc template of contracts is not mandatory
+NEW: Default values in extrafields are no more limited to 255 char.
 NEW: display currency in takepos menu
 NEW: Enable online signature for interventions
-NEW: Encrypt all sensitive constants in llx_const
 NEW: extrafield price with currency
 NEW: filter on reception dates (from / to) in cheque paiement card
 NEW: Members: default_lang for members
@@ -114,9 +109,10 @@ NEW: Website: can set header "Strict-Transport-Security" in web sites.
 NEW: Website: can switch status of website and page from the website toolbar
 NEW: Website: Templates of websites are now directories and not zip into core repo
 NEW: Website: add 4 other templates in website module
+NEW: Website: Add counters for public access of pages on a website
 NEW: If we select another view list mode, we keep it
 NEW: Init module bookcal
-NEW: Introduce dolEncrypt and dolDecrypt to be able to encrypt data in db
+NEW: Encrypt all sensitive constants in llx_const using dolEncrypt/dolDecrypt
 NEW: Invoice - Add french mention on pdf when vat debit option is on
 NEW: invoice export : add accounting affectation
 NEW: label on products categories filter
@@ -126,21 +122,20 @@ NEW: Make module WebservicesClient deprecated. Use module WebHook instead.
 NEW: manage no email with thirdparties (better for GDPR)
 NEW: Manage Position (Rank) on Contract Lines
 NEW: Manage VAT on all lines on purchases cycle
-NEW: manage virtual stock at a future date
+NEW: Page to show virtual stock at a future date
 NEW: On a bank reconciled line, we can modify the bank receipt
 NEW: On a form to send an email, we show all emails of all contacts of object
 NEW: Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing wh on PDF
 NEW: Option PRODUIT_DESC_IN_FORM accept (desktop only or +smartphone)
 NEW: Page for mass stock transfer can be used with no source stock
 NEW: parent company column and filter in invoice and order list
-NEW: Add show "Sales rep" option for PDF
+NEW: Add "Show Sales rep" option for PDF
 NEW: Picto for shared link is clickable
 NEW: possibility to select scopes with checkbox for Oauth tokens
 NEW: private and public note on user, thirdparty and contact list
 NEW: product categories filter on inventory list
 NEW: Product supplier price: autofill default supplier VAT
-NEW: Project - Add author on list
-NEW: Public counters feature
+NEW: Project - author field become an available column on lists
 NEW: Reception - Add a from/to on search on date field
 NEW: Start a simple support of recurrent events on agenda
 NEW: Resize parent company column in order list
@@ -155,11 +150,10 @@ NEW: Show picto and color into combo for selection of tags
 NEW: show product label on inventory
 NEW: show sell-by and eat-by dates only if not empty
 NEW: show SellBy/EatBy dates for each batch product in shipment card
-NEW: skip accept/refuse process for proposals (option PROPAL_SKIP_ACCEPT_REFUSE)
+NEW: Can skip accept/refuse steps for proposals (option PROPAL_SKIP_ACCEPT_REFUSE)
 NEW: experimental SMTP using PhpImap allowing OAuth2 authentication (need to add option MAIN_IMAP_USE_PHPIMAP)
 NEW: can substitue project title in mail template
 NEW: Supplier order list - Add column private and public note
-NEW: Support IP type in extrafields
 NEW: The purge of files can purge only if older than a number of seconds
 NEW: Update ActionComm type_code on email message ticket
 NEW: VAT - Admin - Add information on deadline day for submission of VAT declaration
@@ -194,6 +188,9 @@ NEW: Add API for the partnership module
 NEW: Add "Get lines and Post lines from BOM" in the API
 NEW: Replace property fk_categories_product with categories_product in inventory class
 NEW: Rewrite of SQL request. Removed the join on category table (for filter on category), replaced with a EXISTS/NOT
+NEW: Add oldcopy to Ticket so triggers intercepting TICKET_MODIFY have access to old values of the updated properties
+NEW: #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD to automatically have uploaded files shared publicly by a link
+NEW: Add option FICHINTER_ALLOW_EXTERNAL_DOWNLOAD
 
 
 WARNING:
diff --git a/README.md b/README.md
index 826955aef92..e4b464d77b4 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
 ![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg?style=flat-square)](https://php.net/)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.0-8892BF.svg?style=flat-square)](https://php.net/)
 [![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5521/badge)](https://bestpractices.coreinfrastructure.org/projects/5521)
 

From c3e29d3dd5e8de0e38e1a88037a7d2b3607220f5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Mar 2023 14:05:37 +0100
Subject: [PATCH 281/300] Remove warning

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

diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index c402ecd6f0e..c9075791663 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -104,7 +104,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // TODO Add a s
 			if ($i == 0) {
 				print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 			}
-			print '<tr '.$bc[false].'>';
+			print '<tr>';
 			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
 			if ($i == 0) {
 				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';

From 5893b01e1575342ec4c5aecba451fef70526a245 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Mar 2023 14:37:30 +0100
Subject: [PATCH 282/300] Better type for situation_cycle_ref

---
 htdocs/install/mysql/migration/17.0.0-18.0.0.sql | 2 ++
 htdocs/install/mysql/tables/llx_facture.sql      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
index f12fd564831..6ae41a359dc 100644
--- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
+++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql
@@ -61,6 +61,8 @@ ALTER TABLE llx_socpeople CHANGE fk_prospectcontactlevel fk_prospectlevel varcha
 
 ALTER TABLE llx_facture ADD COLUMN prorata_discount	real DEFAULT NULL;
 
+ALTER TABLE llx_facture MODIFY COLUMN situation_cycle_ref integer;
+
 ALTER TABLE llx_payment_salary MODIFY COLUMN datep datetime;
 
 INSERT INTO llx_c_tva(rowid,fk_pays,code,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1179, 117, 'I-28'  , 28,   0, '0',   0, '0', 0, 'IGST',      1);
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index 6e54df4eb32..e1c82e62f2d 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -90,7 +90,7 @@ create table llx_facture
 
   prorata_discount		real DEFAULT NULL,  					-- % of the prorata discount (to know how to add prorata discount lines for each vat rate in the invoice)
 
-  situation_cycle_ref smallint,  -- situation cycle reference. A key that is similar for all the serie.
+  situation_cycle_ref integer,   -- situation cycle reference. A key that is similar for all the serie.
   situation_counter   smallint,  -- situation counter. The number into the serie: 1, 2, ...
   situation_final     smallint,  -- 0 by default, 1 it if is the final invoice.
 

From 1833bfc9d32567155e1b95d80c234ecaaef0e08d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Mar 2023 15:29:41 +0100
Subject: [PATCH 283/300] Fix kanban view

---
 htdocs/hrm/index.php                          |   2 +-
 htdocs/hrm/skill_list.php                     | 226 ++++++++++++------
 .../modulebuilder/template/myobject_list.php  |  12 +-
 3 files changed, 163 insertions(+), 77 deletions(-)

diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index d81044d4a23..4fabcaa3840 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -134,7 +134,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is usel
 			if ($i == 0) {
 				print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
 			}
-			print '<tr '.$bc[false].'>';
+			print '<tr>';
 			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
 			if ($i == 0) {
 				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 796c1abd57d..21adb375060 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-// load hrm libraries
+// load module libraries
 require_once __DIR__.'/class/skill.class.php';
 
 // for other modules
@@ -109,17 +109,24 @@ foreach ($object->fields as $key => $val) {
 		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
+$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook > 0) {
+	$fieldstosearchall = empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall'];
+} elseif ($reshook == 0) {
+	$fieldstosearchall = array_merge($fieldstosearchall, empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall']);
+}
 
 // Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -227,9 +234,13 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
+//$sql .= ", COUNT(rc.rowid) as anotherfield";
+
+$sqlfields = $sql; // $sql fields to remove for count total
+
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
@@ -256,17 +267,17 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$sql .= natural_search("t.".$db->escape($key), $search[$key], (($key == 'status') ? 2 : $mode_search));
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
 			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
-					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -280,13 +291,13 @@ if ($search_all) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
 $sql .= " GROUP BY ";
 foreach($object->fields as $key => $val) {
-	$sql .= "t.".$key.", ";
+	$sql .= "t.".$db->escape($key).", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -301,35 +312,42 @@ $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 */
 
-$sql .= $db->order($sortfield, $sortorder);
-
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$resql = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+	$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
+	$resql = $db->query($sqlforcount);
+	if ($resql) {
+		$objforcount = $db->fetch_object($resql);
+		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	} else {
+		dol_print_error($db);
+	}
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller than the paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
 }
-// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
-	$num = $nbtotalofrecords;
-} else {
-	if ($limit) {
-		$sql .= $db->plimit($limit + 1, $offset);
-	}
 
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		exit;
-	}
-
-	$num = $db->num_rows($resql);
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+	$sql .= $db->plimit($limit + 1, $offset);
 }
 
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
+
+$num = $db->num_rows($resql);
+
+
 // Direct jump if only one record found
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
@@ -342,7 +360,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -357,11 +375,17 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 foreach ($search as $key => $val) {
-	if (is_array($search[$key]) && count($search[$key])) {
+	if (is_array($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
+		$param .= '&search_'.$key.'month='.((int) GETPOST('search_'.$key.'month', 'int'));
+		$param .= '&search_'.$key.'day='.((int) GETPOST('search_'.$key.'day', 'int'));
+		$param .= '&search_'.$key.'year='.((int) GETPOST('search_'.$key.'year', 'int'));
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -382,7 +406,7 @@ $arrayofmassactions = array(
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
-if ($permissiontodelete) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
@@ -401,11 +425,13 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = '';
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
 $newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitleSeparator();
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/hrm/skill_card.php?action=create', '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -418,10 +444,13 @@ $trackid = 'xxxx'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
+	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
 	}
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if HRM_SKILL_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 $moreforfilter = '';
@@ -430,7 +459,7 @@ $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_
 $moreforfilter.= '</div>';*/
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -440,11 +469,14 @@ if (empty($reshook)) {
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
+	$parameters = array('type'=>$type);
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 	print '</div>';
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -453,8 +485,16 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 
 // Fields title search
 // --------------------------------------------------------------------
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch center">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
+	$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
@@ -462,17 +502,15 @@ 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' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').($key == 'status' ? ' parentonrightofpage' : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100'.($key == 'status' ? ' search_status width100 onrightofpage' : ''), 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
-			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', $cssforfield.' maxwidth250', 1);
 		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -480,6 +518,12 @@ foreach ($object->fields as $key => $val) {
 			print '<div class="nowrap">';
 			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 			print '</div>';
+		} elseif ($key == 'lang') {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+			$formadmin = new FormAdmin($db);
+			print $formadmin->select_language($search[$key], 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
+		} else {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -489,19 +533,27 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -510,21 +562,26 @@ 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' && empty($val['arrayofkeyval'])) {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
-		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
+		$totalarray['nbfield']++;
 	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
 print '</tr>'."\n";
 
 
@@ -532,7 +589,7 @@ print '</tr>'."\n";
 $needToFetchEachLine = 0;
 if (isset($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
-		if (preg_match('/\$object/', $val)) {
+		if ($val && preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
 		}
 	}
@@ -542,10 +599,11 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-$imaxiloop = ($limit ? min($num, $limit) : $num);
-while ($i < $imaxloop) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -556,7 +614,7 @@ while ($i < $imaxloop) {
 
 	if ($mode == 'kanban') {
 		if ($i == 0) {
-			print '<tr><td colspan="12">';
+			print '<tr><td colspan="'.$savnbfield.'">';
 			print '<div class="box-flex-container kanban">';
 		}
 		// Output Kanban
@@ -569,15 +627,31 @@ while ($i < $imaxloop) {
 			if (in_array($object->id, $arrayofselected)) {
 				$selected = 1;
 			}
-			print $object->getKanbanView('');
 		}
+		print $object->getKanbanView('');
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
 	} else {
 		// Show here line of result
-		print '<tr class="oddeven">';
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		foreach ($object->fields as $key => $val) {
 			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -598,7 +672,11 @@ while ($i < $imaxloop) {
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 			if (!empty($arrayfields['t.'.$key]['checked'])) {
-				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.(preg_match('/tdoverflow/', $cssforfield) ? ' classfortooltip' : '').'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					print ' title="'.dol_escape_htmltag($object->$key).'"';
+				}
+				print '>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
@@ -630,20 +708,22 @@ while ($i < $imaxloop) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
 		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($object->id, $arrayofselected)) {
-				$selected = 1;
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
-			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
 		}
 
 		print '</tr>'."\n";
@@ -662,14 +742,14 @@ if ($num == 0) {
 			$colspan++;
 		}
 	}
-	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
 
 $db->free($resql);
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>'."\n";
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index e347f05b6bf..f58e662daea 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -78,7 +78,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-// load mymodule libraries
+// load module libraries
 require_once __DIR__.'/class/myobject.class.php';
 
 // for other modules
@@ -158,9 +158,9 @@ foreach ($object->fields as $key => $val) {
 $parameters = array('fieldstosearchall'=>$fieldstosearchall);
 $reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook > 0) {
-	$fieldstosearchall = $hookmanager->resArray['fieldstosearchall'];
+	$fieldstosearchall = empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall'];
 } elseif ($reshook == 0) {
-	$fieldstosearchall = array_merge($fieldstosearchall, $hookmanager->resArray['fieldstosearchall']);
+	$fieldstosearchall = array_merge($fieldstosearchall, empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall']);
 }
 
 // Definition of array of fields for columns
@@ -701,6 +701,12 @@ while ($i < $imaxinloop) {
 			print '<div class="box-flex-container kanban">';
 		}
 		// Output Kanban
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+		}
 		print $object->getKanbanView('');
 		if ($i == ($imaxinloop - 1)) {
 			print '</div>';

From 19e960db187b56e8f9c6342e5b57c24f6f24a75b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Mar 2023 16:09:00 +0100
Subject: [PATCH 284/300] Doc

---
 htdocs/admin/dict.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 5a5914723b0..33833162b11 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -599,6 +599,7 @@ foreach ($tabcomplete as $key => $value) {
 	$tabcomplete[$key]['sql'] = $tabsql[$i];
 	$tabcomplete[$key]['sqlsort'] = $tabsqlsort[$i];
 	$tabcomplete[$key]['field'] = $tabfield[$i];
+	//$tabcomplete[$key]['help'] = $tabhelp[$i];		// array help already loaded into tabcomplete
 }
 
 $keytable = '';
@@ -616,7 +617,6 @@ if (empty($sortfield)) {
 	//var_dump($sortfield);var_dump($sortorder);
 }
 
-
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
 $sourceList = array();
@@ -1223,7 +1223,6 @@ if ($action == 'delete') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'rowid='.urlencode($rowid).'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 
-
 /*
  * Show a dictionary
  */

From 3c96c42f32fbd93813cdd8c1da5cfe41f8d41b60 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 5 Mar 2023 19:14:57 +0100
Subject: [PATCH 285/300] Look and feel v18

---
 htdocs/contact/agenda.php                     |   3 +-
 htdocs/contact/card.php                       |   1 -
 htdocs/contact/consumption.php                |   3 +-
 htdocs/contact/document.php                   |   3 +-
 htdocs/contact/list.php                       | 196 ++++++++++++------
 htdocs/contact/note.php                       |   3 +-
 htdocs/contact/perso.php                      |   3 +-
 htdocs/contact/project.php                    |  12 +-
 htdocs/hrm/class/skill.class.php              |   1 +
 .../modulebuilder/template/myobject_list.php  |   4 +-
 10 files changed, 146 insertions(+), 83 deletions(-)

diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index f1be48a063b..f4cfeaa38cd 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -226,11 +226,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$objsoc = new Societe($db);
 			$objsoc->fetch($object->socid);
 			// Thirdparty
-			$morehtmlref .= $langs->trans('ThirdParty').' : ';
 			if ($objsoc->id > 0) {
 				$morehtmlref .= $objsoc->getNomUrl(1);
 			} else {
-				$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+				$morehtmlref .= '<span class="opacitymedium">'.$langs->trans("ContactNotLinkedToCompany").'</span>';
 			}
 		}
 		$morehtmlref .= '</div>';
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 2c2d8df7d80..7197eabb19c 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -1308,7 +1308,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 			$objsoc->fetch($object->socid);
 			// Thirdparty
-			$morehtmlref .= $langs->trans('ThirdParty').' : ';
 			if ($objsoc->id > 0) {
 				$morehtmlref .= $objsoc->getNomUrl(1, 'contact');
 			} else {
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 7d9a95bad56..93acb2ab463 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -133,11 +133,10 @@ $morehtmlref .= '<div class="refidno">';
 if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 	$objsoc->fetch($socid);
 	// Thirdparty
-	$morehtmlref .= $langs->trans('ThirdParty').' : ';
 	if ($objsoc->id > 0) {
 		$morehtmlref .= $objsoc->getNomUrl(1, 'contact');
 	} else {
-		$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		$morehtmlref .= '<span class="opacitymedium">'.$langs->trans("ContactNotLinkedToCompany").'</span>';
 	}
 }
 $morehtmlref .= '</div>';
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index ed8bc2d4d93..88858a11e1f 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -142,11 +142,10 @@ if ($object->id) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
 		// Thirdparty
-		$morehtmlref .= $langs->trans('ThirdParty').' : ';
 		if ($objsoc->id > 0) {
 			$morehtmlref .= $objsoc->getNomUrl(1);
 		} else {
-			$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+			$morehtmlref .= '<span class="opacitymedium">'.$langs->trans("ContactNotLinkedToCompany").'</span>';
 		}
 	}
 	$morehtmlref .= '</div>';
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 71154e23b28..cea2b5464d3 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -120,12 +120,14 @@ $optioncss = GETPOST('optioncss', 'alpha');
 $type = GETPOST("type", 'aZ');
 $view = GETPOST("view", 'alpha');
 
+$userid = GETPOST('userid', 'int');
+$begin = GETPOST('begin');
+
+// Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-$userid = GETPOST('userid', 'int');
-$begin = GETPOST('begin');
 if (!$sortorder) {
 	$sortorder = "ASC";
 }
@@ -133,9 +135,12 @@ if (!$sortfield) {
 	$sortfield = "p.lastname";
 }
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
 }
 $offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 
 
 $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
@@ -166,10 +171,10 @@ if ($type == "c") {
 	$urlfiche = "";
 }
 
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+// Initialize technical object
 $object = new Contact($db);
-$hookmanager->initHooks(array('contactlist'));
 $extrafields = new ExtraFields($db);
+$hookmanager->initHooks(array($contextpage));
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -197,19 +202,28 @@ if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 	$fieldstosearchall['s.name_alias'] = "AliasNames";
 }
 
-// Definition of fields for list
+$parameters = array('fieldstosearchall'=>$fieldstosearchall);
+$reshook = $hookmanager->executeHooks('completeFieldsToSearchAll', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook > 0) {
+	$fieldstosearchall = empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall'];
+} elseif ($reshook == 0) {
+	$fieldstosearchall = array_merge($fieldstosearchall, empty($hookmanager->resArray['fieldstosearchall']) ? array() : $hookmanager->resArray['fieldstosearchall']);
+}
+
+// Definition of array of fields for columns
 $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
-	if (empty($val['visible'])) {
-		continue;
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['p.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
+		);
 	}
-
-	$arrayfields['p.'.$key] = array(
-		'label'=>$val['label'],
-		'checked'=>(($val['visible'] < 0) ? 0 : 1),
-		'enabled'=>($val['enabled'] && ($val['visible'] != 3)),
-		'position'=>$val['position']);
 }
 
 // Add none object fields to fields for list
@@ -241,6 +255,7 @@ if (isModEnabled('socialnetworks')) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $object->fields = dol_sort_array($object->fields, 'position');
+//$arrayfields['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 
@@ -251,13 +266,20 @@ if (($id > 0 || !empty($ref)) && $action != 'add') {
 	}
 }
 
+$permissiontoread = $user->hasRight('societe', 'lire');
+$permissiontodelete = $user->hasRight('societe', 'supprimer');
+$permissiontoadd = $user->hasRight('societe', 'creer');
+
+if (!$permissiontoread) accessforbidden();
+
 
 /*
  * Actions
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -273,7 +295,7 @@ if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	// Did we click on purge search criteria ?
+	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {	// All tests are required to be compatible with all browsers
 		$sall = "";
 		$search_id = '';
@@ -317,9 +339,6 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'Contact';
 	$objectlabel = 'Contact';
-	$permissiontoread = $user->hasRight('societe', 'lire');
-	$permissiontodelete = $user->hasRight('societe', 'supprimer');
-	$permissiontoadd = $user->hasRight('societe', 'creer');
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
@@ -350,13 +369,12 @@ $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 $contactstatic = new Contact($db);
 
-$morejs = array();
-$morecss = array();
+$now = dol_now();
 
-// Page Header
 $title = $langs->trans("Contacts")." - ".$langs->trans("List");
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas';
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
+$morejs = array();
+$morecss = array();
 
 if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
 	$contactstatic->loadCacheOfProspStatus();
@@ -385,14 +403,15 @@ if ($resql) {
 	dol_print_error($db);
 }
 
+// Build and execute select
+// --------------------------------------------------------------------
 $sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias as alias,";
 $sql .= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.address, p.zip, p.town, p.poste, p.email,";
 $sql .= " p.socialnetworks, p.photo,";
 $sql .= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_update,";
-$sql .= " p.import_key,";
-$sql .= " st.libelle as stcomm, st.picto as stcomm_picto, p.fk_stcommcontact as stcomm_id, p.fk_prospectlevel,";
+$sql .= " p.import_key, p.fk_stcommcontact as stcomm_id, p.fk_prospectlevel,";
+$sql .= " st.libelle as stcomm, st.picto as stcomm_picto,";
 $sql .= " co.label as country, co.code as country_code";
-
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -403,10 +422,11 @@ if (isModEnabled('mailing')) {
 	$sql .= ", (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = p.email) as unsubscribed";
 }
 
-// Add fields from hooks - ListSelect
+// Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-$sql .= $hookmanager->resPrint;
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
 
 $sqlfields = $sql; // $sql fields to remove for count total
 
@@ -679,7 +699,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		dol_print_error($db);
 	}
 
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller than the paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -704,9 +724,8 @@ if (!$resql) {
 
 $num = $db->num_rows($resql);
 
-$arrayofselected = is_array($toselect) ? $toselect : array();
-
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($sall != '' || $search_cti != '')) {
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($sall != '' || $search_cti != '') && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/contact/card.php?id='.$id);
@@ -714,6 +733,12 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && (
 }
 
 
+// Output page
+// --------------------------------------------------------------------
+// Page Header
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
 if (!empty($mode)) {
@@ -802,10 +827,10 @@ if (is_array($search_level) && count($search_level)) {
 	}
 }
 if ($search_import_key != '') {
-	$param .= '&amp;search_import_key='.urlencode($search_import_key);
+	$param .= '&search_import_key='.urlencode($search_import_key);
 }
 if ($optioncss != '') {
-	$param .= '&amp;optioncss='.urlencode($optioncss);
+	$param .= '&optioncss='.urlencode($optioncss);
 }
 if (count($search_roles) > 0) {
 	$param .= implode('&search_roles[]=', $search_roles);
@@ -820,7 +845,7 @@ $arrayofmassactions = array(
 //    'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->hasRight('societe', 'supprimer')) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (isModEnabled('category') && $user->rights->societe->creer) {
@@ -831,25 +856,28 @@ if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-$newcardbutton  = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('NewContactAddress'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create', '', $user->rights->societe->contact->creer);
-
-print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 //print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
-print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="page_y" value="">';
 print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 
+$newcardbutton  = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitleSeparator();
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewContactAddress'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create', '', $permissiontoadd);
+
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'address', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $topicmail = "Information";
@@ -859,9 +887,12 @@ $trackid = 'ctc'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($sall) {
+	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
 	}
+	print '<!-- Search done like if CONTACT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 if ($search_firstlast_only) {
@@ -914,18 +945,17 @@ print '</div>';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
-if ($massactionbutton) {
-	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
-}
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-// Lines for filter fields
+// Fields title search
+// --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-	print '<td class="liste_titre maxwidthsearch">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch center">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';
@@ -1093,87 +1123,113 @@ if (!empty($arrayfields['p.import_key']['checked'])) {
 	print '</td>';
 }
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 }
-print '</tr>';
+print '</tr>'."\n";
 
-// Title line
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
+// Fields title label
+// --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.rowid']['checked'])) {
 	print_liste_field_titre($arrayfields['p.rowid']['label'], $_SERVER["PHP_SELF"], "p.rowid", "", $param, "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.lastname']['checked'])) {
 	print_liste_field_titre($arrayfields['p.lastname']['label'], $_SERVER["PHP_SELF"], "p.lastname", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.firstname']['checked'])) {
 	print_liste_field_titre($arrayfields['p.firstname']['label'], $_SERVER["PHP_SELF"], "p.firstname", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.poste']['checked'])) {
 	print_liste_field_titre($arrayfields['p.poste']['label'], $_SERVER["PHP_SELF"], "p.poste", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.address']['checked'])) {
 	print_liste_field_titre($arrayfields['p.address']['label'], $_SERVER["PHP_SELF"], "p.address", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.zip']['checked'])) {
 	print_liste_field_titre($arrayfields['p.zip']['label'], $_SERVER["PHP_SELF"], "p.zip", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.town']['checked'])) {
 	print_liste_field_titre($arrayfields['p.town']['label'], $_SERVER["PHP_SELF"], "p.town", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 //if (!empty($arrayfields['state.nom']['checked']))           print_liste_field_titre($arrayfields['state.nom']['label'],$_SERVER["PHP_SELF"],"state.nom","",$param,'',$sortfield,$sortorder);
 //if (!empty($arrayfields['region.nom']['checked']))          print_liste_field_titre($arrayfields['region.nom']['label'],$_SERVER["PHP_SELF"],"region.nom","",$param,'',$sortfield,$sortorder);
 if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "co.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.phone']['checked'])) {
 	print_liste_field_titre($arrayfields['p.phone']['label'], $_SERVER["PHP_SELF"], "p.phone", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.phone_perso']['checked'])) {
 	print_liste_field_titre($arrayfields['p.phone_perso']['label'], $_SERVER["PHP_SELF"], "p.phone_perso", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.phone_mobile']['checked'])) {
 	print_liste_field_titre($arrayfields['p.phone_mobile']['label'], $_SERVER["PHP_SELF"], "p.phone_mobile", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.fax']['checked'])) {
 	print_liste_field_titre($arrayfields['p.fax']['label'], $_SERVER["PHP_SELF"], "p.fax", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.email']['checked'])) {
 	print_liste_field_titre($arrayfields['p.email']['label'], $_SERVER["PHP_SELF"], "p.email", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['unsubscribed']['checked'])) {
 	print_liste_field_titre($arrayfields['unsubscribed']['label'], $_SERVER["PHP_SELF"], "unsubscribed", $begin, $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (isModEnabled('socialnetworks')) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
 			print_liste_field_titre($arrayfields['p.'.$key]['label'], $_SERVER["PHP_SELF"], "p.".$key, $begin, $param, '', $sortfield, $sortorder);
+			$totalarray['nbfield']++;
 		}
 	}
 }
 if (!empty($arrayfields['p.fk_soc']['checked'])) {
 	print_liste_field_titre($arrayfields['p.fk_soc']['label'], $_SERVER["PHP_SELF"], "p.fk_soc", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.name_alias']['checked'])) {
 	print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], "s.name_alias", $begin, $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.priv']['checked'])) {
 	print_liste_field_titre($arrayfields['p.priv']['label'], $_SERVER["PHP_SELF"], "p.priv", $begin, $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.fk_prospectlevel']['checked'])) {
 	print_liste_field_titre($arrayfields['p.fk_prospectlevel']['label'], $_SERVER["PHP_SELF"], "p.fk_prospectlevel", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.fk_stcommcontact']['checked'])) {
 	print_liste_field_titre($arrayfields['p.fk_stcommcontact']['label'], $_SERVER["PHP_SELF"], "p.fk_stcommcontact", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -1204,11 +1260,18 @@ if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 print "</tr>\n";
 
 
+// Loop on record
+// --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < min($num, $limit)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
 	$arraysocialnetworks = (array) json_decode($obj->socialnetworks, true);
 	$contactstatic->lastname = $obj->lastname;
@@ -1233,7 +1296,7 @@ while ($i < min($num, $limit)) {
 
 	if ($mode == 'kanban') {
 		if ($i == 0) {
-			print '<tr><td colspan="12">';
+			print '<tr><td colspan="'.$savnbfield.'">';
 			print '<div class="box-flex-container kanban">';
 		}
 		$contactstatic->photo = $obj->photo;
@@ -1241,15 +1304,17 @@ while ($i < min($num, $limit)) {
 			$contactstatic->fetch_thirdparty($obj->socid);
 		}
 		print $contactstatic->getKanbanView('');
-		if ($i == min($num, $limit) - 1) {
+		if ($i == ($imaxinloop - 1)) {
 			print '</div>';
 			print '</td></tr>';
 		}
 	} else {
-		print '<tr class="oddeven" id="rowid-'.((int) $obj->rowid).'">';
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 
 		// Action column
-		if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
@@ -1259,6 +1324,9 @@ while ($i < min($num, $limit)) {
 				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// ID
@@ -1523,7 +1591,7 @@ while ($i < min($num, $limit)) {
 		}
 
 		// Action column
-		if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			print '<td class="nowrap center">';
 			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 				$selected = 0;
@@ -1533,9 +1601,9 @@ while ($i < min($num, $limit)) {
 				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
-		}
-		if (!$i) {
-			$totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		print "</tr>\n";
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index 148d9fb6f04..e9e5d64f495 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -106,11 +106,10 @@ if ($id > 0) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
 		// Thirdparty
-		$morehtmlref .= $langs->trans('ThirdParty').' : ';
 		if ($objsoc->id > 0) {
 			$morehtmlref .= $objsoc->getNomUrl(1);
 		} else {
-			$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+			$morehtmlref .= '<span class="opacitymedium">'.$langs->trans("ContactNotLinkedToCompany").'</span>';
 		}
 	}
 	$morehtmlref .= '</div>';
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index bdfa4ddb708..0fd23753fdf 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -232,11 +232,10 @@ if ($action == 'edit') {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
 		// Thirdparty
-		$morehtmlref .= $langs->trans('ThirdParty').' : ';
 		if ($objsoc->id > 0) {
 			$morehtmlref .= $objsoc->getNomUrl(1);
 		} else {
-			$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+			$morehtmlref .= '<span class="opacitymedium">'.$langs->trans("ContactNotLinkedToCompany").'</span>';
 		}
 	}
 	$morehtmlref .= '</div>';
diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
index 571fa57e428..466e6a6b5b6 100644
--- a/htdocs/contact/project.php
+++ b/htdocs/contact/project.php
@@ -82,14 +82,14 @@ if ($id) {
 	$morehtmlref .= '</a>';
 
 	$morehtmlref .= '<div class="refidno">';
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS) && !empty($socid)) {
-		$object->thirdparty->fetch($socid);
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+		$objsoc = new Societe($db);
+		$objsoc->fetch($object->socid);
 		// Thirdparty
-		$morehtmlref .= $langs->trans('ThirdParty').' : ';
-		if ($object->thirdparty->id > 0) {
-			$morehtmlref .= $object->thirdparty->getNomUrl(1, 'contact');
+		if ($objsoc->id > 0) {
+			$morehtmlref .= $objsoc->getNomUrl(1, 'contact');
 		} else {
-			$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+			$morehtmlref .= '<span class="opacitymedium">'.$langs->trans("ContactNotLinkedToCompany").'</span>';
 		}
 	}
 	$morehtmlref .= '</div>';
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index 1413bc36e0c..44cea026320 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -1124,6 +1124,7 @@ class Skill extends CommonObject
 	public function getKanbanView($option = '', $arraydata = null)
 	{
 		global $selected, $langs;
+
 		$return = '<div class="box-flex-item box-flex-grow-zero">';
 		$return .= '<div class="info-box info-box-sm">';
 		$return .= '<span class="info-box-icon bg-infobox-action">';
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index f58e662daea..c5923412e27 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -302,7 +302,7 @@ if (isset($extrafields->attributes[$object->table_element]['label']) && is_array
 }
 // Add table from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
@@ -449,7 +449,7 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
 if ($limit > 0 && $limit != $conf->liste_limit) {
-	$param .= '&limit='.urlencode($limit);
+	$param .= '&limit='.((int) $limit);
 }
 foreach ($search as $key => $val) {
 	if (is_array($search[$key])) {

From 381ecbb1fbb1fe7818436d7d55e7e6da85c874cd Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 10:49:38 +0100
Subject: [PATCH 286/300] NEW Can test a geoip conversion from the geoip setup
 page

---
 htdocs/admin/geoipmaxmind.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index 8f76f9a7b2b..78fde3d095e 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -163,6 +163,9 @@ $textoshow = str_replace('{s1}', '<a href="'.$url2.'" target="_blank" rel="noope
 print $textoshow;
 
 if ($geoip) {
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+
 	print '<br><br>';
 	print '<br><span class="opacitymedium">'.$langs->trans("TestGeoIPResult", $ip).':</span>';
 
@@ -214,6 +217,20 @@ if ($geoip) {
 		}
 	}
 
+	$ip = GETPOST("iptotest");
+	print '<br><input type="text class="width100" name="iptotest" id="iptotest" placeholder="'.dol_escape_htmltag($langs->trans("EnterAnIP")).'" value="'.$ip.'">';
+	print '<input type="submit" class="width40 button small smallpaddingimp" value=" -> ">';
+	if ($ip) {
+		$result = dol_print_ip($ip, 1);
+		if ($result) {
+			print $result;
+		} else {
+			print $langs->trans("Error");
+		}
+	}
+
+	print '</form>';
+
 	$geoip->close();
 }
 

From 67fd231455612599d4f8e1c2e1a47e1bbc8ada1f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 12:16:46 +0100
Subject: [PATCH 287/300] Trans

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

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index be79a33bf14..2ef2a996f3b 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -512,7 +512,7 @@ ClickToShowDescription=Click to show description
 DependsOn=This module needs the module(s)
 RequiredBy=This module is required by module(s)
 TheKeyIsTheNameOfHtmlField=This is the name of the HTML field. Technical knowledge is required to read the content of the HTML page to get the key name of a field.
-PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, the default values will be effective if all parameters are set to same value.
+PageUrlForDefaultValues=You must enter the relative path of the page URL. If you include parameters in URL, it will be effective if all parameters in browsed URL have the value defined here.
 PageUrlForDefaultValuesCreate=<br>Example:<br>For the form to create a new third party, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/", so use path like <strong>mymodule/mypage.php</strong> and not custom/mymodule/mypage.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 PageUrlForDefaultValuesList=<br>Example:<br>For the page that lists third parties, it is <strong>%s</strong>.<br>For URL of external modules installed into custom directory, do not include the "custom/" so use a path like <strong>mymodule/mypagelist.php</strong> and not custom/mymodule/mypagelist.php.<br>If you want default value only if url has some parameter, you can use <strong>%s</strong>
 AlsoDefaultValuesAreEffectiveForActionCreate=Also note that overwritting default values for form creation works only for pages that were correctly designed (so with parameter action=create or presend...)

From 25d09d7516c7e3cabe7bcb922e2a371a21e94c54 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 17:42:06 +0100
Subject: [PATCH 288/300] Tab events for proposals

---
 htdocs/comm/propal/agenda.php                 | 256 ++++++++++++++++++
 htdocs/comm/propal/card.php                   |   6 +-
 htdocs/comm/propal/info.php                   | 126 ---------
 htdocs/core/lib/propal.lib.php                |  36 ++-
 htdocs/core/tpl/objectline_title.tpl.php      |   2 +-
 .../template/myobject_agenda.php              |  11 +-
 htdocs/societe/agenda.php                     |   1 -
 htdocs/supplier_proposal/info.php             |   2 +-
 8 files changed, 305 insertions(+), 135 deletions(-)
 create mode 100644 htdocs/comm/propal/agenda.php
 delete mode 100644 htdocs/comm/propal/info.php

diff --git a/htdocs/comm/propal/agenda.php b/htdocs/comm/propal/agenda.php
new file mode 100644
index 00000000000..fd8465b58da
--- /dev/null
+++ b/htdocs/comm/propal/agenda.php
@@ -0,0 +1,256 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/comm/propal/agenda.php
+ *  \ingroup    propal
+ *  \brief      Tab of events on Proposal
+ */
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("propal", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+} else {
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : getDolGlobalString('AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT'));
+}
+$search_rowid = GETPOST('search_rowid');
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
+
+// Initialize technical objects
+$object = new Propal($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->propal->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('myobjectagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->propal->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id;
+}
+
+$permissiontoread = $user->hasRight("propal", "lire");
+$permissiontoadd = $user->hasRight("propal", "creer");
+
+// Security check
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+restrictedArea($user, 'propal', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
+}
+
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0) {
+	$title = $langs->trans("Agenda");
+	//if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = 'EN:Module_Agenda_En|DE:Modul_Terminplanung';
+	llxHeader('', $title, $help_url);
+
+	if (isModEnabled('notification')) {
+		$langs->load("mails");
+	}
+	$head = propal_prepare_head($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Proposal"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/mymodule/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	// Ref customer
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
+	// Project
+	if (isModEnabled('project')) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>';
+		if (0) {
+			$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
+			}
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= $proj->getNomUrl(1);
+				if ($proj->title) {
+					$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
+				}
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+	$object->info($object->id);
+	dol_print_object_info($object, 1);
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+
+
+	// Actions buttons
+
+	$objthirdparty = $object;
+	$objcon = new stdClass();
+
+	$out = '&origin='.urlencode($object->element.(property_exists($object, 'module') ? '@'.$object->module : '')).'&originid='.urlencode($object->id);
+	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+	$out .= '&backtopage='.urlencode($urlbacktopage);
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') {
+			$out .= '&socid='.urlencode($objthirdparty->id);
+		}
+		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '');
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
+	}
+
+	$morehtmlright = '';
+
+	//$messagingUrl = DOL_URL_ROOT.'/societe/messaging.php?socid='.$object->id;
+	//$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
+	//$messagingUrl = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
+	//$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 2);
+
+	if (isModEnabled('agenda')) {
+		if ($user->hasRight('agenda', 'myactions', 'create') || $user->hasRight('agenda', 'allactions', 'create')) {
+			$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
+		} else {
+			$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out, '', 0);
+		}
+	}
+
+
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		print '<br>';
+
+		$param = '&id='.$object->id.(!empty($socid) ? '&socid='.$socid : '');
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param .= '&contextpage='.urlencode($contextpage);
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.urlencode($limit);
+		}
+
+		// Try to know count of actioncomm from cache
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_events_myobject_'.$object->id;
+		$nbEvent = dol_getcache($cachekey);
+
+		print_barre_liste($langs->trans("ActionsOnPropal").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+		//print_barre_liste($langs->trans("ActionsOnPropal"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+
+		// List of all actions
+		$filters = array();
+		$filters['search_agenda_label'] = $search_agenda_label;
+		$filters['search_rowid'] = $search_rowid;
+
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index f504cf84cd9..5833072e8be 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -3038,10 +3038,14 @@ if ($action == 'create') {
 
 		print '</div><div class="fichehalfright">';
 
+		$MAXEVENT = 10;
+
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/comm/propal/agenda.php?id='.$object->id);
+
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, 'propal', $socid, 1);
+		$somethingshown = $formactions->showactions($object, 'propal', $socid, 1, '', $MAXEVENT, '', $morehtmlcenter); // Show all action for thirdparty
 
 		print '</div></div>';
 	}
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
deleted file mode 100644
index 8a1d2afaabd..00000000000
--- a/htdocs/comm/propal/info.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/* Copyright (C) 2004		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2006	Laurent Destailleur		<eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
- * Copyright (C) 2017    	Ferran Marcet       	<fmarcet@2byte.es>
- *
- * 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/comm/propal/info.php
- *	\ingroup    propal
- *	\brief      Page d'affichage des infos d'une proposition commerciale
- */
-
-// Load Dolibarr environment
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-if (isModEnabled('project')) {
-	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-}
-
-// Load translation files required by the page
-$langs->loadLangs(array('propal', 'compta'));
-
-$id = GETPOST('id', 'int');
-$ref = GETPOST('ref', 'alpha');
-$socid = GETPOST('socid', 'int');
-
-$object = new Propal($db);
-if (!$object->fetch($id, $ref) > 0) {
-	dol_print_error($db);
-	exit;
-}
-
-// Security check
-if (!empty($user->socid)) {
-	$socid = $user->socid;
-	$object->id = $user->socid;
-}
-restrictedArea($user, 'propal', $object->id);
-
-$usercancreate = $user->hasRight("propal", "creer");
-
-
-/*
- *	View
- */
-
-$form = new Form($db);
-
-$title = $object->ref." - ".$langs->trans('Info');
-$help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
-llxHeader('', $title, $help_url);
-
-$object->fetch_thirdparty();
-
-$head = propal_prepare_head($object);
-print dol_get_fiche_head($head, 'info', $langs->trans('Proposal'), -1, 'propal');
-
-$object->info($object->id);
-
-
-// Proposal card
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-
-$morehtmlref = '<div class="refidno">';
-// Ref customer
-$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-// Thirdparty
-$morehtmlref .= '<br>'.$object->thirdparty->getNomUrl(1);
-// Project
-if (isModEnabled('project')) {
-	$langs->load("projects");
-	$morehtmlref .= '<br>';
-	if (0) {
-		$morehtmlref .= img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth"');
-		if ($action != 'classify') {
-			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> ';
-		}
-		$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, ($action == 'classify' ? 'projectid' : 'none'), 0, 0, 0, 1, '', 'maxwidth300');
-	} else {
-		if (!empty($object->fk_project)) {
-			$proj = new Project($db);
-			$proj->fetch($object->fk_project);
-			$morehtmlref .= $proj->getNomUrl(1);
-			if ($proj->title) {
-				$morehtmlref .= '<span class="opacitymedium"> - '.dol_escape_htmltag($proj->title).'</span>';
-			}
-		}
-	}
-}
-$morehtmlref .= '</div>';
-
-dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
-
-print '<div class="fichecenter">';
-print '<div class="underbanner clearboth"></div>';
-
-print '<br>';
-
-dol_print_object_info($object);
-
-print '</div>';
-
-print dol_get_fiche_end();
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index b5e459c8637..205c6a79781 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -105,9 +105,39 @@ function propal_prepare_head($object)
 	$head[$h][2] = 'document';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Info');
-	$head[$h][2] = 'info';
+
+	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/agenda.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Events");
+	if (isModEnabled('agenda')&& (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		$nbEvent = 0;
+		// Enable caching of thirdparty count actioncomm
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_events_thirdparty_'.$object->id;
+		$dataretrieved = dol_getcache($cachekey);
+		if (!is_null($dataretrieved)) {
+			$nbEvent = $dataretrieved;
+		} else {
+			/*$sql = "SELECT COUNT(id) as nb";
+			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";
+			$sql .= " WHERE fk_soc = ".((int) $object->id);
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				$nbEvent = $obj->nb;
+			} else {
+				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
+			}
+			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+			*/
+		}
+
+		$head[$h][1] .= '/';
+		$head[$h][1] .= $langs->trans("Agenda");
+		if ($nbEvent > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbEvent.'</span>';
+		}
+	}
+	$head[$h][2] = 'agenda';
 	$h++;
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal', 'add', 'external');
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 24231d3fe68..c2b9a08f0ca 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -146,7 +146,7 @@ if ($usemargins && isModEnabled('margin') && empty($user->socid)) {
 			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode=marginforalllines&id='.$object->id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickmarginforalllines opacitymedium paddingleft cursorpointer"').'</a>';
 			if (GETPOST('mode', 'aZ09') == 'marginforalllines') {
 				print '<div class="classmarginforalllines inline-block nowraponall">';
-				print '<input type="number" name="marginforalllines" min="0" max="999.9" value="20.0" step="0.1"><label>%</label>';
+				print '<input type="number" name="marginforalllines" min="0" max="999.9" value="20.0" step="0.1" class="width50"><label>%</label>';
 				print '<input class="inline-block button smallpaddingimp" type="submit" name="submitforallmargins" value="'.$langs->trans("Update").'">';
 				print '</div>';
 			}
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 40345aab00a..899ed899382 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -86,6 +86,7 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array')) {
@@ -261,7 +262,7 @@ if ($object->id > 0) {
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$out = '&origin='.urlencode($object->element.(property_exists($object, 'module') ? '@'.$object->module : '')).'&originid='.urlencode($object->id);
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->rights->agenda->myactions->create;
@@ -303,7 +304,13 @@ if ($object->id > 0) {
 			$param .= '&limit='.urlencode($limit);
 		}
 
-		//print load_fiche_titre($langs->trans("ActionsOnMyObject"), '', '');
+		// Try to know count of actioncomm from cache
+		/*require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+		$cachekey = 'count_events_myobject_'.$object->id;
+		$nbEvent = dol_getcache($cachekey);
+
+		print_barre_liste($langs->trans("ActionsOnMyObject").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
+		*/
 		print_barre_liste($langs->trans("ActionsOnMyObject"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 
 		// List of all actions
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index dbf006f840c..67f087f9774 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -205,7 +205,6 @@ if ($socid > 0) {
 		$cachekey = 'count_events_thirdparty_'.$object->id;
 		$nbEvent = dol_getcache($cachekey);
 
-		// print load_fiche_titre($langs->trans("ActionsOnCompany"), $newcardbutton, '');
 		print_barre_liste($langs->trans("ActionsOnCompany").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
 
 		// List of all actions
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index 23f00961b22..bcf38168692 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *      \file       htdocs/comm/propal/info.php
+ *      \file       htdocs/supplier_proposal/info.php
  *      \ingroup    propal
  *      \brief      Page d'affichage des infos d'une proposition commerciale
  */

From 9e18a8b7836b2a5219113d56e7ae281302cee891 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 18:03:30 +0100
Subject: [PATCH 289/300] Clean code

---
 htdocs/comm/propal/agenda.php                     | 4 ++--
 htdocs/core/lib/memory.lib.php                    | 2 +-
 htdocs/core/lib/propal.lib.php                    | 8 ++++----
 htdocs/modulebuilder/template/myobject_agenda.php | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/comm/propal/agenda.php b/htdocs/comm/propal/agenda.php
index fd8465b58da..f3b35d07cfe 100644
--- a/htdocs/comm/propal/agenda.php
+++ b/htdocs/comm/propal/agenda.php
@@ -235,7 +235,7 @@ if ($object->id > 0) {
 
 		// Try to know count of actioncomm from cache
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
-		$cachekey = 'count_events_myobject_'.$object->id;
+		$cachekey = 'count_events_propal_'.$object->id;
 		$nbEvent = dol_getcache($cachekey);
 
 		print_barre_liste($langs->trans("ActionsOnPropal").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': ''), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 1);
@@ -247,7 +247,7 @@ if ($object->id > 0) {
 		$filters['search_rowid'] = $search_rowid;
 
 		// TODO Replace this with same code than into list.php
-		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, property_exists($object, 'module') ? $object->module : '');
 	}
 }
 
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index 5c4826a2dc5..3be5e902816 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -57,7 +57,7 @@ $shmoffset = 1000; // Max number of entries found into a language file. If too l
 
 
 /**
- * 	Save data into a memory area shared by all users, all sessions on server
+ * 	Save data into a memory area shared by all users, all sessions on server. Note: MAIN_CACHE_COUNT must be set.
  *
  *  @param	string      $memoryid		Memory id of shared area
  * 	@param	mixed		$data			Data to save. It must not be a null value.
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index 205c6a79781..588418c7449 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -112,14 +112,15 @@ function propal_prepare_head($object)
 		$nbEvent = 0;
 		// Enable caching of thirdparty count actioncomm
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
-		$cachekey = 'count_events_thirdparty_'.$object->id;
+		$cachekey = 'count_events_propal_'.$object->id;
 		$dataretrieved = dol_getcache($cachekey);
 		if (!is_null($dataretrieved)) {
 			$nbEvent = $dataretrieved;
 		} else {
-			/*$sql = "SELECT COUNT(id) as nb";
+			$sql = "SELECT COUNT(id) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm";
-			$sql .= " WHERE fk_soc = ".((int) $object->id);
+			$sql .= " WHERE fk_element = ".((int) $object->id);
+			$sql .= " AND elementtype = 'propal'";
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
@@ -128,7 +129,6 @@ function propal_prepare_head($object)
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
 			}
 			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
-			*/
 		}
 
 		$head[$h][1] .= '/';
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 899ed899382..189bfd6282b 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -319,7 +319,7 @@ if ($object->id > 0) {
 		$filters['search_rowid'] = $search_rowid;
 
 		// TODO Replace this with same code than into list.php
-		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, property_exists($object, 'module') ? $object->module : '');
 	}
 }
 

From 84d0e33f62a416a04dd370ea480b80961852f056 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 18:34:13 +0100
Subject: [PATCH 290/300] Fix missing include

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

diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 3ee2ad037b5..b29037778da 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -30,6 +30,7 @@
  *	\ingroup    bank
  *	\brief      File of class to manage bank accounts
  */
+
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 
@@ -1857,6 +1858,8 @@ class Account extends CommonObject
 }
 
 
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+
 /**
  *	Class to manage bank transaction lines
  */

From d4f3d90e0a1c34eb1a3d0206b476594757ccd337 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 19:03:53 +0100
Subject: [PATCH 291/300] Show amount on tooltip for direct debit ref

---
 htdocs/compta/facture/prelevement.php                    | 2 ++
 htdocs/compta/prelevement/class/bonprelevement.class.php | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 5224d5e7f09..0d73fba7281 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -896,6 +896,7 @@ if ($object->id > 0) {
 				$withdrawreceipt->date_creation = $db->jdate($obj->datec);
 				$withdrawreceipt->statut = $obj->status;
 				$withdrawreceipt->status = $obj->status;
+				$withdrawreceipt->amount = $obj->amount;
 				//$withdrawreceipt->credite = $db->jdate($obj->credite);
 
 				print $withdrawreceipt->getNomUrl(1);
@@ -1003,6 +1004,7 @@ if ($object->id > 0) {
 				$withdrawreceipt->statut = $obj->status;
 				$withdrawreceipt->status = $obj->status;
 				$withdrawreceipt->fk_bank_account = $obj->fk_bank_account;
+				$withdrawreceipt->amount = $obj->amount;
 				//$withdrawreceipt->credite = $db->jdate($obj->credite);
 
 				print $withdrawreceipt->getNomUrl(1);
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index cbe2eda9533..c130c94ab09 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -1317,6 +1317,9 @@ class BonPrelevement extends CommonObject
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans($labeltoshow).'</u> '.$this->getLibStatut(5);
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (isset($this->amount)) {
+			$label .= '<br><b>'.$langs->trans("Amount").":</b> ".price($this->amount);
+		}
 		if (isset($this->date_trans)) {
 			$label .= '<br><b>'.$langs->trans("TransData").":</b> ".dol_print_date($this->date_trans, 'dayhour', 'tzuserrel');
 		}

From 36c39657d616916dda582298d9756e7c9ed601e9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 19:06:23 +0100
Subject: [PATCH 292/300] Fix amount

---
 htdocs/compta/facture/prelevement.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 0d73fba7281..9be13ef092e 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -835,7 +835,7 @@ if ($object->id > 0) {
 
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande as date_demande,";
 	$sql .= " pfd.date_traite as date_traite, pfd.amount, pfd.fk_prelevement_bons,";
-	$sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status,";
+	$sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status, pb.amount as pb_amount,";
 	$sql .= " u.rowid as user_id, u.email, u.lastname, u.firstname, u.login, u.statut as user_status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
@@ -896,7 +896,7 @@ if ($object->id > 0) {
 				$withdrawreceipt->date_creation = $db->jdate($obj->datec);
 				$withdrawreceipt->statut = $obj->status;
 				$withdrawreceipt->status = $obj->status;
-				$withdrawreceipt->amount = $obj->amount;
+				$withdrawreceipt->amount = $obj->pb_amount;
 				//$withdrawreceipt->credite = $db->jdate($obj->credite);
 
 				print $withdrawreceipt->getNomUrl(1);
@@ -943,7 +943,7 @@ if ($object->id > 0) {
 	// Past requests
 
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande, pfd.date_traite, pfd.fk_prelevement_bons, pfd.amount,";
-	$sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status, pb.fk_bank_account,";
+	$sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status, pb.fk_bank_account, pb.amount as pb_amount";
 	$sql .= " u.rowid as user_id, u.email, u.lastname, u.firstname, u.login, u.statut as user_status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";
@@ -1004,7 +1004,7 @@ if ($object->id > 0) {
 				$withdrawreceipt->statut = $obj->status;
 				$withdrawreceipt->status = $obj->status;
 				$withdrawreceipt->fk_bank_account = $obj->fk_bank_account;
-				$withdrawreceipt->amount = $obj->amount;
+				$withdrawreceipt->amount = $obj->pb_amount;
 				//$withdrawreceipt->credite = $db->jdate($obj->credite);
 
 				print $withdrawreceipt->getNomUrl(1);

From 6981746273bbb7433c704a76fc2281d88db754fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 19:09:52 +0100
Subject: [PATCH 293/300] Fix sql error

---
 htdocs/compta/facture/prelevement.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 9be13ef092e..5f027960ee8 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -943,7 +943,7 @@ if ($object->id > 0) {
 	// Past requests
 
 	$sql = "SELECT pfd.rowid, pfd.traite, pfd.date_demande, pfd.date_traite, pfd.fk_prelevement_bons, pfd.amount,";
-	$sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status, pb.fk_bank_account, pb.amount as pb_amount";
+	$sql .= " pb.ref, pb.date_trans, pb.method_trans, pb.credite, pb.date_credit, pb.datec, pb.statut as status, pb.fk_bank_account, pb.amount as pb_amount,";
 	$sql .= " u.rowid as user_id, u.email, u.lastname, u.firstname, u.login, u.statut as user_status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_demande as pfd";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on pfd.fk_user_demande = u.rowid";

From 2054ffe267ad19182e73df7c90aff39f974b2aee Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 20:49:53 +0100
Subject: [PATCH 294/300] Move IBAN and BIC as first field of bank account.
 TODO Hide/Show other with a link "Show more..."

---
 htdocs/compta/bank/card.php | 102 +++++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 3ba717f7a51..73cb5d3bf02 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -527,6 +527,14 @@ if ($action == 'create') {
 		print '<td><input type="text" class="flat minwidth150" name="bank" value="'.(GETPOST('bank') ?GETPOST('bank', 'alpha') : $object->bank).'"></td>';
 		print '</tr>';
 
+		// IBAN
+		print '<tr><td>'.$langs->trans($ibankey).'</td>';
+		print '<td><input maxlength="34" type="text" class="flat minwidth300" name="iban" value="'.(GETPOSTISSET('iban') ?GETPOST('iban', 'alpha') : $object->iban).'"></td></tr>';
+
+		// BIC
+		print '<tr><td>'.$langs->trans($bickey).'</td>';
+		print '<td><input maxlength="11" type="text" class="flat minwidth150" name="bic" value="'.(GETPOSTISSET('bic') ?GETPOST('bic', 'alpha') : $object->bic).'"></td></tr>';
+
 		// Show fields of bank account
 		$sizecss = '';
 		foreach ($object->getFieldsToShow() as $val) {
@@ -559,13 +567,6 @@ if ($action == 'create') {
 			$bickey = "SWIFT";
 		}
 
-		// IBAN
-		print '<tr><td>'.$langs->trans($ibankey).'</td>';
-		print '<td><input maxlength="34" type="text" class="flat minwidth300" name="iban" value="'.(GETPOSTISSET('iban') ?GETPOST('iban', 'alpha') : $object->iban).'"></td></tr>';
-
-		print '<tr><td>'.$langs->trans($bickey).'</td>';
-		print '<td><input maxlength="11" type="text" class="flat minwidth150" name="bic" value="'.(GETPOSTISSET('bic') ?GETPOST('bic', 'alpha') : $object->bic).'"></td></tr>';
-
 		if (isModEnabled('paymentbybanktransfer')) {
 			print '<tr><td>'.$form->textwithpicto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation"), $langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp")).'</td>';
 			print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'. (empty(GETPOST('pti_in_ctti')) ? '' : ' checked ') . '>';
@@ -753,6 +754,38 @@ if ($action == 'create') {
 			print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("BankName").'</td>';
 			print '<td>'.$object->bank.'</td></tr>';
 
+			$ibankey = FormBank::getIBANLabel($object);
+			$bickey = "BICNumber";
+			if ($object->getCountryCode() == 'IN') {
+				$bickey = "SWIFT";
+			}
+
+			// IBAN
+			print '<tr><td>'.$langs->trans($ibankey).'</td>';
+			print '<td>'.getIbanHumanReadable($object).'&nbsp;';
+			if (!empty($object->iban)) {
+				if (!checkIbanForAccount($object)) {
+					print img_picto($langs->trans("IbanNotValid"), 'warning');
+				} else {
+					print img_picto($langs->trans("IbanValid"), 'info');
+				}
+			}
+			print '</td></tr>';
+
+			// BIC
+			print '<tr><td>'.$langs->trans($bickey).'</td>';
+			print '<td>'.$object->bic.'&nbsp;';
+			if (!empty($object->bic)) {
+				if (!checkSwiftForAccount($object)) {
+					print img_picto($langs->trans("SwiftNotValid"), 'warning');
+				} else {
+					print img_picto($langs->trans("SwiftValid"), 'info');
+				}
+			}
+			print '</td></tr>';
+
+			// TODO Add a link "Show more..." for all ohter informations.
+
 			// Show fields of bank account
 			foreach ($object->getFieldsToShow() as $val) {
 				$content = '';
@@ -771,34 +804,6 @@ if ($action == 'create') {
 				print '</tr>';
 			}
 
-			$ibankey = FormBank::getIBANLabel($object);
-			$bickey = "BICNumber";
-			if ($object->getCountryCode() == 'IN') {
-				$bickey = "SWIFT";
-			}
-
-			print '<tr><td>'.$langs->trans($ibankey).'</td>';
-			print '<td>'.getIbanHumanReadable($object).'&nbsp;';
-			if (!empty($object->iban)) {
-				if (!checkIbanForAccount($object)) {
-					print img_picto($langs->trans("IbanNotValid"), 'warning');
-				} else {
-					print img_picto($langs->trans("IbanValid"), 'info');
-				}
-			}
-			print '</td></tr>';
-
-			print '<tr><td>'.$langs->trans($bickey).'</td>';
-			print '<td>'.$object->bic.'&nbsp;';
-			if (!empty($object->bic)) {
-				if (!checkSwiftForAccount($object)) {
-					print img_picto($langs->trans("SwiftNotValid"), 'warning');
-				} else {
-					print img_picto($langs->trans("SwiftValid"), 'info');
-				}
-			}
-			print '</td></tr>';
-
 			if (isModEnabled('prelevement')) {
 				print '<tr><td>'.$form->textwithpicto($langs->trans("ICS"), $langs->trans("ICS").' ('.$langs->trans("UsedFor", $langs->transnoentitiesnoconv("StandingOrder")).')').'</td>';
 				print '<td>'.$object->ics.'</td>';
@@ -1080,6 +1085,20 @@ if ($action == 'create') {
 			print '<td><input type="text" class="flat width300" name="bank" value="'.$object->bank.'"></td>';
 			print '</tr>';
 
+			$ibankey = FormBank::getIBANLabel($object);
+			$bickey = "BICNumber";
+			if ($object->getCountryCode() == 'IN') {
+				$bickey = "SWIFT";
+			}
+
+			// IBAN
+			print '<tr><td>'.$langs->trans($ibankey).'</td>';
+			print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban',  'alphanohtml') : $object->iban).'"></td></tr>';
+
+			// BIC
+			print '<tr><td>'.$langs->trans($bickey).'</td>';
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic',  'alphanohtml') : $object->bic).'"></td></tr>';
+
 			// Show fields of bank account
 			foreach ($object->getFieldsToShow() as $val) {
 				$content = '';
@@ -1106,19 +1125,6 @@ if ($action == 'create') {
 				print '</tr>';
 			}
 
-			$ibankey = FormBank::getIBANLabel($object);
-			$bickey = "BICNumber";
-			if ($object->getCountryCode() == 'IN') {
-				$bickey = "SWIFT";
-			}
-
-			// IBAN
-			print '<tr><td>'.$langs->trans($ibankey).'</td>';
-			print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban',  'alphanohtml') : $object->iban).'"></td></tr>';
-
-			print '<tr><td>'.$langs->trans($bickey).'</td>';
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic',  'alphanohtml') : $object->bic).'"></td></tr>';
-
 			if (isModEnabled('prelevement')) {
 				print '<tr><td>'.$form->textwithpicto($langs->trans("ICS"), $langs->trans("ICS").' ('.$langs->trans("UsedFor", $langs->transnoentitiesnoconv("StandingOrder")).')').'</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.(GETPOSTISSET('ics') ? GETPOST('ics', 'alphanohtml') : $object->ics).'"></td></tr>';

From 488279aed8e781ac9fb2cf9cc9eeec70b919a9b9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 21:48:31 +0100
Subject: [PATCH 295/300] Doc

---
 htdocs/public/stripe/ipn.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index e0c1780c2c9..4663c7d7766 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -312,9 +312,8 @@ if ($event->type == 'payout.created') {
 	dol_syslog("object = ".var_export($event->data, true));
 
 	// TODO: create fees
-	// TODO: Redirect to paymentok.php
 
-	/* TODO Enable this only if this is a payment of a Dolibarr bon_prelevement only
+	/* TODO LMR Enable this only if this is a payment of a Dolibarr bon_prelevement only
 	include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
 	$object = $event->data->object;
 	$invoice_id = $object->metadata->dol_id;

From 2e563d1ce16cb9e731a79341cd48cb5ba5ecb84b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 22:01:32 +0100
Subject: [PATCH 296/300] Clean code for IPN

---
 htdocs/public/stripe/ipn.php | 71 ++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 32 deletions(-)

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 4663c7d7766..9c10041a64e 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -470,7 +470,9 @@ if ($event->type == 'payout.created') {
 	$companypaymentmode = new CompanyPaymentMode($db);
 
 	$idthirdparty = $societeaccount->getThirdPartyID($db->escape($event->data->object->customer), 'stripe', $servicestatus);
-	if ($idthirdparty > 0) {	// If the payment mode is on an external customer that is known in societeaccount, we can create the payment mode
+	if ($idthirdparty > 0) {
+		// If the payment mode attached is to a stripe account owned by an external customer in societe_account (so a thirdparty that has a Stripe account),
+		// we can create the payment mode
 		$companypaymentmode->stripe_card_ref = $db->escape($event->data->object->id);
 		$companypaymentmode->fk_soc          = $idthirdparty;
 		$companypaymentmode->bank            = null;
@@ -488,9 +490,44 @@ if ($event->type == 'payout.created') {
 		$companypaymentmode->country_code    = $db->escape($event->data->object->card->country);
 		$companypaymentmode->status          = $servicestatus;
 
+		// TODO Check that a payment mode $companypaymentmode->stripe_card_ref does not exists yet to avoid to create duplicates
+		// so we can remove the test on STRIPE_NO_DUPLICATE_CHECK
+		if (getDolGlobalString('STRIPE_NO_DUPLICATE_CHECK')) {
+			$db->begin();
+			$result = $companypaymentmode->create($user);
+			if ($result < 0) {
+				$error++;
+			}
+			if (!$error) {
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
+		}
+	}
+} elseif ($event->type == 'payment_method.updated') {
+	require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
+	$companypaymentmode = new CompanyPaymentMode($db);
+	$companypaymentmode->fetch(0, '', 0, '', " AND stripe_card_ref = '".$db->escape($event->data->object->id)."'");
+	if ($companypaymentmode->id > 0) {
+		// If we found a payment mode with the ID
+		$companypaymentmode->bank            = null;
+		$companypaymentmode->label           = null;
+		$companypaymentmode->number          = $db->escape($event->data->object->id);
+		$companypaymentmode->last_four       = $db->escape($event->data->object->card->last4);
+		$companypaymentmode->proprio         = $db->escape($event->data->object->billing_details->name);
+		$companypaymentmode->exp_date_month  = $db->escape($event->data->object->card->exp_month);
+		$companypaymentmode->exp_date_year   = $db->escape($event->data->object->card->exp_year);
+		$companypaymentmode->cvn             = null;
+		$companypaymentmode->datec           = $db->escape($event->data->object->created);
+		$companypaymentmode->default_rib     = 0;
+		$companypaymentmode->type            = $db->escape($event->data->object->type);
+		$companypaymentmode->country_code    = $db->escape($event->data->object->card->country);
+		$companypaymentmode->status          = $servicestatus;
+
 		$db->begin();
 		if (!$error) {
-			$result = $companypaymentmode->create($user);
+			$result = $companypaymentmode->update($user);
 			if ($result < 0) {
 				$error++;
 			}
@@ -501,36 +538,6 @@ if ($event->type == 'payout.created') {
 			$db->rollback();
 		}
 	}
-} elseif ($event->type == 'payment_method.updated') {
-	require_once DOL_DOCUMENT_ROOT.'/societe/class/companypaymentmode.class.php';
-	$companypaymentmode = new CompanyPaymentMode($db);
-	$companypaymentmode->fetch(0, '', 0, '', " AND stripe_card_ref = '".$db->escape($event->data->object->id)."'");
-	$companypaymentmode->bank            = null;
-	$companypaymentmode->label           = null;
-	$companypaymentmode->number          = $db->escape($event->data->object->id);
-	$companypaymentmode->last_four       = $db->escape($event->data->object->card->last4);
-	$companypaymentmode->proprio         = $db->escape($event->data->object->billing_details->name);
-	$companypaymentmode->exp_date_month  = $db->escape($event->data->object->card->exp_month);
-	$companypaymentmode->exp_date_year   = $db->escape($event->data->object->card->exp_year);
-	$companypaymentmode->cvn             = null;
-	$companypaymentmode->datec           = $db->escape($event->data->object->created);
-	$companypaymentmode->default_rib     = 0;
-	$companypaymentmode->type            = $db->escape($event->data->object->type);
-	$companypaymentmode->country_code    = $db->escape($event->data->object->card->country);
-	$companypaymentmode->status          = $servicestatus;
-
-	$db->begin();
-	if (!$error) {
-		$result = $companypaymentmode->update($user);
-		if ($result < 0) {
-			$error++;
-		}
-	}
-	if (!$error) {
-		$db->commit();
-	} else {
-		$db->rollback();
-	}
 } elseif ($event->type == 'payment_method.detached') {
 	$db->begin();
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_rib WHERE number = '".$db->escape($event->data->object->id)."' and status = ".((int) $servicestatus);

From b865d163e07849aab821fd31000c216211f6b596 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 22:08:50 +0100
Subject: [PATCH 297/300] Enable the Stripe list that is stable (list of
 payouts)

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

diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index 4c5d3deea44..e691e8e3b29 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -118,7 +118,7 @@ class modStripe extends DolibarrModules
 			'url' => '',
 			'langs' => 'stripe',
 			'position' => 100,
-			'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',
+			'enabled' => 'isModEnabled("stripe") && isModenabled("banque")',
 			'perms' => '$user->rights->banque->lire',
 			'target' => '',
 			'user' => 0
@@ -132,7 +132,7 @@ class modStripe extends DolibarrModules
 			'url' => '/stripe/charge.php',
 			'langs' => 'stripe',
 			'position' => 102,
-			'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',
+			'enabled' => 'isModEnabled("stripe") && isModenabled("banque") && getDolGlobalInt("MAIN_FEATURES_LEVEL") >= 1',
 			'perms' => '$user->rights->banque->lire',
 			'target' => '',
 			'user' => 0
@@ -146,7 +146,7 @@ class modStripe extends DolibarrModules
 			'url' => '/stripe/transaction.php',
 			'langs' => 'stripe',
 			'position' => 102,
-			'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',
+			'enabled' => 'isModEnabled("stripe") && isModenabled("banque") && getDolGlobalInt("MAIN_FEATURES_LEVEL") >= 2',
 			'perms' => '$user->rights->banque->lire',
 			'target' => '',
 			'user' => 0
@@ -160,7 +160,7 @@ class modStripe extends DolibarrModules
 			'url' => '/stripe/payout.php',
 			'langs' => 'stripe',
 			'position' => 103,
-			'enabled' => '$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',
+			'enabled' => 'isModEnabled("stripe") && isModenabled("banque")',
 			'perms' => '$user->rights->banque->lire',
 			'target' => '',
 			'user' => 0

From 363b165bc3f2be97f0456c95408370e47abf0b81 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 6 Mar 2023 23:13:33 +0100
Subject: [PATCH 298/300] NEW Can show the sql request used on emailing
 selection

---
 htdocs/comm/mailing/cibles.php                | 23 ++++++++++++++-----
 .../modules/mailings/modules_mailings.php     |  5 ++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index b378ff2b033..ba3839afa5f 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -73,17 +73,19 @@ $result = $object->fetch($id);
 $hookmanager->initHooks(array('ciblescard', 'globalcard'));
 
 // Security check
-if (!$user->rights->mailing->lire || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
+if (!$user->hasRight('mailing', 'lire') || (empty($conf->global->EXTERNAL_USERS_ARE_AUTHORIZED) && $user->socid > 0)) {
 	accessforbidden();
 }
 //$result = restrictedArea($user, 'mailing');
 
+$sqlmessage = '';
+
 
 /*
  * Actions
  */
 
-if ($action == 'add') {
+if ($action == 'add' && $user->hasRight('mailing', 'creer')) {		// Add recipients
 	$module = GETPOST("module", 'alpha');
 	$result = -1;
 
@@ -103,6 +105,8 @@ if ($action == 'add') {
 			$obj = new $classname($db);
 			dol_syslog("Call add_to_target on class ".$classname);
 			$result = $obj->add_to_target($id);
+
+			$sqlmessage = $obj->sql;
 		}
 	}
 	if ($result > 0) {
@@ -117,7 +121,7 @@ if ($action == 'add') {
 	}
 }
 
-if (GETPOST('clearlist', 'int')) {
+if (GETPOST('clearlist', 'int') && $user->hasRight('mailing', 'creer')) {
 	// Loading Class
 	$obj = new MailingTargets($db);
 	$obj->clear_target($id);
@@ -127,7 +131,7 @@ if (GETPOST('clearlist', 'int')) {
 	*/
 }
 
-if (GETPOST('exportcsv', 'int')) {
+if (GETPOST('exportcsv', 'int') && $user->hasRight('mailing', 'lire')) {
 	$completefilename = 'targets_emailing'.$object->id.'_'.dol_print_date(dol_now(), 'dayhourlog').'.csv';
 	header('Content-Type: text/csv');
 	header('Content-Disposition: attachment;filename='.$completefilename);
@@ -166,7 +170,7 @@ if (GETPOST('exportcsv', 'int')) {
 	exit;
 }
 
-if ($action == 'delete') {
+if ($action == 'delete' && $user->hasRight('mailing', 'creer')) {
 	// Ici, rowid indique le destinataire et id le mailing
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid = ".((int) $rowid);
 	$resql = $db->query($sql);
@@ -454,7 +458,14 @@ if ($object->fetch($id) >= 0) {
 		print '</div>';	// End table
 		print '</div>';
 
-		print '<br><br>';
+		print '<br>';
+
+		if ($sqlmessage && $user->admin) {
+			print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlmessage, 0, 0, 1, '', 'TechnicalInformation');
+			print '<br>';
+		}
+
+		print '<br>';
 	}
 
 	// List of selected targets
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 2064613d1e9..b745934d94d 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -48,6 +48,11 @@ class MailingTargets // This can't be abstract as it is used for some method
 
 	public $tooltip = '';
 
+	/**
+	 * @var string The SQL string used to find the recipients
+	 */
+	public $sql;
+
 
 	/**
 	 *	Constructor

From 523f2cc12c0b3c84f7ec8288932b215aa1bf7e7e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 7 Mar 2023 00:08:19 +0100
Subject: [PATCH 299/300] Fix reposition on contract line

---
 htdocs/contrat/card.php                                    | 4 ++--
 htdocs/variants/tpl/productattributevalueline_view.tpl.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 8afbc4b1f68..2817cfc406a 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1535,12 +1535,12 @@ if ($action == 'create') {
 				if ($nbofservices > 1 && $conf->browser->layout != 'phone' && !empty($user->rights->contrat->creer)) {
 					print '<td width="30" class="linecolmove tdlineupdown center">';
 					if ($cursorline > 1) {
-						print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=up&token='.newToken().'&rowid='.$objp->rowid.'">';
+						print '<a class="lineupdown reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=up&token='.newToken().'&rowid='.$objp->rowid.'">';
 						echo img_up('default', 0, 'imgupforline');
 						print '</a>';
 					}
 					if ($cursorline < $nbofservices) {
-						print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=down&token='.newToken().'&rowid='.$objp->rowid.'">';
+						print '<a class="lineupdown reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=down&token='.newToken().'&rowid='.$objp->rowid.'">';
 						echo img_down('default', 0, 'imgdownforline');
 						print '</a>';
 					}
diff --git a/htdocs/variants/tpl/productattributevalueline_view.tpl.php b/htdocs/variants/tpl/productattributevalueline_view.tpl.php
index 6acf155f89a..f527e21c389 100644
--- a/htdocs/variants/tpl/productattributevalueline_view.tpl.php
+++ b/htdocs/variants/tpl/productattributevalueline_view.tpl.php
@@ -77,12 +77,12 @@ if (!empty($object_rights->write) && $action != 'selectlines') {
 		print '<td class="linecolmove tdlineupdown center width25">';
 		$coldisplay++;
 		if ($i > 0) { ?>
-			<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id; ?>">
+			<a class="lineupdown reposition" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&action=up&token='.newToken().'&rowid='.$line->id; ?>">
 			<?php print img_up('default', 0, 'imgupforline'); ?>
 			</a>
 		<?php }
 		if ($i < $num - 1) { ?>
-			<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id; ?>">
+			<a class="lineupdown reposition" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&action=down&token='.newToken().'&rowid='.$line->id; ?>">
 			<?php print img_down('default', 0, 'imgdownforline'); ?>
 			</a>
 		<?php }

From c9d869f837bcc4e0851b1e4db5df88d686e2353f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 7 Mar 2023 13:41:01 +0100
Subject: [PATCH 300/300] Debug kanban view

---
 .../fourn/class/fournisseur.facture.class.php |    3 +-
 htdocs/fourn/facture/list.php                 | 1079 +++++++++--------
 .../modulebuilder/template/myobject_list.php  |    4 +-
 3 files changed, 583 insertions(+), 503 deletions(-)

diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 7e4dad3f219..f635dcab2c5 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -3307,7 +3307,8 @@ class FactureFournisseur extends CommonInvoice
 			$return .= '<br><span class="opacitymedium">'.$langs->trans("AmountHT").'</span> : <span class="info-box-label amount">'.price($this->total_ht).'</span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3).'</div>';
+			$alreadypaid = (empty($arraydata['alreadypaid']) ? 0 : $arraydata['alreadypaid']);
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(3, $alreadypaid).'</div>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index a5363fd6c19..8fe15381a96 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -56,6 +56,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'supplierinvoicelist';
+$mode = GETPOST('mode', 'aZ'); // The output mode ('list', 'kanban', 'hierarchy', 'calendar', ...)
 
 $socid = GETPOST('socid', 'int');
 
@@ -66,8 +67,6 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
-$mode = GETPOST("mode", 'aZ09');
-
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_label = GETPOST("search_label", "alpha");
 $search_amount_no_tax = GETPOST("search_amount_no_tax", "alpha");
@@ -146,7 +145,7 @@ $object = new FactureFournisseur($db);
 $hookmanager->initHooks(array('supplierinvoicelist'));
 $extrafields = new ExtraFields($db);
 
-// fetch optionals attributes and labels
+// Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
@@ -215,6 +214,9 @@ if ((empty($user->rights->fournisseur->facture->lire) && empty($conf->global->MA
 	accessforbidden();
 }
 
+$permissiontoread = ($user->rights->fournisseur->facture->lire || $user->rights->supplier_invoice->lire);
+$permissiontoadd = ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer);
+$permissiontodelete = ($user->rights->fournisseur->facture->supprimer || $user->rights->supplier_invoice->supprimer);
 
 
 /*
@@ -222,7 +224,8 @@ if ((empty($user->rights->fournisseur->facture->lire) && empty($conf->global->MA
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -235,8 +238,10 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
+	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha')) {		// All tests must be present to be compatible with all browsers
 		$search_all = "";
 		$search_user = '';
@@ -292,9 +297,6 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'FactureFournisseur';
 	$objectlabel = 'SupplierInvoices';
-	$permissiontoread = ($user->rights->fournisseur->facture->lire || $user->rights->supplier_invoice->lire);
-	$permissiontoadd = ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer);
-	$permissiontodelete = ($user->rights->fournisseur->facture->supprimer || $user->rights->supplier_invoice->supprimer);
 	$uploaddir = $conf->fournisseur->facture->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
@@ -392,9 +394,13 @@ $facturestatic = new FactureFournisseur($db);
 $formcompany = new FormCompany($db);
 $thirdparty = new Societe($db);
 
-$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$now = dol_now();
 
+$title= $langs->trans("SuppliersInvoices");
+$help_url = 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores';
+
+// Build and execute select
+// --------------------------------------------------------------------
 $sql = "SELECT";
 if ($search_all) {
 	$sql = 'SELECT DISTINCT';
@@ -425,7 +431,8 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-$sql .= $hookmanager->resPrint;
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
 
 $sqlfields = $sql; // $sql fields to remove for count total
 
@@ -711,7 +718,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		dol_print_error($db);
 	}
 
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller than the paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -728,12 +735,11 @@ if ($limit) {
 $resql = $db->query($sql);
 if (!$resql) {
 	dol_print_error($db);
+	exit;
 }
 
 $num = $db->num_rows($resql);
 
-$arrayofselected = is_array($toselect) ? $toselect : array();
-
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->facid;
@@ -742,7 +748,10 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 	exit;
 }
 
-llxHeader('', $langs->trans("SuppliersInvoices"), 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url);
 
 if ($socid) {
 	$soc = new Societe($db);
@@ -753,6 +762,8 @@ if ($socid) {
 	}
 }
 
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
 $param = '&socid='.$socid;
 if (!empty($mode)) {
 	$param .= '&mode='.urlencode($mode);
@@ -761,7 +772,7 @@ if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
 if ($limit > 0 && $limit != $conf->liste_limit) {
-	$param .= '&limit='.urlencode($limit);
+	$param .= '&limit='.((int) $limit);
 }
 if ($search_all) {
 	$param .= '&search_all='.urlencode($search_all);
@@ -885,7 +896,7 @@ if (isModEnabled('paymentbybanktransfer') && !empty($user->rights->paymentbybank
 	$langs->load('withdrawals');
 	$arrayofmassactions['banktransfertrequest'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("MakeBankTransferOrder");
 }
-if ($user->rights->fournisseur->facture->supprimer) {
+if (!empty($permissiontodelete)) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
 if (in_array($massaction, array('presend', 'predelete'))) {
@@ -897,13 +908,9 @@ $url = DOL_URL_ROOT.'/fourn/facture/card.php?action=create';
 if (!empty($socid)) {
 	$url .= '&socid='.urlencode($socid);
 }
-$newcardbutton  = '';
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
-$newcardbutton .= dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer));
 
 $i = 0;
-print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+print '<form method="POST" id="searchFormList" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -913,6 +920,16 @@ print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="socid" value="'.$socid.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="page_y" value="">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+$newcardbutton  = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitleSeparator();
+$newcardbutton .= dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer));
 
 print_barre_liste($langs->trans("BillsSuppliers").($socid ? ' '.$soc->name : ''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'supplier_invoice', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -923,10 +940,13 @@ $trackid = 'sinv'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if ($search_all) {
+	$setupstring = '';
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
+		$setupstring .= $key."=".$val.";";
 	}
-	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if SUPPLIER_INVOICE_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 // If the user can view prospects other than his'
@@ -970,7 +990,7 @@ if (empty($reshook)) {
 	$moreforfilter = $hookmanager->resPrint;
 }
 
-if ($moreforfilter) {
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
@@ -978,18 +998,17 @@ if ($moreforfilter) {
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
-if ($massactionbutton) {
-	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
-}
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-// Line for filters
+// Fields title search
+// --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre middle">';
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';
@@ -1215,7 +1234,7 @@ if (!empty($arrayfields['f.fk_statut']['checked'])) {
 }
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre middle">';
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
@@ -1223,123 +1242,165 @@ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 
 print "</tr>\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
+// Fields title label
+// --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER['PHP_SELF'], 'f.ref,f.rowid', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.ref_supplier']['checked'])) {
 	print_liste_field_titre($arrayfields['f.ref_supplier']['label'], $_SERVER["PHP_SELF"], 'f.ref_supplier', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.type']['checked'])) {
 	print_liste_field_titre($arrayfields['f.type']['label'], $_SERVER["PHP_SELF"], 'f.type', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.label']['checked'])) {
 	print_liste_field_titre($arrayfields['f.label']['label'], $_SERVER['PHP_SELF'], "f.libelle,f.rowid", '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.datef']['checked'])) {
 	print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER['PHP_SELF'], 'f.datef,f.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
 	print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'], $_SERVER['PHP_SELF'], "f.date_lim_reglement", '', $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['p.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER['PHP_SELF'], "p.ref", '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], 's.nom', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.name_alias']['checked'])) {
 	print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER['PHP_SELF'], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.town']['checked'])) {
 	print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['s.zip']['checked'])) {
 	print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['state.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.name_alias", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['state.name_alias']['checked'])) {
 	print_liste_field_titre($arrayfields['state.name_alias']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['typent.code']['checked'])) {
 	print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 	print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_cond_reglement", "", $param, "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 	print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_ht']['checked'])) {
 	print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_vat']['checked'])) {
 	print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_localtax1']['checked'])) {
 	print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_localtax2']['checked'])) {
 	print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.total_ttc']['checked'])) {
 	print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.login']['checked'])) {
 	print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['dynamount_payed']['checked'])) {
 	print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['rtp']['checked'])) {
 	print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
 	print_liste_field_titre($arrayfields['f.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
 	print_liste_field_titre($arrayfields['f.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
 	print_liste_field_titre($arrayfields['f.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
 	print_liste_field_titre($arrayfields['f.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
 	print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
 	print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
 	print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder, 'totalarray'=>&$totalarray);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['f.datec']['checked'])) {
 	print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.tms']['checked'])) {
 	print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['f.fk_statut']['checked'])) {
 	print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "fk_statut,paye,type", "", $param, '', $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	$totalarray['nbfield']++;
 }
 print "</tr>\n";
 
@@ -1348,499 +1409,517 @@ $supplierstatic = new Fournisseur($db);
 $projectstatic = new Project($db);
 $userstatic = new User($db);
 
-if ($num > 0) {
-	$i = 0;
-	$totalarray = array();
-	$totalarray['nbfield']=0;
-	$totalarray['val'] = array();
-	$totalarray['val']['f.total_ht']=0;
-	$totalarray['val']['f.total_vat']=0;
-	$totalarray['val']['f.total_localtax1']=0;
-	$totalarray['val']['f.total_localtax1']=0;
-	$totalarray['val']['f.total_ttc']=0;
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$savnbfield = $totalarray['nbfield'];
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+$totalarray['val'] = array();
+$totalarray['val']['f.total_ht']=0;
+$totalarray['val']['f.total_vat']=0;
+$totalarray['val']['f.total_localtax1']=0;
+$totalarray['val']['f.total_localtax1']=0;
+$totalarray['val']['f.total_ttc']=0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
 
-	$imaxinloop = ($limit ? min($num, $limit) : $num);
-	while ($i < $imaxinloop) {
-		$obj = $db->fetch_object($resql);
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
-		$datelimit = $db->jdate($obj->datelimite);
-		$facturestatic->id = $obj->facid;
-		$facturestatic->ref = $obj->ref;
-		$facturestatic->type = $obj->type;
-		$facturestatic->ref_supplier = $obj->ref_supplier;
-		$facturestatic->date_echeance = $db->jdate($obj->datelimite);
-		$facturestatic->statut = $obj->fk_statut;
-		$facturestatic->note_public = $obj->note_public;
-		$facturestatic->note_private = $obj->note_private;
-		$facturestatic->multicurrency_code = $obj->multicurrency_code;
-		$facturestatic->multicurrency_tx = $obj->multicurrency_tx;
-		$facturestatic->multicurrency_total_ht = $obj->multicurrency_total_ht;
-		$facturestatic->multicurrency_total_tva = $obj->multicurrency_total_vat;
-		$facturestatic->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
+	$datelimit = $db->jdate($obj->datelimite);
 
-		$thirdparty->id = $obj->socid;
-		$thirdparty->name = $obj->name;
-		$thirdparty->name_alias = $obj->alias;
-		$thirdparty->client = $obj->client;
-		$thirdparty->fournisseur = $obj->fournisseur;
-		$thirdparty->code_client = $obj->code_client;
-		$thirdparty->code_compta_client = $obj->code_compta_client;
-		$thirdparty->code_fournisseur = $obj->code_fournisseur;
-		$thirdparty->code_compta_fournisseur = $obj->code_compta_fournisseur;
-		$thirdparty->email = $obj->email;
-		$thirdparty->country_code = $obj->country_code;
+	$userstatic->id = $obj->fk_user_author;
+	$userstatic->login = $obj->login;
+	$userstatic->lastname = $obj->lastname;
+	$userstatic->firstname = $obj->firstname;
+	$userstatic->email = $obj->user_email;
+	$userstatic->statut = $obj->user_statut;
+	$userstatic->entity = $obj->entity;
+	$userstatic->photo = $obj->photo;
+	$userstatic->office_phone = $obj->office_phone;
+	$userstatic->office_fax = $obj->office_fax;
+	$userstatic->user_mobile = $obj->user_mobile;
+	$userstatic->job = $obj->job;
+	$userstatic->gender = $obj->gender;
 
-		$paiement = $facturestatic->getSommePaiement();
-		$totalcreditnotes = $facturestatic->getSumCreditNotesUsed();
-		$totaldeposits = $facturestatic->getSumDepositsUsed();
-		$totalpay = $paiement + $totalcreditnotes + $totaldeposits;
-		$remaintopay = $obj->total_ttc - $totalpay;
-		$multicurrency_paiement = $facturestatic->getSommePaiement(1);
-		$multicurrency_totalcreditnotes = $facturestatic->getSumCreditNotesUsed(1);
-		$multicurrency_totaldeposits = $facturestatic->getSumDepositsUsed(1);
-		$multicurrency_totalpay = $multicurrency_paiement + $multicurrency_totalcreditnotes + $multicurrency_totaldeposits;
-		$multicurrency_remaintopay = price2num($facturestatic->multicurrency_total_ttc - $multicurrency_totalpay);
+	$facturestatic->id = $obj->facid;
+	$facturestatic->ref = $obj->ref;
+	$facturestatic->type = $obj->type;
+	$facturestatic->ref_supplier = $obj->ref_supplier;
+	$facturestatic->date_echeance = $db->jdate($obj->datelimite);
+	$facturestatic->statut = $obj->fk_statut;
+	$facturestatic->note_public = $obj->note_public;
+	$facturestatic->note_private = $obj->note_private;
+	$facturestatic->multicurrency_code = $obj->multicurrency_code;
+	$facturestatic->multicurrency_tx = $obj->multicurrency_tx;
+	$facturestatic->multicurrency_total_ht = $obj->multicurrency_total_ht;
+	$facturestatic->multicurrency_total_tva = $obj->multicurrency_total_vat;
+	$facturestatic->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
 
-		$facturestatic->alreadypaid = ($paiement ? $paiement : 0);
-		$facturestatic->paye = $obj->paye;
-		$facturestatic->statut = $obj->fk_statut;
-		$facturestatic->type = $obj->type;
+	$thirdparty->id = $obj->socid;
+	$thirdparty->name = $obj->name;
+	$thirdparty->name_alias = $obj->alias;
+	$thirdparty->client = $obj->client;
+	$thirdparty->fournisseur = $obj->fournisseur;
+	$thirdparty->code_client = $obj->code_client;
+	$thirdparty->code_compta_client = $obj->code_compta_client;
+	$thirdparty->code_fournisseur = $obj->code_fournisseur;
+	$thirdparty->code_compta_fournisseur = $obj->code_compta_fournisseur;
+	$thirdparty->email = $obj->email;
+	$thirdparty->country_code = $obj->country_code;
 
+	$paiement = $facturestatic->getSommePaiement();
+	$totalcreditnotes = $facturestatic->getSumCreditNotesUsed();
+	$totaldeposits = $facturestatic->getSumDepositsUsed();
+	$totalpay = $paiement + $totalcreditnotes + $totaldeposits;
+	$remaintopay = $obj->total_ttc - $totalpay;
+	$multicurrency_paiement = $facturestatic->getSommePaiement(1);
+	$multicurrency_totalcreditnotes = $facturestatic->getSumCreditNotesUsed(1);
+	$multicurrency_totaldeposits = $facturestatic->getSumDepositsUsed(1);
+	$multicurrency_totalpay = $multicurrency_paiement + $multicurrency_totalcreditnotes + $multicurrency_totaldeposits;
+	$multicurrency_remaintopay = price2num($facturestatic->multicurrency_total_ttc - $multicurrency_totalpay);
 
-		//If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice
-		if ($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
-			if ($facturestatic->isCreditNoteUsed()) {
-				$remaintopay = -$facturestatic->getSumFromThisCreditNotesNotUsed();
+	$facturestatic->alreadypaid = ($paiement ? $paiement : 0);
+	$facturestatic->paye = $obj->paye;
+	$facturestatic->statut = $obj->fk_statut;
+	$facturestatic->type = $obj->type;
+	$facturestatic->socid = $thirdparty->getNomUrl(1, 'supplier', 3);
+	$facturestatic->total_ht = $obj->total_ht;
+	$facturestatic->date = $obj->datef;
+
+	$object = $facturestatic;
+
+	//If invoice has been converted and the conversion has been used, we dont have remain to pay on invoice
+	if ($facturestatic->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+		if ($facturestatic->isCreditNoteUsed()) {
+			$remaintopay = -$facturestatic->getSumFromThisCreditNotesNotUsed();
+		}
+	}
+
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container kanban">';
+		}
+		// Output Kanban
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
 			}
 		}
 
-		if ($mode == 'kanban') {
-			if ($i == 0) {
-				print '<tr><td colspan="12">';
-				print '<div class="box-flex-container kanban">';
-			}
-			// Output Kanban
-			$facturestatic->socid = $thirdparty->getNomUrl(1, 'supplier', 3);
-			$facturestatic->total_ht = $obj->total_ht;
-			$facturestatic->date = $obj->datef;
-			print $facturestatic->getKanbanView('');
-			if ($i == ($imaxinloop - 1)) {
-				print '</div>';
-				print '</td></tr>';
-			}
-		} else {
-			print '<tr class="oddeven">';
-			// Action column
-			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td class="nowrap center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->facid, $arrayofselected)) {
-						$selected = 1;
-					}
-					print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
+		$arraydata = array('alreadypaid' => $paiement);
+		print $facturestatic->getKanbanView('', $arraydata);
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->facid, $arrayofselected)) {
+					$selected = 1;
 				}
-				print '</td>';
+				print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			if (!empty($arrayfields['f.ref']['checked'])) {
-				print '<td class="nowraponall">';
+			print '</td>';
+		}
+		if (!empty($arrayfields['f.ref']['checked'])) {
+			print '<td class="nowraponall">';
 
-				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-				// Picto + Ref
-				print '<td class="nobordernopadding nowraponall">';
-				print $facturestatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
+			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+			// Picto + Ref
+			print '<td class="nobordernopadding nowraponall">';
+			print $facturestatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 
-				$filename = dol_sanitizeFileName($obj->ref);
-				$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($obj->facid, 2, 0, 0, $facturestatic, 'invoice_supplier').dol_sanitizeFileName($obj->ref);
-				$subdir = get_exdir($obj->facid, 2, 0, 0, $facturestatic, 'invoice_supplier').dol_sanitizeFileName($obj->ref);
-				print $formfile->getDocumentsLink('facture_fournisseur', $subdir, $filedir);
-				print '</td></tr></table>';
+			$filename = dol_sanitizeFileName($obj->ref);
+			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($obj->facid, 2, 0, 0, $facturestatic, 'invoice_supplier').dol_sanitizeFileName($obj->ref);
+			$subdir = get_exdir($obj->facid, 2, 0, 0, $facturestatic, 'invoice_supplier').dol_sanitizeFileName($obj->ref);
+			print $formfile->getDocumentsLink('facture_fournisseur', $subdir, $filedir);
+			print '</td></tr></table>';
 
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Supplier ref
-			if (!empty($arrayfields['f.ref_supplier']['checked'])) {
-				print '<td class="nowrap tdoverflowmax150" title="'.dol_escape_htmltag($obj->ref_supplier).'">';
-				print $obj->ref_supplier;
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Type
-			if (!empty($arrayfields['f.type']['checked'])) {
-				print '<td class="nowrap">';
-				print $facturestatic->getLibType();
-				print "</td>";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Label
-			if (!empty($arrayfields['f.label']['checked'])) {
-				print '<td class="nowrap">';
-				print dol_escape_htmltag($obj->label);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Date
-			if (!empty($arrayfields['f.datef']['checked'])) {
-				print '<td class="center nowrap">';
-				print dol_print_date($db->jdate($obj->datef), 'day');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Date limit
-			if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
-				print '<td class="center nowraponall">'.dol_print_date($datelimit, 'day');
-				if ($facturestatic->hasDelay()) {
-					print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Project
-			if (!empty($arrayfields['p.ref']['checked'])) {
-				print '<td class="nowrap">';
-				if ($obj->project_id > 0) {
-					$projectstatic->id = $obj->project_id;
-					$projectstatic->ref = $obj->project_ref;
-					$projectstatic->title = $obj->project_label;
-					print $projectstatic->getNomUrl(1);
-				}
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Third party
-			if (!empty($arrayfields['s.nom']['checked'])) {
-				print '<td class="tdoverflowmax150">';
-				print $thirdparty->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Alias
-			if (!empty($arrayfields['s.name_alias']['checked'])) {
-				print '<td class="tdoverflowmax150">';
-				print dol_escape_htmltag($thirdparty->name_alias);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Town
-			if (!empty($arrayfields['s.town']['checked'])) {
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">';
-				print dol_escape_htmltag($obj->town);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Zip
-			if (!empty($arrayfields['s.zip']['checked'])) {
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->zip).'">';
-				print dol_escape_htmltag($obj->zip);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// State
-			if (!empty($arrayfields['state.nom']['checked'])) {
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->state_name).'">';
-				print dol_escape_htmltag($obj->state_name);
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Country
-			if (!empty($arrayfields['country.code_iso']['checked'])) {
-				print '<td class="center">';
-				$tmparray = getCountry($obj->fk_pays, 'all');
-				print $tmparray['label'];
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Type ent
-			if (!empty($arrayfields['typent.code']['checked'])) {
-				print '<td class="center">';
-				if (empty($typenArray)) {
-					$typenArray = $formcompany->typent_array(1);
-				}
-				print $typenArray[$obj->typent_code];
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Payment condition
-			if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
-				$s = $form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 1, '', -1, -1, 1);
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
-				print dol_escape_htmltag($s);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Payment mode
-			if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
-				$s = $form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1, 0, '', 1);
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
-				print dol_escape_htmltag($s);
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Amount HT
-			if (!empty($arrayfields['f.total_ht']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
-				}
-				$totalarray['val']['f.total_ht'] += $obj->total_ht;
-			}
-			// Amount VAT
-			if (!empty($arrayfields['f.total_vat']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->total_vat)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_vat';
-				}
-				$totalarray['val']['f.total_vat'] += $obj->total_vat;
-			}
-			// Amount LocalTax1
-			if (!empty($arrayfields['f.total_localtax1']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->total_localtax1)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
-				}
-				$totalarray['val']['f.total_localtax1'] += $obj->total_localtax1;
-			}
-			// Amount LocalTax2
-			if (!empty($arrayfields['f.total_localtax2']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->total_localtax2)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
-				}
-				$totalarray['val']['f.total_localtax2'] += $obj->total_localtax2;
-			}
-			// Amount TTC
-			if (!empty($arrayfields['f.total_ttc']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
-				}
-				$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
-			}
-
-			$userstatic->id = $obj->fk_user_author;
-			$userstatic->login = $obj->login;
-			$userstatic->lastname = $obj->lastname;
-			$userstatic->firstname = $obj->firstname;
-			$userstatic->email = $obj->user_email;
-			$userstatic->statut = $obj->user_statut;
-			$userstatic->entity = $obj->entity;
-			$userstatic->photo = $obj->photo;
-			$userstatic->office_phone = $obj->office_phone;
-			$userstatic->office_fax = $obj->office_fax;
-			$userstatic->user_mobile = $obj->user_mobile;
-			$userstatic->job = $obj->job;
-			$userstatic->gender = $obj->gender;
-
-			// Author
-			if (!empty($arrayfields['u.login']['checked'])) {
-				print '<td class="tdoverflowmax150">';
-				if ($userstatic->id) {
-					print $userstatic->getLoginUrl(-1);
-				} else {
-					print '&nbsp;';
-				}
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			if (!empty($arrayfields['dynamount_payed']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
-				}
-				$totalarray['val']['totalam'] += $totalpay;
-			}
-
-			if (!empty($arrayfields['rtp']['checked'])) {
-				print '<td class="right nowrap">'.(!empty($remaintopay) ?price($remaintopay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 'rtp';
-				}
-				$totalarray['val']['rtp'] += $remaintopay;
-			}
-
-			// Currency
-			if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
-				print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Currency rate
-			if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
-				print '<td class="nowrap">';
-				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-				print "</td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount HT
-			if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount VAT
-			if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_vat)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Amount TTC
-			if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Pending amount
-			if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
-				print '<td class="right nowrap"><span class="amount">';
-				print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '');
-				print '</span></td>'; // TODO Use a denormalized field
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-
-			// Extra fields
-			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-			// Fields from hook
-			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			print $hookmanager->resPrint;
-
-			// Date creation
-			if (!empty($arrayfields['f.datec']['checked'])) {
-				print '<td class="center nowrap">';
-				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Date modification
-			if (!empty($arrayfields['f.tms']['checked'])) {
-				print '<td class="center nowrap">';
-				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-				print '</td>';
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-			// Status
-			if (!empty($arrayfields['f.fk_statut']['checked'])) {
-				print '<td class="right nowrap">';
-				print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
-				print "</td>";
-				if (!$i) {
-					$totalarray['nbfield']++;
-				}
-			}
-
-			// Action column
-			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-				print '<td class="nowrap center">';
-				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-					$selected = 0;
-					if (in_array($obj->facid, $arrayofselected)) {
-						$selected = 1;
-					}
-					print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
-				}
-				print '</td>';
-			}
+			print "</td>\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-
-			print "</tr>\n";
 		}
 
-		$i++;
+		// Supplier ref
+		if (!empty($arrayfields['f.ref_supplier']['checked'])) {
+			print '<td class="nowrap tdoverflowmax150" title="'.dol_escape_htmltag($obj->ref_supplier).'">';
+			print $obj->ref_supplier;
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Type
+		if (!empty($arrayfields['f.type']['checked'])) {
+			print '<td class="nowrap">';
+			print $facturestatic->getLibType();
+			print "</td>";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Label
+		if (!empty($arrayfields['f.label']['checked'])) {
+			print '<td class="nowrap">';
+			print dol_escape_htmltag($obj->label);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date
+		if (!empty($arrayfields['f.datef']['checked'])) {
+			print '<td class="center nowrap">';
+			print dol_print_date($db->jdate($obj->datef), 'day');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date limit
+		if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
+			print '<td class="center nowraponall">'.dol_print_date($datelimit, 'day');
+			if ($facturestatic->hasDelay()) {
+				print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Project
+		if (!empty($arrayfields['p.ref']['checked'])) {
+			print '<td class="nowrap">';
+			if ($obj->project_id > 0) {
+				$projectstatic->id = $obj->project_id;
+				$projectstatic->ref = $obj->project_ref;
+				$projectstatic->title = $obj->project_label;
+				print $projectstatic->getNomUrl(1);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Third party
+		if (!empty($arrayfields['s.nom']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			print $thirdparty->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Alias
+		if (!empty($arrayfields['s.name_alias']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			print dol_escape_htmltag($thirdparty->name_alias);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Town
+		if (!empty($arrayfields['s.town']['checked'])) {
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->town).'">';
+			print dol_escape_htmltag($obj->town);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Zip
+		if (!empty($arrayfields['s.zip']['checked'])) {
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->zip).'">';
+			print dol_escape_htmltag($obj->zip);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// State
+		if (!empty($arrayfields['state.nom']['checked'])) {
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->state_name).'">';
+			print dol_escape_htmltag($obj->state_name);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Country
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
+			print '<td class="center">';
+			$tmparray = getCountry($obj->fk_pays, 'all');
+			print $tmparray['label'];
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Type ent
+		if (!empty($arrayfields['typent.code']['checked'])) {
+			print '<td class="center">';
+			if (empty($typenArray)) {
+				$typenArray = $formcompany->typent_array(1);
+			}
+			print $typenArray[$obj->typent_code];
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Payment condition
+		if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
+			$s = $form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 1, '', -1, -1, 1);
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
+			print dol_escape_htmltag($s);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Payment mode
+		if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
+			$s = $form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1, 0, '', 1);
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($s).'">';
+			print dol_escape_htmltag($s);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Amount HT
+		if (!empty($arrayfields['f.total_ht']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->total_ht)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
+			}
+			$totalarray['val']['f.total_ht'] += $obj->total_ht;
+		}
+		// Amount VAT
+		if (!empty($arrayfields['f.total_vat']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->total_vat)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'f.total_vat';
+			}
+			$totalarray['val']['f.total_vat'] += $obj->total_vat;
+		}
+		// Amount LocalTax1
+		if (!empty($arrayfields['f.total_localtax1']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->total_localtax1)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
+			}
+			$totalarray['val']['f.total_localtax1'] += $obj->total_localtax1;
+		}
+		// Amount LocalTax2
+		if (!empty($arrayfields['f.total_localtax2']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->total_localtax2)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
+			}
+			$totalarray['val']['f.total_localtax2'] += $obj->total_localtax2;
+		}
+		// Amount TTC
+		if (!empty($arrayfields['f.total_ttc']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->total_ttc)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+			}
+			$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
+		}
+
+		// Author
+		if (!empty($arrayfields['u.login']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			if ($userstatic->id) {
+				print $userstatic->getLoginUrl(-1);
+			} else {
+				print '&nbsp;';
+			}
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		if (!empty($arrayfields['dynamount_payed']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
+			}
+			$totalarray['val']['totalam'] += $totalpay;
+		}
+
+		if (!empty($arrayfields['rtp']['checked'])) {
+			print '<td class="right nowrap">'.(!empty($remaintopay) ?price($remaintopay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'rtp';
+			}
+			$totalarray['val']['rtp'] += $remaintopay;
+		}
+
+		// Currency
+		if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
+			print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Currency rate
+		if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
+			print '<td class="nowrap">';
+			$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount HT
+		if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ht)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount VAT
+		if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_vat)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Amount TTC
+		if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.price($obj->multicurrency_total_ttc)."</span></td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '').'</span></td>'; // TODO Use a denormalized field
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Pending amount
+		if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
+			print '<td class="right nowrap"><span class="amount">';
+			print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '');
+			print '</span></td>'; // TODO Use a denormalized field
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
+		// Date creation
+		if (!empty($arrayfields['f.datec']['checked'])) {
+			print '<td class="center nowrap">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date modification
+		if (!empty($arrayfields['f.tms']['checked'])) {
+			print '<td class="center nowrap">';
+			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Status
+		if (!empty($arrayfields['f.fk_statut']['checked'])) {
+			print '<td class="right nowrap">';
+			print $facturestatic->getLibStatut(5, $paiement);
+			print "</td>";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Action column
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->facid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		print '</tr>'."\n";
 	}
 
-	// Show total line
-	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+	$i++;
 }
 
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+
 // If no record found
 if ($num == 0) {
 	$colspan = 1;
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index c5923412e27..270ffbbf16f 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -473,7 +473,7 @@ if ($optioncss != '') {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $param .= $hookmanager->resPrint;
 
 // List of mass actions available
@@ -565,7 +565,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 print '<tr class="liste_titre_filter">';
 // Action column
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
-	print '<td class="liste_titre maxwidthsearch center">';
+	print '<td class="liste_titre center maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
 	print '</td>';